version 0.17.2 (#630)

* version 0.17.2

* Update release date

.circleci/config.yml

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+- [ ] Tested on all platforms changed
+- [ ] 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

.gitignore

@@ -1,4 +1,6 @@
 Cargo.lock
 target/
+rls/
+.vscode/
 *~
 #*#

.travis.yml

@@ -1,30 +1,72 @@
 language: rust
 
-rust:
-  - nightly
-  - stable
-
 cache: cargo
 
-addons:
-  apt:
-    packages:
-    - libxxf86vm-dev
+matrix:
+  include:
+    # Linux 32bit
+    - env: TARGET=i686-unknown-linux-gnu
+      os: linux
+      rust: nightly
+      addons:
+        apt:
+          # Cross compiler and cross compiled C libraries
+          packages: &i686_packages
+            - gcc-multilib
+    - env: TARGET=i686-unknown-linux-gnu
+      os: linux
+      rust: stable
+      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
+      os: linux
+      rust: nightly
+    - 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
+      os: osx
+      rust: nightly
+    - 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
+      os: osx
+      rust: nightly
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: stable
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: 1.24.1
 
 install:
-  - |
-      if [ $TRAVIS_OS_NAME = osx ]; then
-        rustup target add x86_64-apple-ios
-      fi
+  - rustup self update
+  - rustup target add $TARGET; true
 
 script:
-  - cargo build --verbose
-  - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
-  - cargo test --verbose
-
-os:
-  - linux
-  - osx
+  - cargo build --target $TARGET --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
 
 after_success:
   - |

CHANGELOG.md

@@ -0,0 +1,252 @@
+# Unreleased
+
+# Version 0.17.2 (2018-08-19)
+
+- On macOS, fix `<C-Tab>` so applications receive the event.
+- On macOS, fix `<Cmd-{key}>` so applications receive the event.
+- On Wayland, key press events will now be repeated.
+
+# Version 0.17.1 (2018-08-05)
+
+- On X11, prevent a compilation failure in release mode for versions of Rust greater than or equal to 1.30.
+- Fixed deadlock that broke fullscreen mode on Windows.
+
+# Version 0.17.0 (2018-08-02)
+
+- Cocoa and core-graphics updates.
+- Fixed thread-safety issues in several `Window` functions on Windows.
+- On MacOS, the key state for modifiers key events is now properly set.
+- On iOS, the view is now set correctly. This makes it possible to render things (instead of being stuck on a black screen), and touch events work again.
+- Added NetBSD support.
+- **Breaking:** On iOS, `UIView` is now the default root view. `WindowBuilderExt::with_root_view_class` can be used to set the root view objective-c class to `GLKView` (OpenGLES) or `MTKView` (Metal/MoltenVK).
+- On iOS, the `UIApplication` is not started until `Window::new` is called.
+- Fixed thread unsafety with cursor hiding on macOS.
+- On iOS, fixed the size of the `JmpBuf` type used for `setjmp`/`longjmp` calls. Previously this was a buffer overflow on most architectures.
+- On Windows, use cached window DPI instead of repeatedly querying the system. This fixes sporadic crashes on Windows 7.
+
+# Version 0.16.2 (2018-07-07)
+
+- On Windows, non-resizable windows now have the maximization button disabled. This is consistent with behavior on macOS and popular X11 WMs.
+- Corrected incorrect `unreachable!` usage when guessing the DPI factor with no detected monitors.
+
+# Version 0.16.1 (2018-07-02)
+
+- Added logging through `log`. Logging will become more extensive over time.
+- On X11 and Windows, the window's DPI factor is guessed before creating the window. This *greatly* cuts back on unsightly auto-resizing that would occur immediately after window creation.
+- Fixed X11 backend compilation for environments where `c_char` is unsigned.
+
+# Version 0.16.0 (2018-06-25)
+
+- Windows additionally has `WindowBuilderExt::with_no_redirection_bitmap`.
+- **Breaking:** Removed `VirtualKeyCode::LMenu` and `VirtualKeyCode::RMenu`; Windows now generates `VirtualKeyCode::LAlt` and `VirtualKeyCode::RAlt` instead.
+- On X11, exiting fullscreen no longer leaves the window in the monitor's top left corner.
+- **Breaking:** `Window::hidpi_factor` has been renamed to `Window::get_hidpi_factor` for better consistency. `WindowEvent::HiDPIFactorChanged` has been renamed to `WindowEvent::HiDpiFactorChanged`. DPI factors are always represented as `f64` instead of `f32` now.
+- The Windows backend is now DPI aware. `WindowEvent::HiDpiFactorChanged` is implemented, and `MonitorId::get_hidpi_factor` and `Window::hidpi_factor` return accurate values.
+- Implemented `WindowEvent::HiDpiFactorChanged` on X11.
+- On macOS, `Window::set_cursor_position` is now relative to the client area.
+- On macOS, setting the maximum and minimum dimensions now applies to the client area dimensions rather than to the window dimensions.
+- On iOS, `MonitorId::get_dimensions` has been implemented and both `MonitorId::get_hidpi_factor` and `Window::get_hidpi_factor` return accurate values.
+- On Emscripten, `MonitorId::get_hidpi_factor` now returns the same value as `Window::get_hidpi_factor` (it previously would always return 1.0).
+- **Breaking:** The entire API for sizes, positions, etc. has changed. In the majority of cases, winit produces and consumes positions and sizes as `LogicalPosition` and `LogicalSize`, respectively. The notable exception is `MonitorId` methods, which deal in `PhysicalPosition` and `PhysicalSize`. See the documentation for specifics and explanations of the types. Additionally, winit automatically conserves logical size when the DPI factor changes.
+- **Breaking:** All deprecated methods have been removed. For `Window::platform_display` and `Window::platform_window`, switch to the appropriate platform-specific `WindowExt` methods. For `Window::get_inner_size_points` and `Window::get_inner_size_pixels`, use the `LogicalSize` returned by `Window::get_inner_size` and convert as needed.
+- HiDPI support for Wayland.
+- `EventsLoop::get_available_monitors` and `EventsLoop::get_primary_monitor` now have identical counterparts on `Window`, so this information can be acquired without an `EventsLoop` borrow.
+- `AvailableMonitorsIter` now implements `Debug`.
+- Fixed quirk on macOS where certain keys would generate characters at twice the normal rate when held down.
+- On X11, all event loops now share the same `XConnection`.
+- **Breaking:** `Window::set_cursor_state` and `CursorState` enum removed in favor of the more composable `Window::grab_cursor` and `Window::hide_cursor`. As a result, grabbing the cursor no longer automatically hides it; you must call both methods to retain the old behavior on Windows and macOS. `Cursor::NoneCursor` has been removed, as it's no longer useful.
+- **Breaking:** `Window::set_cursor_position` now returns `Result<(), String>`, thus allowing for `Box<Error>` conversion via `?`.
+
+# Version 0.15.1 (2018-06-13)
+
+- On X11, the `Moved` event is no longer sent when the window is resized without changing position.
+- `MouseCursor` and `CursorState` now implement `Default`.
+- `WindowBuilder::with_resizable` implemented for Windows, X11, Wayland, and macOS.
+- `Window::set_resizable` implemented for Windows, X11, Wayland, and macOS.
+- On X11, if the monitor's width or height in millimeters is reported as 0, the DPI is now 1.0 instead of +inf.
+- On X11, the environment variable `WINIT_HIDPI_FACTOR` has been added for overriding DPI factor.
+- On X11, enabling transparency no longer causes the window contents to flicker when resizing.
+- On X11, `with_override_redirect` now actually enables override redirect.
+- macOS now generates `VirtualKeyCode::LAlt` and `VirtualKeyCode::RAlt` instead of `None` for both.
+- On macOS, `VirtualKeyCode::RWin` and `VirtualKeyCode::LWin` are no longer switched.
+- On macOS, windows without decorations can once again be resized.
+- Fixed race conditions when creating an `EventsLoop` on X11, most commonly manifesting as "[xcb] Unknown sequence number while processing queue".
+- On macOS, `CursorMoved` and `MouseInput` events are only generated if they occurs within the window's client area.
+- On macOS, resizing the window no longer generates a spurious `MouseInput` event.
+
+# Version 0.15.0 (2018-05-22)
+
+- `Icon::to_cardinals` is no longer public, since it was never supposed to be.
+- Wayland: improve diagnostics if initialization fails
+- Fix some system event key doesn't work when focused, do not block keyevent forward to system on macOS
+- On X11, the scroll wheel position is now correctly reset on i3 and other WMs that have the same quirk.
+- On X11, `Window::get_current_monitor` now reliably returns the correct monitor.
+- On X11, `Window::hidpi_factor` returns values from XRandR rather than the inaccurate values previously queried from the core protocol.
+- On X11, the primary monitor is detected correctly even when using versions of XRandR less than 1.5.
+- `MonitorId` now implements `Debug`.
+- Fixed bug on macOS where using `with_decorations(false)` would cause `set_decorations(true)` to produce a transparent titlebar with no title.
+- Implemented `MonitorId::get_position` on macOS.
+- On macOS, `Window::get_current_monitor` now returns accurate values.
+- Added `WindowBuilderExt::with_resize_increments` to macOS.
+- **Breaking:** On X11, `WindowBuilderExt::with_resize_increments` and `WindowBuilderExt::with_base_size` now take `u32` values rather than `i32`.
+- macOS keyboard handling has been overhauled, allowing for the use of dead keys, IME, etc. Right modifier keys are also no longer reported as being left.
+- Added the `Window::set_ime_spot(x: i32, y: i32)` method, which is implemented on X11 and macOS.
+- **Breaking**: `os::unix::WindowExt::send_xim_spot(x: i16, y: i16)` no longer exists. Switch to the new `Window::set_ime_spot(x: i32, y: i32)`, which has equivalent functionality.
+- Fixed detection of `Pause` and `Scroll` keys on Windows.
+- On Windows, alt-tabbing while the cursor is grabbed no longer makes it impossible to re-grab the cursor.
+- On Windows, using `CursorState::Hide` when the cursor is grabbed now ungrabs the cursor first.
+- Implemented `MouseCursor::NoneCursor` on Windows.
+- Added `WindowBuilder::with_always_on_top` and `Window::set_always_on_top`. Implemented on Windows, macOS, and X11.
+- On X11, `WindowBuilderExt` now has `with_class`, `with_override_redirect`, and `with_x11_window_type` to allow for more control over window creation. `WindowExt` additionally has `set_urgent`.
+- More hints are set by default on X11, including `_NET_WM_PID` and `WM_CLIENT_MACHINE`. Note that prior to this, the `WM_CLASS` hint was automatically set to whatever value was passed to `with_title`. It's now set to the executable name to better conform to expectations and the specification; if this is undesirable, you must explicitly use `WindowBuilderExt::with_class`.
+
+# Version 0.14.0 (2018-05-09)
+
+- Created the `Copy`, `Paste` and `Cut` `VirtualKeyCode`s and added support for them on X11 and Wayland
+- Fix `.with_decorations(false)` in macOS
+- On Mac, `NSWindow` and supporting objects might be alive long after they were `closed` which resulted in apps consuming more heap then needed. Mainly it was affecting multi window applications. Not expecting any user visible change of behaviour after the fix.
+- Fix regression of Window platform extensions for macOS where `NSFullSizeContentViewWindowMask` was not being correctly applied to `.fullsize_content_view`.
+- Corrected `get_position` on Windows to be relative to the screen rather than to the taskbar.
+- Corrected `Moved` event on Windows to use position values equivalent to those returned by `get_position`. It previously supplied client area positions instead of window positions, and would additionally interpret negative values as being very large (around `u16::MAX`).
+- Implemented `Moved` event on macOS.
+- On X11, the `Moved` event correctly use window positions rather than client area positions. Additionally, a stray `Moved` that unconditionally accompanied `Resized` with the client area position relative to the parent has been eliminated; `Moved` is still received alongside `Resized`, but now only once and always correctly.
+- On Windows, implemented all variants of `DeviceEvent` other than `Text`. Mouse `DeviceEvent`s are now received even if the window isn't in the foreground.
+- `DeviceId` on Windows is no longer a unit struct, and now contains a `u32`. For `WindowEvent`s, this will always be 0, but on `DeviceEvent`s it will be the handle to that device. `DeviceIdExt::get_persistent_identifier` can be used to acquire a unique identifier for that device that persists across replugs/reboots/etc.
+- Corrected `run_forever` on X11 to stop discarding `Awakened` events.
+- Various safety and correctness improvements to the X11 backend internals.
+- Fixed memory leak on X11 every time the mouse entered the window.
+- On X11, drag and drop now works reliably in release mode.
+- Added `WindowBuilderExt::with_resize_increments` and `WindowBuilderExt::with_base_size` to X11, allowing for more optional hints to be set.
+- Rework of the wayland backend, migrating it to use [Smithay's Client Toolkit](https://github.com/Smithay/client-toolkit).
+- Added `WindowBuilder::with_window_icon` and `Window::set_window_icon`, finally making it possible to set the window icon on Windows and X11. The `icon_loading` feature can be enabled to allow for icons to be easily loaded; see example program `window_icon.rs` for usage.
+- Windows additionally has `WindowBuilderExt::with_taskbar_icon` and `WindowExt::set_taskbar_icon`.
+- On Windows, fix panic when trying to call `set_fullscreen(None)` on a window that has not been fullscreened prior.
+
+# Version 0.13.1 (2018-04-26)
+
+- Ensure necessary `x11-dl` version is used.
+
+# Version 0.13.0 (2018-04-25)
+
+- Implement `WindowBuilder::with_maximized`, `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for MacOS.
+- Implement `WindowBuilder::with_maximized`, `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for Windows.
+- On Windows, `WindowBuilder::with_fullscreen` no longer changing monitor display resolution.
+- Overhauled X11 window geometry calculations. `get_position` and `set_position` are more universally accurate across different window managers, and `get_outer_size` actually works now.
+- Fixed SIGSEGV/SIGILL crashes on macOS caused by stabilization of the `!` (never) type.
+- Implement `WindowEvent::HiDPIFactorChanged` for macOS
+- On X11, input methods now work completely out of the box, no longer requiring application developers to manually call `setlocale`. Additionally, when input methods are started, stopped, or restarted on the server end, it's correctly handled.
+- Implemented `Refresh` event on Windows.
+- Properly calculate the minimum and maximum window size on Windows, including window decorations.
+- Map more `MouseCursor` variants to cursor icons on Windows.
+- Corrected `get_position` on macOS to return outer frame position, not content area position.
+- Corrected `set_position` on macOS to set outer frame position, not content area position.
+- Added `get_inner_position` method to `Window`, which gets the position of the window's client area. This is implemented on all applicable platforms (all desktop platforms other than Wayland, where this isn't possible).
+- **Breaking:** the `Closed` event has been replaced by `CloseRequested` and `Destroyed`. To migrate, you typically just need to replace all usages of `Closed` with `CloseRequested`; see example programs for more info. The exception is iOS, where `Closed` must be replaced by `Destroyed`.
+
+# Version 0.12.0 (2018-04-06)
+
+- Added subclass to macos windows so they can be made resizable even with no decorations.
+- Dead keys now work properly on X11, no longer resulting in a panic.
+- On X11, input method creation first tries to use the value from the user's `XMODIFIERS` environment variable, so application developers should no longer need to manually call `XSetLocaleModifiers`. If that fails, fallbacks are tried, which should prevent input method initialization from ever outright failing.
+- Fixed thread safety issues with input methods on X11.
+- Add support for `Touch` for win32 backend.
+- Fixed `Window::get_inner_size` and friends to return the size in pixels instead of points when using HIDPI displays on OSX.
+
+# Version 0.11.3 (2018-03-28)
+
+- Added `set_min_dimensions` and `set_max_dimensions` methods to `Window`, and implemented on Windows, X11, Wayland, and OSX.
+- On X11, dropping a `Window` actually closes it now, and clicking the window's × button (or otherwise having the WM signal to close it) will result in the window closing.
+- Added `WindowBuilderExt` methods for macos: `with_titlebar_transparent`,
+  `with_title_hidden`, `with_titlebar_buttons_hidden`,
+  `with_fullsize_content_view`.
+- Mapped X11 numpad keycodes (arrows, Home, End, PageUp, PageDown, Insert and Delete) to corresponding virtual keycodes
+
+# Version 0.11.2 (2018-03-06)
+
+- Impl `Hash`, `PartialEq`, and `Eq` for `events::ModifiersState`.
+- Implement `MonitorId::get_hidpi_factor` for MacOS.
+- Added method `os::macos::MonitorIdExt::get_nsscreen() -> *mut c_void` that gets a `NSScreen` object matching the monitor ID.
+- Send `Awakened` event on Android when event loop is woken up.
+
+# Version 0.11.1 (2018-02-19)
+
+- Fixed windows not receiving mouse events when click-dragging the mouse outside the client area of a window, on Windows platforms.
+- Added method `os::android::EventsLoopExt:set_suspend_callback(Option<Box<Fn(bool) -> ()>>)` that allows glutin to register a callback when a suspend event happens
+
+# Version 0.11.0 (2018-02-09)
+
+- Implement `MonitorId::get_dimensions` for Android.
+- Added method `os::macos::WindowBuilderExt::with_movable_by_window_background(bool)` that allows to move a window without a titlebar - `with_decorations(false)`
+- Implement `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for Wayland.
+- Added `Caret` as VirtualKeyCode and support OSX ^-Key with german input.
+
+# Version 0.10.1 (2018-02-05)
+
+*Yanked*
+
+# Version 0.10.0 (2017-12-27)
+
+- Add support for `Touch` for emscripten backend.
+- Added support for `DroppedFile`, `HoveredFile`, and `HoveredFileCancelled` to X11 backend.
+- **Breaking:** `unix::WindowExt` no longer returns pointers for things that aren't actually pointers; `get_xlib_window` now returns `Option<std::os::raw::c_ulong>` and `get_xlib_screen_id` returns `Option<std::os::raw::c_int>`. Additionally, methods that previously returned `libc::c_void` have been changed to return `std::os::raw::c_void`, which are not interchangeable types, so users wanting the former will need to explicitly cast.
+- Added `set_decorations` method to `Window` to allow decorations to be toggled after the window is built. Presently only implemented on X11.
+- Raised the minimum supported version of Rust to 1.20 on MacOS due to usage of associated constants in new versions of cocoa and core-graphics.
+- Added `modifiers` field to `MouseInput`, `MouseWheel`, and `CursorMoved` events to track the modifiers state (`ModifiersState`).
+- Fixed the emscripten backend to return the size of the canvas instead of the size of the window.
+
+# Version 0.9.0 (2017-12-01)
+
+- Added event `WindowEvent::HiDPIFactorChanged`.
+- Added method `MonitorId::get_hidpi_factor`.
+- Deprecated `get_inner_size_pixels` and `get_inner_size_points` methods of `Window` in favor of
+`get_inner_size`.
+- **Breaking:** `EventsLoop` is `!Send` and `!Sync` because of platform-dependant constraints,
+  but `Window`, `WindowId`, `DeviceId` and `MonitorId` guaranteed to be `Send`.
+- `MonitorId::get_position` now returns `(i32, i32)` instead of `(u32, u32)`.
+- Rewrite of the wayland backend to use wayland-client-0.11
+- Support for dead keys on wayland for keyboard utf8 input
+- Monitor enumeration on Windows is now implemented using `EnumDisplayMonitors` instead of
+`EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`.
+- On Windows added `MonitorIdExt::hmonitor` method
+- Impl `Clone` for `EventsLoopProxy`
+- `EventsLoop::get_primary_monitor()` on X11 will fallback to any available monitor if no primary is found
+- Support for touch event on wayland
+- `WindowEvent`s `MouseMoved`, `MouseEntered`, and `MouseLeft` have been renamed to
+`CursorMoved`, `CursorEntered`, and `CursorLeft`.
+- New `DeviceEvent`s added, `MouseMotion` and `MouseWheel`.
+- Send `CursorMoved` event after `CursorEntered` and `Focused` events.
+- Add support for `ModifiersState`, `MouseMove`, `MouseInput`, `MouseMotion` for emscripten backend.
+
+# Version 0.8.3 (2017-10-11)
+
+- Fixed issue of calls to `set_inner_size` blocking on Windows.
+- Mapped `ISO_Left_Tab` to `VirtualKeyCode::Tab` to make the key work with modifiers
+- Fixed the X11 backed on 32bit targets
+
+# Version 0.8.2 (2017-09-28)
+
+- Uniformize keyboard scancode values accross Wayland and X11 (#297).
+- Internal rework of the wayland event loop
+- Added method `os::linux::WindowExt::is_ready`
+
+# Version 0.8.1 (2017-09-22)
+
+- Added various methods to `os::linux::EventsLoopExt`, plus some hidden items necessary to make
+  glutin work.
+
+# Version 0.8.0 (2017-09-21)
+
+- Added `Window::set_maximized`, `WindowAttributes::maximized` and `WindowBuilder::with_maximized`.
+- Added `Window::set_fullscreen`.
+- Changed `with_fullscreen` to take a `Option<MonitorId>` instead of a `MonitorId`.
+- Removed `MonitorId::get_native_identifer()` in favor of platform-specific traits in the `os`
+  module.
+- Changed `get_available_monitors()` and `get_primary_monitor()` to be methods of `EventsLoop`
+  instead of stand-alone methods.
+- Changed `EventsLoop` to be tied to a specific X11 or Wayland connection.
+- Added a `os::linux::EventsLoopExt` trait that makes it possible to configure the connection.
+- Fixed the emscripten code, which now compiles.
+- Changed the X11 fullscreen code to use `xrandr` instead of `xxf86vm`.
+- Fixed the Wayland backend to produce `Refresh` event after window creation.
+- Changed the `Suspended` event to be outside of `WindowEvent`.
+- Fixed the X11 backend sometimes reporting the wrong virtual key (#273).

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "winit"
-version = "0.6.3"
+version = "0.17.2"
 authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
 keywords = ["windowing"]
@@ -10,34 +10,52 @@ repository = "https://github.com/tomaka/winit"
 documentation = "https://docs.rs/winit"
 categories = ["gui"]
 
+[package.metadata.docs.rs]
+features = ["icon_loading"]
+
+[features]
+icon_loading = ["image"]
+
 [dependencies]
-lazy_static = "0.2.2"
+lazy_static = "1"
 libc = "0.2"
-shared_library = "0.1.5"
+log = "0.4"
+image = { version = "0.19", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.2"
 
 [target.'cfg(target_os = "ios")'.dependencies]
-objc = "0.2"
+objc = "0.2.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = "0.2"
-cgl = "0.2"
-cocoa = "=0.5.2"
-core-foundation = "0.2"
-core-graphics = "0.4"
+objc = "0.2.3"
+cocoa = "0.17"
+core-foundation = "0.6"
+core-graphics = "0.16"
 
-[target.'cfg(target_os = "windows")'.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
+[target.'cfg(target_os = "windows")'.dependencies.winapi]
+version = "0.3.5"
+features = [
+    "combaseapi",
+    "dwmapi",
+    "hidusage",
+    "libloaderapi",
+    "objbase",
+    "processthreadsapi",
+    "shellapi",
+    "shellscalingapi",
+    "shobjidl_core",
+    "unknwnbase",
+    "windowsx",
+    "wingdi",
+    "winnt",
+    "winuser",
+]
 
-[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
-wayland-client = { version = "0.8.6", features = ["dlopen"] }
-wayland-kbd = "0.8.0"
-wayland-window = "0.5.0"
-x11-dl = "2.8"
+[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"
+x11-dl = "2.18.3"
+parking_lot = "0.6"
+percent-encoding = "1.0"

README.md

@@ -4,12 +4,12 @@
 
 [![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
 
-[![Build Status](https://travis-ci.org/tomaka/winit.png?branch=master)](https://travis-ci.org/tomaka/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)
 
 ```toml
 [dependencies]
-winit = "0.5"
+winit = "0.17"
 ```
 
 ## [Documentation](https://docs.rs/winit)
@@ -17,7 +17,7 @@ winit = "0.5"
 ## Usage
 
 Winit is a window creation and management library. It can create windows and lets you handle
-events (for example: the window being resized, a key being pressed, a mouse mouvement, etc.)
+events (for example: the window being resized, a key being pressed, a mouse movement, etc.)
 produced by window.
 
 Winit is designed to be a low-level brick in a hierarchy of libraries. Consequently, in order to
@@ -28,13 +28,29 @@ another library.
 extern crate winit;
 
 fn main() {
-    let window = winit::Window::new().unwrap();
+    let mut events_loop = winit::EventsLoop::new();
+    let window = winit::Window::new(&events_loop).unwrap();
 
-    for event in window.wait_events() {
+    events_loop.run_forever(|event| {
         match event {
-            winit::Event::Closed => break,
-            _ => ()
+            winit::Event::WindowEvent {
+              event: winit::WindowEvent::CloseRequested,
+              ..
+            } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
-    }
+    });
 }
 ```
+
+### Platform-specific usage
+
+#### Emscripten and WebAssembly
+
+Building a binary will yield a `.js` file. In order to use it in an HTML file, you need to:
+
+- Put a `<canvas id="my_id"></canvas>` element somewhere. A canvas corresponds to a winit "window".
+- Write a Javascript code that creates a global variable named `Module`. Set `Module.canvas` to
+  the element of the `<canvas>` element (in the example you would retrieve it via `document.getElementById("my_id")`).
+  More information [here](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
+- Make sure that you insert the `.js` file generated by Rust after the `Module` variable is created.

appveyor.yml

@@ -1,12 +1,19 @@
 environment:
   matrix:
   - TARGET: x86_64-pc-windows-msvc
+    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
+    CHANNEL: nightly
 install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
-  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init -yv --default-toolchain %CHANNEL% --default-host %TARGET%
+  - SET PATH=%PATH%;%USERPROFILE%\.cargo\bin
   - SET PATH=%PATH%;C:\MinGW\bin
   - rustc -V
   - cargo -V

examples/cursor.rs

@@ -1,19 +1,19 @@
 extern crate winit;
 
-use winit::{Event, ElementState, MouseCursor, WindowEvent};
+use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
 
 fn main() {
-    let events_loop = winit::EventsLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
     window.set_title("A fantastic window!");
 
-    let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::NoneCursor, 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 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| {
         match event {
-            Event::WindowEvent { event: WindowEvent::KeyboardInput(ElementState::Pressed, _, _, _), .. } => {
+            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 {
@@ -22,10 +22,11 @@ fn main() {
                     cursor_idx = 0;
                 }
             },
-            Event::WindowEvent { event: WindowEvent::Closed, .. } => {
-                events_loop.interrupt()
+            Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+                return ControlFlow::Break;
             },
             _ => ()
         }
+        ControlFlow::Continue
     });
 }

examples/cursor_grab.rs

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

examples/fullscreen.rs

@@ -1,11 +1,14 @@
 extern crate winit;
 
 use std::io::{self, Write};
+use winit::{ControlFlow, Event, WindowEvent};
 
 fn main() {
+    let mut events_loop = winit::EventsLoop::new();
+
     // enumerating monitors
     let monitor = {
-        for (num, monitor) in winit::get_available_monitors().enumerate() {
+        for (num, monitor) in events_loop.get_available_monitors().enumerate() {
             println!("Monitor #{}: {:?}", num, monitor.get_name());
         }
 
@@ -15,32 +18,62 @@ fn main() {
         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 = winit::get_available_monitors().nth(num).expect("Please enter a valid ID");
+        let monitor = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
 
         println!("Using {:?}", monitor.get_name());
 
         monitor
     };
 
-    let events_loop = winit::EventsLoop::new();
-
-    let _window = winit::WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("Hello world!")
-        .with_fullscreen(monitor)
+        .with_fullscreen(Some(monitor))
         .build(&events_loop)
         .unwrap();
 
+    let mut is_fullscreen = true;
+    let mut is_maximized = false;
+    let mut decorations = true;
+
     events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            winit::Event::WindowEvent { event, .. } => {
-                match event {
-                    winit::WindowEvent::Closed => events_loop.interrupt(),
-                    winit::WindowEvent::KeyboardInput(_, _, Some(winit::VirtualKeyCode::Escape), _) => events_loop.interrupt(),
-                    _ => ()
-                }
+            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);
+                    }
+                    _ => (),
+                },
+                _ => (),
             },
+            _ => {}
         }
+
+        ControlFlow::Continue
     });
 }

examples/grabbing.rs

@@ -1,42 +0,0 @@
-extern crate winit;
-
-use winit::{WindowEvent, ElementState};
-
-fn main() {
-    let events_loop = winit::EventsLoop::new();
-
-    let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
-    window.set_title("winit - Cursor grabbing test");
-
-    let mut grabbed = false;
-
-    events_loop.run_forever(|event| {
-        println!("{:?}", event);
-
-        match event {
-            winit::Event::WindowEvent { event, .. } => {
-                match event {
-                    WindowEvent::KeyboardInput(ElementState::Pressed, _, _, _) => {
-                        if grabbed {
-                            grabbed = false;
-                            window.set_cursor_state(winit::CursorState::Normal)
-                                .ok().expect("could not ungrab mouse cursor");
-                        } else {
-                            grabbed = true;
-                            window.set_cursor_state(winit::CursorState::Grab)
-                                .ok().expect("could not grab mouse cursor");
-                        }
-                    },
-
-                    WindowEvent::Closed => events_loop.interrupt(),
-
-                    a @ WindowEvent::MouseMoved(_, _) => {
-                        println!("{:?}", a);
-                    },
-
-                    _ => (),
-                }
-            },
-        }
-    });
-}

examples/handling_close.rs

@@ -0,0 +1,74 @@
+extern crate winit;
+
+fn main() {
+    let mut events_loop = winit::EventsLoop::new();
+
+    let _window = winit::WindowBuilder::new()
+        .with_title("Your faithful window")
+        .build(&events_loop)
+        .unwrap();
+
+    let mut close_requested = false;
+
+    events_loop.run_forever(|event| {
+        use winit::WindowEvent::*;
+        use winit::ElementState::Released;
+        use winit::VirtualKeyCode::{N, Y};
+
+        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.
+
+                    // 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!");
+
+                            // For a single-window application like this, you'd normally just
+                            // break out of the event loop here. If you wanted to keep running the
+                            // event loop (i.e. if it's a multi-window application), you need to
+                            // drop the window. That closes it, and results in `Destroyed` being
+                            // sent.
+                            return winit::ControlFlow::Break;
+                        }
+                    }
+                    N => {
+                        if close_requested {
+                            println!("Your window will continue to stay by your side.");
+                            close_requested = false;
+                        }
+                    }
+                    _ => (),
+                },
+                _ => (),
+            },
+            _ => (),
+        }
+
+        winit::ControlFlow::Continue
+    });
+}

examples/min_max_size.rs

@@ -1,20 +1,23 @@
 extern crate winit;
 
-fn main() {
-    let events_loop = winit::EventsLoop::new();
+use winit::dpi::LogicalSize;
 
-    let _window = winit::WindowBuilder::new()
-        .with_min_dimensions(400, 200)
-        .with_max_dimensions(800, 400)
+fn main() {
+    let mut events_loop = winit::EventsLoop::new();
+
+    let window = winit::WindowBuilder::new()
         .build(&events_loop)
         .unwrap();
 
+    window.set_min_dimensions(Some(LogicalSize::new(400.0, 200.0)));
+    window.set_max_dimensions(Some(LogicalSize::new(800.0, 400.0)));
+
     events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
-            _ => ()
+            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/monitor_list.rs

@@ -0,0 +1,7 @@
+extern crate winit;
+
+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());
+}

examples/multiwindow.rs

@@ -1,33 +1,33 @@
 extern crate winit;
 
+use std::collections::HashMap;
+
 fn main() {
-    let events_loop = winit::EventsLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window1 = winit::Window::new(&events_loop).unwrap();
-    let window2 = winit::Window::new(&events_loop).unwrap();
-    let window3 = winit::Window::new(&events_loop).unwrap();
-
-    let mut num_windows = 3;
+    let mut windows = HashMap::new();
+    for _ in 0..3 {
+        let window = winit::Window::new(&events_loop).unwrap();
+        windows.insert(window.id(), window);
+    }
 
     events_loop.run_forever(|event| {
         match event {
-            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, window_id } => {
-                if window_id == window1.id() {
-                    println!("Window 1 has been closed")
-                } else if window_id == window2.id() {
-                    println!("Window 2 has been closed")
-                } else if window_id == window3.id() {
-                    println!("Window 3 has been closed");
-                } else {
-                    unreachable!()
-                }
+            winit::Event::WindowEvent {
+                event: winit::WindowEvent::CloseRequested,
+                window_id,
+            } => {
+                println!("Window {:?} has received the signal to close", window_id);
 
-                num_windows -= 1;
-                if num_windows == 0 {
-                    events_loop.interrupt();
+                // This drops the window, causing it to close.
+                windows.remove(&window_id);
+
+                if windows.is_empty() {
+                    return winit::ControlFlow::Break;
                 }
-            },
+            }
             _ => (),
         }
+        winit::ControlFlow::Continue
     })
 }

examples/proxy.rs

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

examples/resizable.rs

@@ -0,0 +1,38 @@
+extern crate winit;
+
+fn main() {
+    let mut events_loop = winit::EventsLoop::new();
+
+    let mut resizable = false;
+
+    let window = winit::WindowBuilder::new()
+        .with_title("Hit space to toggle resizability.")
+        .with_dimensions((400, 200).into())
+        .with_resizable(resizable)
+        .build(&events_loop)
+        .unwrap();
+
+    events_loop.run_forever(|event| {
+        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);
+                }
+                _ => (),
+            },
+            _ => (),
+        };
+        winit::ControlFlow::Continue
+    });
+}

examples/transparent.rs

@@ -1,7 +1,7 @@
 extern crate winit;
 
 fn main() {
-    let events_loop = winit::EventsLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().with_decorations(false)
                                                  .with_transparency(true)
@@ -13,8 +13,8 @@ fn main() {
         println!("{:?}", event);
 
         match event {
-            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
-            _ => ()
+            winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/window.rs

@@ -1,9 +1,9 @@
 extern crate winit;
 
 fn main() {
-    let events_loop = winit::EventsLoop::new();
+    let mut events_loop = winit::EventsLoop::new();
 
-    let window = winit::WindowBuilder::new()
+    let _window = winit::WindowBuilder::new()
         .with_title("A fantastic window!")
         .build(&events_loop)
         .unwrap();
@@ -12,8 +12,11 @@ fn main() {
         println!("{:?}", event);
 
         match event {
-            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
-            _ => ()
+            winit::Event::WindowEvent {
+                event: winit::WindowEvent::CloseRequested,
+                ..
+            } => winit::ControlFlow::Break,
+            _ => winit::ControlFlow::Continue,
         }
     });
 }

examples/window_icon.rs

@@ -0,0 +1,95 @@
+// 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 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 window = winit::WindowBuilder::new()
+        .with_title("An iconic window!")
+        // At present, this only does anything on Windows and X11, so if you want to save load
+        // time, you can put icon loading behind a function that returns `None` on other platforms.
+        .with_window_icon(Some(icon))
+        .build(&events_loop)
+        .unwrap();
+
+    events_loop.run_forever(|event| {
+        if let winit::Event::WindowEvent { event, .. } = event {
+            use winit::WindowEvent::*;
+            match event {
+                CloseRequested => return winit::ControlFlow::Break,
+                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()));
+                },
+                _ => (),
+            }
+        }
+        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
+"#);
+}

src/api_transition.rs

@@ -1,101 +0,0 @@
-
-//! This temporary module generates types that wrap around the old API (winit v5 and below) and
-//! expose the new API (winit v6 and above).
-//!
-//! This is temporary so that existing backends can smoothly transition. After all implementations
-//! have finished transitionning, this module should disappear.
-
-macro_rules! gen_api_transition {
-    () => {
-        pub struct EventsLoop {
-            windows: ::std::sync::Mutex<Vec<::std::sync::Arc<Window>>>,
-            interrupted: ::std::sync::atomic::AtomicBool,
-        }
-
-        impl EventsLoop {
-            pub fn new() -> EventsLoop {
-                EventsLoop {
-                    windows: ::std::sync::Mutex::new(vec![]),
-                    interrupted: ::std::sync::atomic::AtomicBool::new(false),
-                }
-            }
-
-            pub fn interrupt(&self) {
-                self.interrupted.store(true, ::std::sync::atomic::Ordering::Relaxed);
-            }
-
-            pub fn poll_events<F>(&self, mut callback: F)
-                where F: FnMut(::Event)
-            {
-                let mut windows = self.windows.lock().unwrap();
-                for window in windows.iter() {
-                    for event in window.poll_events() {
-                        callback(::Event::WindowEvent {
-                            window_id: ::WindowId(WindowId(&**window as *const Window as usize)),
-                            event: event,
-                        })
-                    }
-                }
-            }
-
-            pub fn run_forever<F>(&self, mut callback: F)
-                where F: FnMut(::Event)
-            {
-                self.interrupted.store(false, ::std::sync::atomic::Ordering::Relaxed);
-
-                // Yeah that's a very bad implementation.
-                loop {
-                    self.poll_events(|e| callback(e));
-                    ::std::thread::sleep_ms(5);
-                    if self.interrupted.load(::std::sync::atomic::Ordering::Relaxed) {
-                        break;
-                    }
-                }
-            }
-        }
-
-        #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-        pub struct WindowId(usize);
-
-        pub struct Window2 {
-            pub window: ::std::sync::Arc<Window>,
-            events_loop: ::std::sync::Weak<EventsLoop>,
-        }
-
-        impl ::std::ops::Deref for Window2 {
-            type Target = Window;
-            #[inline]
-            fn deref(&self) -> &Window {
-                &*self.window
-            }
-        }
-
-        impl Window2 {
-            pub fn new(events_loop: ::std::sync::Arc<EventsLoop>, window: &::WindowAttributes,
-                       pl_attribs: &PlatformSpecificWindowBuilderAttributes)
-                       -> Result<Window2, CreationError>
-            {
-                let win = ::std::sync::Arc::new(try!(Window::new(window, pl_attribs)));
-                events_loop.windows.lock().unwrap().push(win.clone());
-                Ok(Window2 {
-                    window: win,
-                    events_loop: ::std::sync::Arc::downgrade(&events_loop),
-                })
-            }
-
-            #[inline]
-            pub fn id(&self) -> WindowId {
-                WindowId(&*self.window as *const Window as usize)
-            }
-        }
-
-        impl Drop for Window2 {
-            fn drop(&mut self) {
-                if let Some(ev) = self.events_loop.upgrade() {
-                    let mut windows = ev.windows.lock().unwrap();
-                    windows.retain(|w| &**w as *const Window != &*self.window as *const _);
-                }
-            }
-        }
-    };
-}

src/dpi.rs

@@ -0,0 +1,317 @@
+
+//! 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
+//! window-related functions both produce and consume logical pixels. Monitor-related functions still use physical
+//! pixels, as do any context-related functions in `glutin`.
+//!
+//! If you've never heard of these terms before, then you're not alone, and this documentation will explain the
+//! concepts.
+//!
+//! Modern screens have a defined physical resolution, most commonly 1920x1080. Indepedent of that is the amount of
+//! space the screen occupies, which is to say, the height and width in millimeters. The relationship between these two
+//! measurements is the *pixel density*. Mobile screens require a high pixel density, as they're held close to the
+//! eyes. Larger displays also require a higher pixel density, hence the growing presence of 1440p and 4K displays.
+//!
+//! So, this presents a problem. Let's say we want to render a square 100px button. It will occupy 100x100 of the
+//! screen's pixels, which in many cases, seems perfectly fine. However, because this size doesn't account for the
+//! screen's dimensions or pixel density, the button's size can vary quite a bit. On a 4K display, it would be unusably
+//! small.
+//!
+//! That's a description of what happens when the button is 100x100 *physical* pixels. Instead, let's try using 100x100
+//! *logical* pixels. To map logical pixels to physical pixels, we simply multiply by the DPI (dots per inch) factor.
+//! On a "typical" desktop display, the DPI factor will be 1.0, so 100x100 logical pixels equates to 100x100 physical
+//! pixels. However, a 1440p display may have a DPI factor of 1.25, so the button is rendered as 125x125 physical pixels.
+//! Ideally, the button now has approximately the same perceived size across varying displays.
+//!
+//! Failure to account for the DPI factor can create a badly degraded user experience. Most notably, it can make users
+//! feel like they have bad eyesight, which will potentially cause them to think about growing elderly, resulting in
+//! 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 also retrieve the DPI factor of a monitor by calling
+//!   [`MonitorId::get_hidpi_factor`](../struct.MonitorId.html#method.get_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()`.
+//!
+//! 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.
+//!
+//! 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.
+//! While users are free to select any option they want, they're only given a selection of "nice" DPI factors, i.e.
+//! 1.0, 1.25, 1.5... on Windows 7, the DPI factor is global and changing it requires logging out.
+//! - **macOS:** The buzzword is "retina displays", which have a DPI factor of 2.0. Otherwise, the DPI factor is 1.0.
+//! Intermediate DPI factors are never used, thus 1440p displays/etc. aren't properly supported. It's possible for any
+//! display to use that 2.0 DPI factor, given the use of the command line.
+//! - **X11:** On X11, we calcuate the DPI factor based on the millimeter dimensions provided by XRandR. This can
+//! 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.
+//! - **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,
+//! 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.
+//!
+//! 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.
+
+/// Checks that the DPI factor is a normal positive `f64`.
+///
+/// All functions that take a DPI factor assert that this will return `true`. If you're sourcing DPI factors from
+/// anywhere other than winit, it's recommended to validate them using this function before passing them to winit;
+/// otherwise, you risk panics.
+#[inline]
+pub fn validate_hidpi_factor(dpi_factor: f64) -> bool {
+    dpi_factor.is_sign_positive() && dpi_factor.is_normal()
+}
+
+/// A position represented in logical pixels.
+///
+/// The position is stored as floats, so please be careful. Casting floats to integers truncates the fractional part,
+/// 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)]
+pub struct LogicalPosition {
+    pub x: f64,
+    pub y: f64,
+}
+
+impl LogicalPosition {
+    #[inline]
+    pub fn new(x: f64, y: f64) -> Self {
+        LogicalPosition { x, y }
+    }
+
+    #[inline]
+    pub fn from_physical<T: Into<PhysicalPosition>>(physical: T, dpi_factor: f64) -> Self {
+        physical.into().to_logical(dpi_factor)
+    }
+
+    #[inline]
+    pub fn to_physical(&self, dpi_factor: f64) -> PhysicalPosition {
+        assert!(validate_hidpi_factor(dpi_factor));
+        let x = self.x * dpi_factor;
+        let y = self.y * dpi_factor;
+        PhysicalPosition::new(x, y)
+    }
+}
+
+impl From<(f64, f64)> for LogicalPosition {
+    #[inline]
+    fn from((x, y): (f64, f64)) -> Self {
+        Self::new(x, y)
+    }
+}
+
+impl From<(i32, i32)> for LogicalPosition {
+    #[inline]
+    fn from((x, y): (i32, i32)) -> Self {
+        Self::new(x as f64, y as f64)
+    }
+}
+
+impl Into<(f64, f64)> for LogicalPosition {
+    #[inline]
+    fn into(self) -> (f64, f64) {
+        (self.x, self.y)
+    }
+}
+
+impl Into<(i32, i32)> for LogicalPosition {
+    /// Note that this rounds instead of truncating.
+    #[inline]
+    fn into(self) -> (i32, i32) {
+        (self.x.round() as _, self.y.round() as _)
+    }
+}
+
+/// A position represented in physical pixels.
+///
+/// The position is stored as floats, so please be careful. Casting floats to integers truncates the fractional part,
+/// 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)]
+pub struct PhysicalPosition {
+    pub x: f64,
+    pub y: f64,
+}
+
+impl PhysicalPosition {
+    #[inline]
+    pub fn new(x: f64, y: f64) -> Self {
+        PhysicalPosition { x, y }
+    }
+
+    #[inline]
+    pub fn from_logical<T: Into<LogicalPosition>>(logical: T, dpi_factor: f64) -> Self {
+        logical.into().to_physical(dpi_factor)
+    }
+
+    #[inline]
+    pub fn to_logical(&self, dpi_factor: f64) -> LogicalPosition {
+        assert!(validate_hidpi_factor(dpi_factor));
+        let x = self.x / dpi_factor;
+        let y = self.y / dpi_factor;
+        LogicalPosition::new(x, y)
+    }
+}
+
+impl From<(f64, f64)> for PhysicalPosition {
+    #[inline]
+    fn from((x, y): (f64, f64)) -> Self {
+        Self::new(x, y)
+    }
+}
+
+impl From<(i32, i32)> for PhysicalPosition {
+    #[inline]
+    fn from((x, y): (i32, i32)) -> Self {
+        Self::new(x as f64, y as f64)
+    }
+}
+
+impl Into<(f64, f64)> for PhysicalPosition {
+    #[inline]
+    fn into(self) -> (f64, f64) {
+        (self.x, self.y)
+    }
+}
+
+impl Into<(i32, i32)> for PhysicalPosition {
+    /// Note that this rounds instead of truncating.
+    #[inline]
+    fn into(self) -> (i32, i32) {
+        (self.x.round() as _, self.y.round() as _)
+    }
+}
+
+/// A size represented in logical pixels.
+///
+/// The size is stored as floats, so please be careful. Casting floats to integers truncates the fractional part,
+/// 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)]
+pub struct LogicalSize {
+    pub width: f64,
+    pub height: f64,
+}
+
+impl LogicalSize {
+    #[inline]
+    pub fn new(width: f64, height: f64) -> Self {
+        LogicalSize { width, height }
+    }
+
+    #[inline]
+    pub fn from_physical<T: Into<PhysicalSize>>(physical: T, dpi_factor: f64) -> Self {
+        physical.into().to_logical(dpi_factor)
+    }
+
+    #[inline]
+    pub fn to_physical(&self, dpi_factor: f64) -> PhysicalSize {
+        assert!(validate_hidpi_factor(dpi_factor));
+        let width = self.width * dpi_factor;
+        let height = self.height * dpi_factor;
+        PhysicalSize::new(width, height)
+    }
+}
+
+impl From<(f64, f64)> for LogicalSize {
+    #[inline]
+    fn from((width, height): (f64, f64)) -> Self {
+        Self::new(width, height)
+    }
+}
+
+impl From<(u32, u32)> for LogicalSize {
+    #[inline]
+    fn from((width, height): (u32, u32)) -> Self {
+        Self::new(width as f64, height as f64)
+    }
+}
+
+impl Into<(f64, f64)> for LogicalSize {
+    #[inline]
+    fn into(self) -> (f64, f64) {
+        (self.width, self.height)
+    }
+}
+
+impl Into<(u32, u32)> for LogicalSize {
+    /// Note that this rounds instead of truncating.
+    #[inline]
+    fn into(self) -> (u32, u32) {
+        (self.width.round() as _, self.height.round() as _)
+    }
+}
+
+/// A size represented in physical pixels.
+///
+/// The size is stored as floats, so please be careful. Casting floats to integers truncates the fractional part,
+/// 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)]
+pub struct PhysicalSize {
+    pub width: f64,
+    pub height: f64,
+}
+
+impl PhysicalSize {
+    #[inline]
+    pub fn new(width: f64, height: f64) -> Self {
+        PhysicalSize { width, height }
+    }
+
+    #[inline]
+    pub fn from_logical<T: Into<LogicalSize>>(logical: T, dpi_factor: f64) -> Self {
+        logical.into().to_physical(dpi_factor)
+    }
+
+    #[inline]
+    pub fn to_logical(&self, dpi_factor: f64) -> LogicalSize {
+        assert!(validate_hidpi_factor(dpi_factor));
+        let width = self.width / dpi_factor;
+        let height = self.height / dpi_factor;
+        LogicalSize::new(width, height)
+    }
+}
+
+impl From<(f64, f64)> for PhysicalSize {
+    #[inline]
+    fn from((width, height): (f64, f64)) -> Self {
+        Self::new(width, height)
+    }
+}
+
+impl From<(u32, u32)> for PhysicalSize {
+    #[inline]
+    fn from((width, height): (u32, u32)) -> Self {
+        Self::new(width as f64, height as f64)
+    }
+}
+
+impl Into<(f64, f64)> for PhysicalSize {
+    #[inline]
+    fn into(self) -> (f64, f64) {
+        (self.width, self.height)
+    }
+}
+
+impl Into<(u32, u32)> for PhysicalSize {
+    /// Note that this rounds instead of truncating.
+    #[inline]
+    fn into(self) -> (u32, u32) {
+        (self.width.round() as _, self.height.round() as _)
+    }
+}

src/events.rs

@@ -1,31 +1,50 @@
 use std::path::PathBuf;
-use WindowId;
 
+use {DeviceId, LogicalPosition, LogicalSize, WindowId};
+
+/// Describes a generic event.
 #[derive(Clone, Debug)]
 pub enum Event {
     WindowEvent {
         window_id: WindowId,
         event: WindowEvent,
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum WindowEvent {
-    // TODO: remove ; can break the lib internally so be careful
+    },
+    DeviceEvent {
+        device_id: DeviceId,
+        event: DeviceEvent,
+    },
     Awakened,
 
-    /// The size of the window has changed.
-    Resized(u32, u32),
+    /// The application has been suspended or resumed.
+    ///
+    /// The parameter is true if app was suspended, and false if it has been resumed.
+    Suspended(bool),
+}
 
-    /// The position of the window has changed.
-    Moved(i32, i32),
+/// Describes an event from a `Window`.
+#[derive(Clone, Debug)]
+pub enum WindowEvent {
+    /// The size of the window has changed. Contains the client area's new dimensions.
+    Resized(LogicalSize),
 
-    /// The window has been closed.
-    Closed,
+    /// The position of the window has changed. Contains the window's new position.
+    Moved(LogicalPosition),
+
+    /// The window has been requested to close.
+    CloseRequested,
+
+    /// The window has been destroyed.
+    Destroyed,
 
     /// A file has been dropped into the window.
     DroppedFile(PathBuf),
 
+    /// A file is being hovered over the window.
+    HoveredFile(PathBuf),
+
+    /// A file was hovered, but has exited the window.
+    HoveredFileCancelled,
+
     /// The window received a unicode character.
     ReceivedCharacter(char),
 
@@ -35,44 +54,124 @@ pub enum WindowEvent {
     Focused(bool),
 
     /// An event from the keyboard has been received.
-    KeyboardInput(ElementState, ScanCode, Option<VirtualKeyCode>, ModifiersState),
+    KeyboardInput { device_id: DeviceId, input: KeyboardInput },
 
     /// The cursor has moved on the window.
-    ///
-    /// The parameter are the (x,y) coords in pixels relative to the top-left corner of the window.
-    MouseMoved(i32, i32),
+    CursorMoved {
+        device_id: DeviceId,
+
+        /// (x,y) coords in pixels relative to the top-left corner of the window. Because the range of this data is
+        /// 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
+    },
 
     /// The cursor has entered the window.
-    MouseEntered,
+    CursorEntered { device_id: DeviceId },
 
     /// The cursor has left the window.
-    MouseLeft,
+    CursorLeft { device_id: DeviceId },
 
     /// A mouse wheel movement or touchpad scroll occurred.
-    MouseWheel(MouseScrollDelta, TouchPhase),
+    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 },
 
-    /// An event from the mouse has been received.
-    MouseInput(ElementState, MouseButton),
 
     /// 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(f32, 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 },
 
     /// The window needs to be redrawn.
     Refresh,
 
-    /// App has been suspended or resumed.
-    ///
-    /// The parameter is true if app was suspended, and false if it has been resumed.
-    Suspended(bool),
-
     /// Touch event has been received
-    Touch(Touch)
+    Touch(Touch),
+
+    /// The DPI factor of the window has changed.
+    ///
+    /// The following user actions can cause DPI changes:
+    ///
+    /// * Changing the display's resolution.
+    /// * Changing the display's DPI factor (e.g. in Control Panel on Windows).
+    /// * Moving the window to a display with a different DPI factor.
+    ///
+    /// For more information about DPI in general, see the [`dpi`](dpi/index.html) module.
+    HiDpiFactorChanged(f64),
 }
 
+/// 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
+/// game controls. Many physical actions, such as mouse movement, can produce both device and window events. Because
+/// window events typically arise from virtual devices (corresponding to GUI cursors and keyboard focus) the device IDs
+/// may not match.
+///
+/// Note that these events are delivered regardless of input focus.
+#[derive(Clone, Debug)]
+pub enum DeviceEvent {
+    Added,
+    Removed,
+
+    /// Change in physical position of a pointing device.
+    ///
+    /// This represents raw, unfiltered physical motion. Not to be confused with `WindowEvent::CursorMoved`.
+    MouseMotion {
+        /// (x, y) change in position in unspecified units.
+        ///
+        /// Different devices may use different units.
+        delta: (f64, f64),
+    },
+
+    /// Physical scroll event
+    MouseWheel {
+        delta: MouseScrollDelta,
+    },
+
+    /// 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 },
+
+    Button { button: ButtonId, state: ElementState },
+    Key(KeyboardInput),
+    Text { codepoint: char },
+}
+
+/// Describes a keyboard input event.
+#[derive(Debug, Clone, Copy)]
+pub struct KeyboardInput {
+    /// Identifies the physical key pressed
+    ///
+    /// This should not change if the user adjusts the host's keyboard map. Use when the physical location of the
+    /// key is more important than the key's host GUI semantics, such as for movement controls in a first-person
+    /// game.
+    pub scancode: ScanCode,
+
+    pub state: ElementState,
+
+    /// Identifies the semantic meaning of the key
+    ///
+    /// Use when the semantics of the key are more important than the physical location of the key, such as when
+    /// implementing appropriate behavior for "page up."
+    pub virtual_keycode: Option<VirtualKeyCode>,
+
+    /// Modifier keys active at the time of this input.
+    ///
+    /// 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
+}
+
+/// Describes touch-screen input state.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum TouchPhase {
     Started,
@@ -81,7 +180,6 @@ pub enum TouchPhase {
     Cancelled
 }
 
-#[derive(Debug, Clone, Copy)]
 /// Represents touch event
 ///
 /// Every time user touches screen new Start event with some finger id is generated.
@@ -97,21 +195,32 @@ 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)]
 pub struct Touch {
+    pub device_id: DeviceId,
     pub phase: TouchPhase,
-    pub location: (f64,f64),
+    pub location: LogicalPosition,
     /// unique identifier of a finger.
     pub id: u64
 }
 
-pub type ScanCode = u8;
+/// Hardware-dependent keyboard scan code.
+pub type ScanCode = u32;
 
+/// Identifier for a specific analog axis on some device.
+pub type AxisId = u32;
+
+/// Identifier for a specific button on some device.
+pub type ButtonId = u32;
+
+/// Describes the input state of a key.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum ElementState {
     Pressed,
     Released,
 }
 
+/// Describes a button of a mouse controller.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum MouseButton {
     Left,
@@ -120,6 +229,7 @@ pub enum MouseButton {
     Other(u8),
 }
 
+/// Describes a difference in the mouse scroll wheel state.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum MouseScrollDelta {
 	/// Amount in lines or rows to scroll in the horizontal
@@ -134,10 +244,12 @@ pub enum MouseScrollDelta {
 	/// Scroll events are expressed as a PixelDelta if
 	/// supported by the device (eg. a touchpad) and
 	/// platform.
-	PixelDelta(f32, f32)
+	PixelDelta(LogicalPosition),
 }
 
+/// Symbolic name for a keyboard key.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[repr(u32)]
 pub enum VirtualKeyCode {
     /// The '1' key over the letters.
     Key1,
@@ -237,6 +349,8 @@ pub enum VirtualKeyCode {
     /// The "Compose" key on Linux.
     Compose,
 
+    Caret,
+
     Numlock,
     Numpad0,
     Numpad1,
@@ -271,7 +385,6 @@ pub enum VirtualKeyCode {
     LAlt,
     LBracket,
     LControl,
-    LMenu,
     LShift,
     LWin,
     Mail,
@@ -296,7 +409,6 @@ pub enum VirtualKeyCode {
     RAlt,
     RBracket,
     RControl,
-    RMenu,
     RShift,
     RWin,
     Semicolon,
@@ -319,12 +431,15 @@ pub enum VirtualKeyCode {
     WebSearch,
     WebStop,
     Yen,
+    Copy,
+    Paste,
+    Cut,
 }
 
 /// Represents the current state of the keyboard modifiers
 ///
 /// Each field of this struct represents a modifier and is `true` if this modifier is active.
-#[derive(Default, Debug, Clone, Copy)]
+#[derive(Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub struct ModifiersState {
     /// The "shift" key
     pub shift: bool,

src/icon.rs

@@ -0,0 +1,170 @@
+use std::{fmt, mem};
+use std::error::Error;
+#[cfg(feature = "icon_loading")]
+use std::io::{BufRead, Seek};
+#[cfg(feature = "icon_loading")]
+use std::path::Path;
+
+#[cfg(feature = "icon_loading")]
+use image;
+
+#[repr(C)]
+#[derive(Debug)]
+pub(crate) struct Pixel {
+    pub(crate) r: u8,
+    pub(crate) g: u8,
+    pub(crate) b: u8,
+    pub(crate) a: u8,
+}
+
+pub(crate) const PIXEL_SIZE: usize = mem::size_of::<Pixel>();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+/// An error produced when using `Icon::from_rgba` with invalid arguments.
+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,
+    },
+    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
+    /// At least one of your arguments is incorrect.
+    DimensionsVsPixelCount {
+        width: u32,
+        height: u32,
+        width_x_height: usize,
+        pixel_count: usize,
+    },
+}
+
+impl fmt::Display for BadIcon {
+    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.",
+                byte_count,
+            ),
+            &BadIcon::DimensionsVsPixelCount {
+                width,
+                height,
+                width_x_height,
+                pixel_count,
+            } => format!(
+                "The specified dimensions ({:?}x{:?}) don't match the number of pixels supplied by the `rgba` argument ({:?}). For those dimensions, the expected pixel count is {:?}.",
+                width, height, pixel_count, width_x_height,
+            ),
+        };
+        write!(formatter, "{}", msg)
+    }
+}
+
+impl Error for BadIcon {
+    fn description(&self) -> &str {
+        "A valid icon cannot be created from these arguments"
+    }
+
+    fn cause(&self) -> Option<&Error> {
+        Some(self)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+/// An icon used for the window titlebar, taskbar, etc.
+///
+/// Enabling the `icon_loading` feature provides you with several convenience methods for creating
+/// an `Icon` from any format supported by the [image](https://github.com/PistonDevelopers/image)
+/// crate.
+pub struct Icon {
+    pub(crate) rgba: Vec<u8>,
+    pub(crate) width: u32,
+    pub(crate) height: u32,
+}
+
+impl Icon {
+    /// Creates an `Icon` from 32bpp RGBA data.
+    ///
+    /// The length of `rgba` must be divisible by 4, and `width * height` must equal
+    /// `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() });
+        }
+        let pixel_count = rgba.len() / PIXEL_SIZE;
+        if pixel_count != (width * height) as usize {
+            Err(BadIcon::DimensionsVsPixelCount {
+                width,
+                height,
+                width_x_height: (width * height) as usize,
+                pixel_count,
+            })
+        } else {
+            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

@@ -1,4 +1,4 @@
-//! Winit allows you to build a window on as many platforms as possible. 
+//! Winit allows you to build a window on as many platforms as possible.
 //!
 //! # Building a window
 //!
@@ -15,7 +15,7 @@
 //!  - Calling `Window::new(&events_loop)`.
 //!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
 //!
-//! The first way is the simpliest way and will give you default values for everything.
+//! 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.
@@ -25,25 +25,28 @@
 //! Once a window has been created, it will *generate events*. For example whenever the user moves
 //! the window, resizes the window, moves the mouse, etc. an event is generated.
 //!
-//! The events generated by a window can be retreived from the `EventsLoop` the window was created
+//! The events generated by a window can be retrieved from the `EventsLoop` the window was created
 //! with.
 //!
 //! There are two ways to do so. The first is to call `events_loop.poll_events(...)`, which will
-//! retreive all the events pending on the windows and immediately return after no new event is
+//! retrieve all the events pending on the windows and immediately return after no new event is
 //! available. You usually want to use this method in application that render continuously on the
 //! screen, such as video games.
 //!
 //! ```no_run
-//! use winit::Event;
-//! use winit::WindowEvent;
+//! use winit::{Event, WindowEvent};
+//! use winit::dpi::LogicalSize;
 //! # use winit::EventsLoop;
-//! # let events_loop = EventsLoop::new();
+//! # let mut events_loop = EventsLoop::new();
 //!
 //! loop {
 //!     events_loop.poll_events(|event| {
 //!         match event {
-//!             Event::WindowEvent { event: WindowEvent::Resized(w, h), .. } => {
-//!                 println!("The window was resized to {}x{}", w, h);
+//!             Event::WindowEvent {
+//!                 event: WindowEvent::Resized(LogicalSize { width, height }),
+//!                 ..
+//!             } => {
+//!                 println!("The window was resized to {}x{}", width, height);
 //!             },
 //!             _ => ()
 //!         }
@@ -52,21 +55,20 @@
 //! ```
 //!
 //! The second way is to call `events_loop.run_forever(...)`. As its name tells, it will run
-//! forever unless it is stopped by calling `events_loop.interrupt()`.
+//! forever unless it is stopped by returning `ControlFlow::Break`.
 //!
 //! ```no_run
-//! use winit::Event;
-//! use winit::WindowEvent;
+//! use winit::{ControlFlow, Event, WindowEvent};
 //! # use winit::EventsLoop;
-//! # let events_loop = EventsLoop::new();
+//! # let mut events_loop = EventsLoop::new();
 //!
 //! events_loop.run_forever(|event| {
 //!     match event {
-//!         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
-//!             println!("The window was closed ; stopping");
-//!             events_loop.interrupt();
+//!         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+//!             println!("The close button was pressed; stopping");
+//!             ControlFlow::Break
 //!         },
-//!         _ => ()
+//!         _ => ControlFlow::Continue,
 //!     }
 //! });
 //! ```
@@ -78,58 +80,48 @@
 //! # Drawing on the window
 //!
 //! Winit doesn't provide any function that allows drawing on a window. However it allows you to
-//! retreive the raw handle of the window (see the `os` module for that), which in turn allows you
+//! 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.
 //!
 
+#[allow(unused_imports)]
 #[macro_use]
 extern crate lazy_static;
-
-#[macro_use]
-extern crate shared_library;
-
 extern crate libc;
+#[macro_use]
+extern crate log;
+#[cfg(feature = "icon_loading")]
+extern crate image;
 
 #[cfg(target_os = "windows")]
 extern crate winapi;
-#[cfg(target_os = "windows")]
-extern crate kernel32;
-#[cfg(target_os = "windows")]
-extern crate shell32;
-#[cfg(target_os = "windows")]
-extern crate gdi32;
-#[cfg(target_os = "windows")]
-extern crate user32;
-#[cfg(target_os = "windows")]
-extern crate dwmapi;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;
 #[cfg(target_os = "macos")]
-extern crate cgl;
-#[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 = "openbsd"))]
+#[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 = "freebsd", target_os = "dragonfly", target_os = "openbsd"))]
-#[macro_use(wayland_env,declare_handler)]
-extern crate wayland_client;
-
-use std::sync::Arc;
+#[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, get_available_monitors, get_primary_monitor};
-pub use native_monitor::NativeMonitorId;
+pub use window::{AvailableMonitorsIter, MonitorId};
+pub use icon::*;
 
-#[macro_use]
-mod api_transition;
-
-mod platform;
+pub mod dpi;
 mod events;
+mod icon;
+mod platform;
 mod window;
 
 pub mod os;
@@ -139,25 +131,22 @@ pub mod os;
 /// # Example
 ///
 /// ```no_run
-/// use winit::Event;
-/// use winit::EventsLoop;
-/// use winit::Window;
-/// use winit::WindowEvent;
+/// use winit::{Event, EventsLoop, Window, WindowEvent, ControlFlow};
 ///
-/// let events_loop = EventsLoop::new();
+/// let mut events_loop = EventsLoop::new();
 /// let window = Window::new(&events_loop).unwrap();
 ///
 /// events_loop.run_forever(|event| {
 ///     match event {
-///         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
-///             events_loop.interrupt();
+///         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
+///             ControlFlow::Break
 ///         },
-///         _ => ()
+///         _ => ControlFlow::Continue,
 ///     }
 /// });
 /// ```
 pub struct Window {
-    window: platform::Window2,
+    window: platform::Window,
 }
 
 /// Identifier of a window. Unique for each window.
@@ -169,42 +158,136 @@ pub struct Window {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct WindowId(platform::WindowId);
 
-/// Provides a way to retreive events from the windows that were registered to it.
-// TODO: document usage in multiple threads
+/// 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: Arc<platform::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: Arc::new(platform::EventsLoop::new()),
+            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>(&self, callback: F)
+    pub fn poll_events<F>(&mut self, callback: F)
         where F: FnMut(Event)
     {
         self.events_loop.poll_events(callback)
     }
 
-    /// Runs forever until `interrupt()` is called. Whenever an event happens, calls the 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>(&self, callback: F)
-        where F: FnMut(Event)
+    pub fn run_forever<F>(&mut self, callback: F)
+        where F: FnMut(Event) -> ControlFlow
     {
         self.events_loop.run_forever(callback)
     }
 
-    /// If we called `run_forever()`, stops the process of waiting for events.
-    // TODO: what if we're waiting from multiple threads?
-    #[inline]
-    pub fn interrupt(&self) {
-        self.events_loop.interrupt()
+    /// 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`"
     }
 }
 
@@ -219,7 +302,7 @@ pub struct WindowBuilder {
 }
 
 /// Error that can happen while creating a window or a headless renderer.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum CreationError {
     OsError(String),
     /// TODO: remove this error
@@ -247,6 +330,7 @@ impl std::error::Error for CreationError {
     }
 }
 
+/// Describes the appearance of the mouse cursor.
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum MouseCursor {
     /// The platform-dependent default cursor.
@@ -273,7 +357,6 @@ pub enum MouseCursor {
     /// Cursor showing that something cannot be done.
     NotAllowed,
     ContextMenu,
-    NoneCursor,
     Cell,
     VerticalText,
     Alias,
@@ -303,52 +386,51 @@ pub enum MouseCursor {
     RowResize,
 }
 
-/// Describes how glutin handles the cursor.
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum CursorState {
-    /// Normal cursor behavior.
-    Normal,
-
-    /// The cursor will be invisible when over the window.
-    Hide,
-
-    /// Grabs the mouse cursor. The cursor's motion will be confined to this
-    /// window and the window has exclusive access to further events regarding
-    /// the cursor.
-    ///
-    /// This is useful for first-person cameras for example.
-    Grab,
+impl Default for MouseCursor {
+    fn default() -> Self {
+        MouseCursor::Default
+    }
 }
 
 /// Attributes to use when creating a window.
-#[derive(Clone)]
+#[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<(u32, u32)>,
+    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<(u32, u32)>,
+    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<(u32, u32)>,
+    pub max_dimensions: Option<LogicalSize>,
 
-    /// If `Some`, the window will be in fullscreen mode with the given monitor.
+    /// 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 monitor: Option<platform::MonitorId>,
+    pub fullscreen: Option<MonitorId>,
 
     /// The title of the window in the title bar.
     ///
-    /// The default is `"glutin window"`.
+    /// 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`.
@@ -365,8 +447,18 @@ pub struct WindowAttributes {
     /// The default is `true`.
     pub decorations: bool,
 
-    /// [iOS only] Enable multitouch, see [UIView#multipleTouchEnabled]
-    /// (https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIView_Class/#//apple_ref/occ/instp/UIView/multipleTouchEnabled)
+    /// 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,
 }
 
@@ -377,28 +469,16 @@ impl Default for WindowAttributes {
             dimensions: None,
             min_dimensions: None,
             max_dimensions: None,
-            monitor: None,
-            title: "glutin window".to_owned(),
+            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,
         }
     }
 }
-
-mod native_monitor {
-    /// Native platform identifier for a monitor. Different platforms use fundamentally different types
-    /// to represent a monitor ID.
-    #[derive(Clone, PartialEq, Eq)]
-    pub enum NativeMonitorId {
-        /// Cocoa and X11 use a numeric identifier to represent a monitor.
-        Numeric(u32),
-
-        /// Win32 uses a Unicode string to represent a monitor.
-        Name(String),
-
-        /// Other platforms (Android) don't support monitor identification.
-        Unavailable
-    }
-}

src/os/android.rs

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

src/os/ios.rs

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

src/os/macos.rs

@@ -3,7 +3,7 @@
 use std::convert::From;
 use std::os::raw::c_void;
 use cocoa::appkit::NSApplicationActivationPolicy;
-use {Window, WindowBuilder};
+use {LogicalSize, MonitorId, Window, WindowBuilder};
 
 /// Additional methods on `Window` that are specific to MacOS.
 pub trait WindowExt {
@@ -61,15 +61,99 @@ impl From<ActivationPolicy> for NSApplicationActivationPolicy {
 }
 
 /// Additional methods on `WindowBuilder` that are specific to MacOS.
+///
+/// **Note:** Properties dealing with the titlebar will be overwritten by the `with_decorations` method
+/// on the base `WindowBuilder`:
+///
+///  - `with_titlebar_transparent`
+///  - `with_title_hidden`
+///  - `with_titlebar_hidden`
+///  - `with_titlebar_buttons_hidden`
+///  - `with_fullsize_content_view`
 pub trait WindowBuilderExt {
+    /// Sets the activation policy for the window being built.
     fn with_activation_policy(self, activation_policy: ActivationPolicy) -> WindowBuilder;
+    /// Enables click-and-drag behavior for the entire window, not just the titlebar.
+    fn with_movable_by_window_background(self, movable_by_window_background: bool) -> WindowBuilder;
+    /// 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.
+    fn with_title_hidden(self, title_hidden: bool) -> WindowBuilder;
+    /// Hides the window titlebar.
+    fn with_titlebar_hidden(self, titlebar_hidden: bool) -> WindowBuilder;
+    /// Hides the window titlebar buttons.
+    fn with_titlebar_buttons_hidden(self, titlebar_buttons_hidden: bool) -> WindowBuilder;
+    /// Makes the window content appear behind the titlebar.
+    fn with_fullsize_content_view(self, fullsize_content_view: bool) -> WindowBuilder;
+    /// Build window with `resizeIncrements` property. Values must not be 0.
+    fn with_resize_increments(self, increments: LogicalSize) -> WindowBuilder;
 }
 
 impl WindowBuilderExt for WindowBuilder {
-    /// Sets the activation policy for the window being built
     #[inline]
     fn with_activation_policy(mut self, activation_policy: ActivationPolicy) -> WindowBuilder {
         self.platform_specific.activation_policy = activation_policy;
         self
     }
+
+    #[inline]
+    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
+    }
+
+    #[inline]
+    fn with_titlebar_transparent(mut self, titlebar_transparent: bool) -> WindowBuilder {
+        self.platform_specific.titlebar_transparent = titlebar_transparent;
+        self
+    }
+
+    #[inline]
+    fn with_titlebar_hidden(mut self, titlebar_hidden: bool) -> WindowBuilder {
+        self.platform_specific.titlebar_hidden = titlebar_hidden;
+        self
+    }
+
+    #[inline]
+    fn with_titlebar_buttons_hidden(mut self, titlebar_buttons_hidden: bool) -> WindowBuilder {
+        self.platform_specific.titlebar_buttons_hidden = titlebar_buttons_hidden;
+        self
+    }
+
+    #[inline]
+    fn with_title_hidden(mut self, title_hidden: bool) -> WindowBuilder {
+        self.platform_specific.title_hidden = title_hidden;
+        self
+    }
+
+    #[inline]
+    fn with_fullsize_content_view(mut self, fullsize_content_view: bool) -> WindowBuilder {
+        self.platform_specific.fullsize_content_view = fullsize_content_view;
+        self
+    }
+
+    #[inline]
+    fn with_resize_increments(mut self, increments: LogicalSize) -> WindowBuilder {
+        self.platform_specific.resize_increments = Some(increments.into());
+        self
+    }
+}
+
+/// Additional methods on `MonitorId` that are specific to MacOS.
+pub trait MonitorIdExt {
+    /// Returns the identifier of the monitor for Cocoa.
+    fn native_id(&self) -> u32;
+    /// Returns a pointer to the NSScreen representing this monitor.
+    fn get_nsscreen(&self) -> Option<*mut c_void>;
+}
+
+impl MonitorIdExt for MonitorId {
+    #[inline]
+    fn native_id(&self) -> u32 {
+        self.inner.get_native_identifier()
+    }
+
+    fn get_nsscreen(&self) -> Option<*mut c_void> {
+        self.inner.get_nsscreen().map(|s| s as *mut c_void)
+    }
 }

src/os/mod.rs

@@ -3,6 +3,7 @@
 //! Contains the follow modules:
 //!
 //!  - `android`
+//!  - `ios`
 //!  - `macos`
 //!  - `unix`
 //!  - `windows`
@@ -10,6 +11,7 @@
 //! 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,91 +1,145 @@
-#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
 
-use std::sync::Arc;
+use std::os::raw;
 use std::ptr;
-use libc;
-use Window;
-use platform::Window2 as LinuxWindow;
-use platform::{UnixBackend, UNIX_BACKEND};
-use WindowBuilder;
+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;
 
-use wayland_client::protocol::wl_display::WlDisplay;
-use wayland_client::protocol::wl_surface::WlSurface;
-
+// TODO: stupid hack so that glutin can do its work
+#[doc(hidden)]
 pub use platform::x11;
 
-// TODO: do not expose XConnection
-pub fn get_x11_xconnection() -> Option<Arc<XConnection>> {
-    match *UNIX_BACKEND {
-        UnixBackend::X(ref connec) => Some(connec.clone()),
-        _ => None,
+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 a pointer to the `Window` object of xlib that is used by this window.
+    /// 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).
-    ///
-    /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_xlib_window(&self) -> Option<*mut libc::c_void>;
+    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 libc::c_void>;
+    fn get_xlib_display(&self) -> Option<*mut raw::c_void>;
 
-    fn get_xlib_screen_id(&self) -> Option<*mut libc::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 libc::c_void>;
+    fn get_xcb_connection(&self) -> Option<*mut raw::c_void>;
 
     /// Returns a pointer to the `wl_surface` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_wayland_surface(&self) -> Option<*mut libc::c_void>;
+    fn get_wayland_surface(&self) -> Option<*mut raw::c_void>;
 
     /// Returns a pointer to the `wl_display` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_wayland_display(&self) -> Option<*mut libc::c_void>;
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void>;
 
-    /// Returns a reference to the `WlSurface` object of wayland that is used by this window.
+    /// Check if the window is ready for drawing
     ///
-    /// For use with the `wayland-client` crate.
+    /// It is a remnant of a previous implementation detail for the
+    /// wayland backend, and is no longer relevant.
     ///
-    /// **This function is not part of winit's public API.**
-    ///
-    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
-    fn get_wayland_client_surface(&self) -> Option<&WlSurface>;
-
-    /// Returns a pointer to the `WlDisplay` object of wayland that is used by this window.
-    ///
-    /// For use with the `wayland-client` crate.
-    ///
-    /// **This function is not part of winit's public API.**
-    ///
-    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
-    fn get_wayland_client_display(&self) -> Option<&WlDisplay>;
+    /// Always return true.
+    #[deprecated]
+    fn is_ready(&self) -> bool;
 }
 
 impl WindowExt for Window {
     #[inline]
-    fn get_xlib_window(&self) -> Option<*mut libc::c_void> {
+    fn get_xlib_window(&self) -> Option<raw::c_ulong> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
             _ => None
@@ -93,20 +147,23 @@ impl WindowExt for Window {
     }
 
     #[inline]
-    fn get_xlib_display(&self) -> Option<*mut libc::c_void> {
+    fn get_xlib_display(&self) -> Option<*mut raw::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
             _ => None
         }
     }
 
-    fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void> {
+    #[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()),
@@ -114,7 +171,8 @@ impl WindowExt for Window {
         }
     }
 
-    fn get_xcb_connection(&self) -> Option<*mut libc::c_void> {
+    #[inline]
+    fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
             _ => None
@@ -122,39 +180,49 @@ impl WindowExt for Window {
     }
 
     #[inline]
-    fn get_wayland_surface(&self) -> Option<*mut libc::c_void> {
-        use wayland_client::Proxy;
-        self.get_wayland_client_surface().map(|p| p.ptr() as *mut _)
-    }
-
-
-    #[inline]
-    fn get_wayland_display(&self) -> Option<*mut libc::c_void> {
-        use wayland_client::Proxy;
-        self.get_wayland_client_display().map(|p| p.ptr() as *mut _)
+    fn set_urgent(&self, is_urgent: bool) {
+        if let LinuxWindow::X(ref w) = self.window {
+            w.set_urgent(is_urgent);
+        }
     }
 
     #[inline]
-    fn get_wayland_client_surface(&self) -> Option<&WlSurface> {
+    fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_surface()),
+            LinuxWindow::Wayland(ref w) => Some(w.get_surface().c_ptr() as *mut _),
             _ => None
         }
     }
 
     #[inline]
-    fn get_wayland_client_display(&self) -> Option<&WlDisplay> {
+    fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_display()),
+            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 {
@@ -171,4 +239,47 @@ impl WindowBuilderExt for 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/os/windows.rs

@@ -1,37 +1,117 @@
 #![cfg(target_os = "windows")]
 
+use std::os::raw::c_void;
+
 use libc;
-use Window;
-use WindowBuilder;
-use winapi;
+use winapi::shared::windef::HWND;
+
+use {DeviceId, EventsLoop, Icon, MonitorId, Window, WindowBuilder};
+use platform::EventsLoop as WindowsEventsLoop;
+
+/// Additional methods on `EventsLoop` that are specific to Windows.
+pub trait EventsLoopExt {
+    /// By default, winit on Windows will attempt to enable process-wide DPI awareness. If that's
+    /// undesirable, you can create an `EventsLoop` using this function instead.
+    fn new_dpi_unaware() -> Self where Self: Sized;
+}
+
+impl EventsLoopExt for EventsLoop {
+    #[inline]
+    fn new_dpi_unaware() -> Self {
+        EventsLoop {
+            events_loop: WindowsEventsLoop::with_dpi_awareness(false),
+            _marker: ::std::marker::PhantomData,
+        }
+    }
+}
 
 /// Additional methods on `Window` that are specific to Windows.
 pub trait WindowExt {
-    /// Returns a pointer to the `Window` object of xlib that is used by this window.
+    /// Returns the native handle 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.
+    /// The pointer will become invalid when the native window was destroyed.
     fn get_hwnd(&self) -> *mut libc::c_void;
+
+    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
+    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
 }
 
 impl WindowExt for Window {
     #[inline]
     fn get_hwnd(&self) -> *mut libc::c_void {
-        self.window.platform_window()
+        self.window.hwnd() as *mut _
+    }
+
+    #[inline]
+    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>) {
+        self.window.set_taskbar_icon(taskbar_icon)
     }
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Windows.
 pub trait WindowBuilderExt {
-    fn with_parent_window(self, parent: winapi::HWND) -> WindowBuilder;
+    /// Sets a parent to the window to be created.
+    fn with_parent_window(self, parent: HWND) -> WindowBuilder;
+
+    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
+    fn with_taskbar_icon(self, taskbar_icon: Option<Icon>) -> WindowBuilder;
+
+    /// This sets `WS_EX_NOREDIRECTIONBITMAP`.
+    fn with_no_redirection_bitmap(self, flag: bool) -> WindowBuilder;
 }
 
 impl WindowBuilderExt for WindowBuilder {
-    /// Sets a parent to the window to be created
     #[inline]
-    fn with_parent_window(mut self, parent: winapi::HWND) -> WindowBuilder {
+    fn with_parent_window(mut self, parent: HWND) -> WindowBuilder {
         self.platform_specific.parent = Some(parent);
         self
     }
+
+    #[inline]
+    fn with_taskbar_icon(mut self, taskbar_icon: Option<Icon>) -> WindowBuilder {
+        self.platform_specific.taskbar_icon = taskbar_icon;
+        self
+    }
+
+    #[inline]
+    fn with_no_redirection_bitmap(mut self, flag: bool) -> WindowBuilder {
+        self.platform_specific.no_redirection_bitmap = flag;
+        self
+    }
+}
+
+/// Additional methods on `MonitorId` that are specific to Windows.
+pub trait MonitorIdExt {
+    /// Returns the name of the monitor adapter specific to the Win32 API.
+    fn native_id(&self) -> String;
+
+    /// Returns the handle of the monitor - `HMONITOR`.
+    fn hmonitor(&self) -> *mut c_void;
+}
+
+impl MonitorIdExt for MonitorId {
+    #[inline]
+    fn native_id(&self) -> String {
+        self.inner.get_native_identifier()
+    }
+
+    #[inline]
+    fn hmonitor(&self) -> *mut c_void {
+        self.inner.get_hmonitor() as *mut _
+    }
+}
+
+/// Additional methods on `DeviceId` that are specific to Windows.
+pub trait DeviceIdExt {
+    /// 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>;
+}
+
+impl DeviceIdExt for DeviceId {
+    #[inline]
+    fn get_persistent_identifier(&self) -> Option<String> {
+        self.0.get_persistent_identifier()
+    }
 }

src/platform/android/mod.rs

@@ -2,43 +2,203 @@
 
 extern crate android_glue;
 
-use libc;
-use std::ffi::{CString};
-use std::sync::mpsc::{Receiver, channel};
-use std::os::raw::c_void;
-use {CreationError, WindowEvent as Event, MouseCursor};
-use CreationError::OsError;
-use events::ElementState::{Pressed, Released};
-use events::{Touch, TouchPhase};
+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 CursorState;
-use WindowAttributes;
-use native_monitor::NativeMonitorId;
+use {
+    CreationError,
+    Event,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    WindowAttributes,
+    WindowEvent,
+    WindowId as RootWindowId,
+};
+use CreationError::OsError;
+use events::{Touch, TouchPhase};
+use window::MonitorId as RootMonitorId;
 
-gen_api_transition!();
+pub struct EventsLoop {
+    event_rx: Receiver<android_glue::Event>,
+    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>,
+}
+
+#[derive(Clone)]
+pub struct EventsLoopProxy;
+
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
+        let (tx, rx) = channel();
+        android_glue::add_sender(tx);
+        EventsLoop {
+            event_rx: rx,
+            suspend_callback: 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)
+    {
+        while let Ok(event) = self.event_rx.try_recv() {
+            let e = match event{
+                android_glue::Event::EventMotion(motion) => {
+                    let dpi_factor = MonitorId.get_hidpi_factor();
+                    let location = LogicalPosition::from_physical(
+                        (motion.x as f64, motion.y as f64),
+                        dpi_factor,
+                    );
+                    Some(Event::WindowEvent {
+                        window_id: RootWindowId(WindowId),
+                        event: WindowEvent::Touch(Touch {
+                            phase: match motion.action {
+                                android_glue::MotionAction::Down => TouchPhase::Started,
+                                android_glue::MotionAction::Move => TouchPhase::Moved,
+                                android_glue::MotionAction::Up => TouchPhase::Ended,
+                                android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
+                            },
+                            location,
+                            id: motion.pointer_id as u64,
+                            device_id: DEVICE_ID,
+                        }),
+                    })
+                },
+                android_glue::Event::InitWindow => {
+                    // The activity went to foreground.
+                    if let Some(cb) = self.suspend_callback.borrow().as_ref() {
+                        (*cb)(false);
+                    }
+                    Some(Event::Suspended(false))
+                },
+                android_glue::Event::TermWindow => {
+                    // The activity went to background.
+                    if let Some(cb) = self.suspend_callback.borrow().as_ref() {
+                        (*cb)(true);
+                    }
+                    Some(Event::Suspended(true))
+                },
+                android_glue::Event::WindowResized |
+                android_glue::Event::ConfigChanged => {
+                    // Activity Orientation changed or resized.
+                    let native_window = unsafe { android_glue::get_native_window() };
+                    if native_window.is_null() {
+                        None
+                    } else {
+                        let dpi_factor = MonitorId.get_hidpi_factor();
+                        let physical_size = MonitorId.get_dimensions();
+                        let size = LogicalSize::from_physical(physical_size, dpi_factor);
+                        Some(Event::WindowEvent {
+                            window_id: RootWindowId(WindowId),
+                            event: WindowEvent::Resized(size),
+                        })
+                    }
+                },
+                android_glue::Event::WindowRedrawNeeded => {
+                    // The activity needs to be redrawn.
+                    Some(Event::WindowEvent {
+                        window_id: RootWindowId(WindowId),
+                        event: WindowEvent::Refresh,
+                    })
+                }
+                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) -> ()>>) {
+        *self.suspend_callback.borrow_mut() = cb;
+    }
+
+    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> {
+        android_glue::wake_event_loop();
+        Ok(())
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
 
 pub struct Window {
     native_window: *const c_void,
-    event_rx: Receiver<android_glue::Event>,
 }
 
 #[derive(Clone)]
 pub struct MonitorId;
 
-mod ffi;
+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,
+        }
 
-#[inline]
-pub fn get_available_monitors() -> VecDeque<MonitorId> {
-    let mut rb = VecDeque::new();
-    rb.push_back(MonitorId);
-    rb
-}
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
 
-#[inline]
-pub fn get_primary_monitor() -> MonitorId {
-    MonitorId
+        monitor_id_proxy.fmt(f)
+    }
 }
 
 impl MonitorId {
@@ -48,13 +208,25 @@ impl MonitorId {
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> NativeMonitorId {
-        NativeMonitorId::Unavailable
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        unsafe {
+            let window = android_glue::get_native_window();
+            (
+                ffi::ANativeWindow_getWidth(window) as f64,
+                ffi::ANativeWindow_getHeight(window) as f64,
+            ).into()
+        }
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        unimplemented!()
+    pub fn get_position(&self) -> PhysicalPosition {
+        // Android assumes single screen
+        (0, 0).into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        1.0
     }
 }
 
@@ -63,94 +235,20 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
-pub struct PollEventsIterator<'a> {
-    window: &'a Window,
-}
-
-impl<'a> Iterator for PollEventsIterator<'a> {
-    type Item = Event;
-
-    fn next(&mut self) -> Option<Event> {
-        match self.window.event_rx.try_recv() {
-            Ok(android_glue::Event::EventMotion(motion)) => {
-                Some(Event::Touch(Touch {
-                    phase: match motion.action {
-                        android_glue::MotionAction::Down => TouchPhase::Started,
-                        android_glue::MotionAction::Move => TouchPhase::Moved,
-                        android_glue::MotionAction::Up => TouchPhase::Ended,
-                        android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
-                    },
-                    location: (motion.x as f64, motion.y as f64),
-                    id: motion.pointer_id as u64,
-                }))
-            },
-            Ok(android_glue::Event::InitWindow) => {
-                // The activity went to foreground.
-                Some(Event::Suspended(false))
-            },
-            Ok(android_glue::Event::TermWindow) => {
-                // The activity went to background.
-                Some(Event::Suspended(true))
-            },
-            Ok(android_glue::Event::WindowResized) |
-            Ok(android_glue::Event::ConfigChanged) => {
-                // Activity Orientation changed or resized.
-                self.window.get_inner_size().map(|s| Event::Resized(s.0, s.1))
-            },
-            Ok(android_glue::Event::WindowRedrawNeeded) => {
-                // The activity needs to be redrawn.
-                Some(Event::Refresh)
-            }
-            _ => {
-                None
-            }
-        }
-    }
-}
-
-pub struct WaitEventsIterator<'a> {
-    window: &'a Window,
-}
-
-impl<'a> Iterator for WaitEventsIterator<'a> {
-    type Item = Event;
-
-    #[inline]
-    fn next(&mut self) -> Option<Event> {
-        loop {
-            // calling poll_events()
-            if let Some(ev) = self.window.poll_events().next() {
-                return Some(ev);
-            }
-
-            // TODO: Implement a proper way of sleeping on the event queue
-            // timer::sleep(Duration::milliseconds(16));
-        }
-    }
-}
-
 impl Window {
-    pub fn new(win_attribs: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes)
+    pub fn new(_: &EventsLoop, win_attribs: WindowAttributes,
+               _: PlatformSpecificWindowBuilderAttributes)
                -> Result<Window, CreationError>
     {
-        use std::{mem, ptr};
-
-        // not implemented
-        assert!(win_attribs.min_dimensions.is_none());
-        assert!(win_attribs.max_dimensions.is_none());
-
         let native_window = unsafe { android_glue::get_native_window() };
         if native_window.is_null() {
             return Err(OsError(format!("Android's native window is null")));
         }
 
-        let (tx, rx) = channel();
-        android_glue::add_sender(tx);
         android_glue::set_multitouch(win_attribs.multitouch);
 
         Ok(Window {
             native_window: native_window as *const _,
-            event_rx: rx,
         })
     }
 
@@ -159,117 +257,156 @@ impl Window {
         self.native_window
     }
 
-    #[inline]
-    pub fn is_closed(&self) -> bool {
-        false
-    }
-
     #[inline]
     pub fn set_title(&self, _: &str) {
+        // N/A
     }
 
     #[inline]
     pub fn show(&self) {
+        // N/A
     }
 
     #[inline]
     pub fn hide(&self) {
+        // N/A
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        // N/A
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _x: i32, _y: i32) {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // N/A
+        None
     }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        let native_window = unsafe { android_glue::get_native_window() };
+    pub fn set_position(&self, _position: LogicalPosition) {
+        // N/A
+    }
 
-        if native_window.is_null() {
+    #[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 get_inner_size(&self) -> Option<LogicalSize> {
+        if self.native_window.is_null() {
             None
         } else {
-            Some((
-                unsafe { ffi::ANativeWindow_getWidth(native_window as *const _) } as u32,
-                unsafe { ffi::ANativeWindow_getHeight(native_window as *const _) } as u32
-            ))
+            let dpi_factor = self.get_hidpi_factor();
+            let physical_size = self.get_current_monitor().get_dimensions();
+            Some(LogicalSize::from_physical(physical_size, dpi_factor))
         }
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
         self.get_inner_size()
     }
 
     #[inline]
-    pub fn set_inner_size(&self, _x: u32, _y: u32) {
+    pub fn set_inner_size(&self, _size: LogicalSize) {
+        // N/A
     }
 
     #[inline]
-    pub fn create_window_proxy(&self) -> WindowProxy {
-        WindowProxy
-    }
-
-    #[inline]
-    pub fn poll_events(&self) -> PollEventsIterator {
-        PollEventsIterator {
-            window: self
-        }
-    }
-
-    #[inline]
-    pub fn wait_events(&self) -> WaitEventsIterator {
-        WaitEventsIterator {
-            window: self
-        }
-    }
-
-    #[inline]
-    pub fn platform_display(&self) -> *mut libc::c_void {
-        unimplemented!();
-    }
-
-    #[inline]
-    pub fn platform_window(&self) -> *mut libc::c_void {
-        unimplemented!()
-    }
-
-    #[inline]
-    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.get_current_monitor().get_hidpi_factor()
     }
 
     #[inline]
     pub fn set_cursor(&self, _: MouseCursor) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
-        Ok(())
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not possible on Android.".to_owned())
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        1.0
+    pub fn hide_cursor(&self, _hide: bool) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
-        unimplemented!();
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+        Err("Setting cursor position is not possible on Android.".to_owned())
+    }
+
+    #[inline]
+    pub fn set_maximized(&self, _maximized: bool) {
+        // N/A
+        // Android has single screen maximized apps so nothing to do
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
+        // N/A
+        // Android 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, _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
     }
 }
 
 unsafe impl Send for Window {}
 unsafe impl Sync for Window {}
 
-#[derive(Clone)]
-pub struct WindowProxy;
-
-impl WindowProxy {
-    #[inline]
-    pub fn wakeup_event_loop(&self) {
-        android_glue::wake_event_loop();
-    }
-}
+// Constant device ID, to be removed when this backend is updated to report real device IDs.
+const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);

src/platform/emscripten/ffi.rs

@@ -0,0 +1,314 @@
+#![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;
+
+pub type EM_BOOL = c_int;
+pub type EM_UTF8 = c_char;
+pub type EMSCRIPTEN_RESULT = c_int;
+
+pub const EM_TRUE: EM_BOOL = 1;
+pub const EM_FALSE: EM_BOOL = 0;
+
+// values for EMSCRIPTEN_RESULT
+pub const EMSCRIPTEN_RESULT_SUCCESS: c_int = 0;
+pub const EMSCRIPTEN_RESULT_DEFERRED: c_int = 1;
+pub const EMSCRIPTEN_RESULT_NOT_SUPPORTED: c_int = -1;
+pub const EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED: c_int = -2;
+pub const EMSCRIPTEN_RESULT_INVALID_TARGET: c_int = -3;
+pub const EMSCRIPTEN_RESULT_UNKNOWN_TARGET: c_int = -4;
+pub const EMSCRIPTEN_RESULT_INVALID_PARAM: c_int = -5;
+pub const EMSCRIPTEN_RESULT_FAILED: c_int = -6;
+pub const EMSCRIPTEN_RESULT_NO_DATA: c_int = -7;
+
+// values for EMSCRIPTEN EVENT
+pub const EMSCRIPTEN_EVENT_KEYPRESS: c_int = 1;
+pub const EMSCRIPTEN_EVENT_KEYDOWN: c_int = 2;
+pub const EMSCRIPTEN_EVENT_KEYUP: c_int = 3;
+pub const EMSCRIPTEN_EVENT_CLICK: c_int = 4;
+pub const EMSCRIPTEN_EVENT_MOUSEDOWN: c_int = 5;
+pub const EMSCRIPTEN_EVENT_MOUSEUP: c_int = 6;
+pub const EMSCRIPTEN_EVENT_DBLCLICK: c_int = 7;
+pub const EMSCRIPTEN_EVENT_MOUSEMOVE: c_int = 8;
+pub const EMSCRIPTEN_EVENT_WHEEL: c_int = 9;
+pub const EMSCRIPTEN_EVENT_RESIZE: c_int = 10;
+pub const EMSCRIPTEN_EVENT_SCROLL: c_int = 11;
+pub const EMSCRIPTEN_EVENT_BLUR: c_int = 12;
+pub const EMSCRIPTEN_EVENT_FOCUS: c_int = 13;
+pub const EMSCRIPTEN_EVENT_FOCUSIN: c_int = 14;
+pub const EMSCRIPTEN_EVENT_FOCUSOUT: c_int = 15;
+pub const EMSCRIPTEN_EVENT_DEVICEORIENTATION: c_int = 16;
+pub const EMSCRIPTEN_EVENT_DEVICEMOTION: c_int = 17;
+pub const EMSCRIPTEN_EVENT_ORIENTATIONCHANGE: c_int = 18;
+pub const EMSCRIPTEN_EVENT_FULLSCREENCHANGE: c_int = 19;
+pub const EMSCRIPTEN_EVENT_POINTERLOCKCHANGE: c_int = 20;
+pub const EMSCRIPTEN_EVENT_VISIBILITYCHANGE: c_int = 21;
+pub const EMSCRIPTEN_EVENT_TOUCHSTART: c_int = 22;
+pub const EMSCRIPTEN_EVENT_TOUCHEND: c_int = 23;
+pub const EMSCRIPTEN_EVENT_TOUCHMOVE: c_int = 24;
+pub const EMSCRIPTEN_EVENT_TOUCHCANCEL: c_int = 25;
+pub const EMSCRIPTEN_EVENT_GAMEPADCONNECTED: c_int = 26;
+pub const EMSCRIPTEN_EVENT_GAMEPADDISCONNECTED: c_int = 27;
+pub const EMSCRIPTEN_EVENT_BEFOREUNLOAD: c_int = 28;
+pub const EMSCRIPTEN_EVENT_BATTERYCHARGINGCHANGE: c_int = 29;
+pub const EMSCRIPTEN_EVENT_BATTERYLEVELCHANGE: c_int = 30;
+pub const EMSCRIPTEN_EVENT_WEBGLCONTEXTLOST: c_int = 31;
+pub const EMSCRIPTEN_EVENT_WEBGLCONTEXTRESTORED: c_int = 32;
+pub const EMSCRIPTEN_EVENT_MOUSEENTER: c_int = 33;
+pub const EMSCRIPTEN_EVENT_MOUSELEAVE: c_int = 34;
+pub const EMSCRIPTEN_EVENT_MOUSEOVER: c_int = 35;
+pub const EMSCRIPTEN_EVENT_MOUSEOUT: c_int = 36;
+pub const EMSCRIPTEN_EVENT_CANVASRESIZED: c_int = 37;
+pub const EMSCRIPTEN_EVENT_POINTERLOCKERROR: c_int = 38;
+
+pub const EM_HTML5_SHORT_STRING_LEN_BYTES: usize = 32;
+
+pub const DOM_KEY_LOCATION_STANDARD: c_ulong = 0x00;
+pub const DOM_KEY_LOCATION_LEFT: c_ulong = 0x01;
+pub const DOM_KEY_LOCATION_RIGHT: c_ulong = 0x02;
+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_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_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>;
+
+#[repr(C)]
+pub struct EmscriptenFullscreenChangeEvent {
+    pub isFullscreen: c_int,
+    pub fullscreenEnabled: c_int,
+    pub nodeName: [c_char; 128usize],
+    pub id: [c_char; 128usize],
+    pub elementWidth: c_int,
+    pub elementHeight: c_int,
+    pub screenWidth: c_int,
+    pub screenHeight: c_int,
+}
+#[test]
+fn bindgen_test_layout_EmscriptenFullscreenChangeEvent() {
+    assert_eq!(mem::size_of::<EmscriptenFullscreenChangeEvent>(), 280usize);
+    assert_eq!(mem::align_of::<EmscriptenFullscreenChangeEvent>(), 4usize);
+}
+
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct EmscriptenKeyboardEvent {
+    pub key: [c_char; 32usize],
+    pub code: [c_char; 32usize],
+    pub location: c_ulong,
+    pub ctrlKey: c_int,
+    pub shiftKey: c_int,
+    pub altKey: c_int,
+    pub metaKey: c_int,
+    pub repeat: c_int,
+    pub locale: [c_char; 32usize],
+    pub charValue: [c_char; 32usize],
+    pub charCode: c_ulong,
+    pub keyCode: c_ulong,
+    pub which: c_ulong,
+}
+#[test]
+fn bindgen_test_layout_EmscriptenKeyboardEvent() {
+    assert_eq!(mem::size_of::<EmscriptenKeyboardEvent>(), 184usize);
+    assert_eq!(mem::align_of::<EmscriptenKeyboardEvent>(), 8usize);
+}
+impl Clone for EmscriptenKeyboardEvent {
+    fn clone(&self) -> Self { *self }
+}
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct EmscriptenMouseEvent {
+    pub timestamp: f64,
+    pub screenX: c_long,
+    pub screenY: c_long,
+    pub clientX: c_long,
+    pub clientY: c_long,
+    pub ctrlKey: c_int,
+    pub shiftKey: c_int,
+    pub altKey: c_int,
+    pub metaKey: c_int,
+    pub button: c_ushort,
+    pub buttons: c_ushort,
+    pub movementX: c_long,
+    pub movementY: c_long,
+    pub targetX: c_long,
+    pub targetY: c_long,
+    pub canvasX: c_long,
+    pub canvasY: c_long,
+    pub padding: c_long,
+}
+#[test]
+fn bindgen_test_layout_EmscriptenMouseEvent() {
+    assert_eq!(mem::size_of::<EmscriptenMouseEvent>(), 120usize);
+    assert_eq!(mem::align_of::<EmscriptenMouseEvent>(), 8usize);
+}
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct EmscriptenTouchPoint {
+    pub identifier: c_long,
+    pub screenX: c_long,
+    pub screenY: c_long,
+    pub clientX: c_long,
+    pub clientY: c_long,
+    pub pageX: c_long,
+    pub pageY: c_long,
+    pub isChanged: c_int,
+    pub onTarget: c_int,
+    pub targetX: c_long,
+    pub targetY: c_long,
+    pub canvasX: c_long,
+    pub canvasY: c_long,
+}
+#[test]
+fn bindgen_test_layout_EmscriptenTouchPoint() {
+    assert_eq!(mem::size_of::<EmscriptenTouchPoint>(), 96usize);
+    assert_eq!(mem::align_of::<EmscriptenTouchPoint>(), 8usize);
+}
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct EmscriptenTouchEvent {
+    pub numTouches: c_int,
+    pub ctrlKey: c_int,
+    pub shiftKey: c_int,
+    pub altKey: c_int,
+    pub metaKey: c_int,
+    pub touches: [EmscriptenTouchPoint; 32usize],
+}
+#[test]
+fn bindgen_test_layout_EmscriptenTouchEvent() {
+    assert_eq!(mem::size_of::<EmscriptenTouchEvent>(), 3096usize);
+    assert_eq!(mem::align_of::<EmscriptenTouchEvent>(), 8usize);
+}
+
+#[repr(C)]
+pub struct EmscriptenPointerlockChangeEvent {
+    pub isActive: c_int,
+    pub nodeName: [c_char; 128usize],
+    pub id: [c_char; 128usize],
+}
+#[test]
+fn bindgen_test_layout_EmscriptenPointerlockChangeEvent() {
+    assert_eq!(mem::size_of::<EmscriptenPointerlockChangeEvent>(), 260usize);
+    assert_eq!(mem::align_of::<EmscriptenPointerlockChangeEvent>(), 4usize);
+}
+
+extern "C" {
+    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;
+
+    pub fn emscripten_set_element_css_size(
+        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;
+
+    pub fn emscripten_request_pointerlock(
+        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;
+
+    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;
+
+    pub fn emscripten_set_keyup_callback(
+        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;
+
+    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;
+
+    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;
+
+    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;
+
+    pub fn emscripten_set_fullscreenchange_callback(
+        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);
+
+    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;
+
+    pub fn emscripten_set_touchend_callback(
+        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;
+
+    pub fn emscripten_set_touchcancel_callback(
+        target: *const c_char, userData: *mut c_void,
+        useCapture: c_int, callback: em_touch_callback_func)
+        -> EMSCRIPTEN_RESULT;
+}

src/platform/ios/ffi.rs

@@ -1,20 +1,17 @@
+#![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
+
 use std::ffi::CString;
+use std::os::raw::*;
 
-use libc;
-use objc::runtime::{ Object, Class };
+use objc::runtime::Object;
 
-#[allow(non_camel_case_types)]
 pub type id = *mut Object;
-
-#[allow(non_camel_case_types)]
-#[allow(non_upper_case_globals)]
 pub const nil: id = 0 as id;
 
-pub type CFStringRef = *const libc::c_void;
+pub type CFStringRef = *const c_void;
 pub type CFTimeInterval = f64;
 pub type Boolean = u32;
 
-#[allow(non_upper_case_globals)]
 pub const kCFRunLoopRunHandledSource: i32 = 4;
 
 #[cfg(target_pointer_width = "32")]
@@ -22,11 +19,6 @@ pub type CGFloat = f32;
 #[cfg(target_pointer_width = "64")]
 pub type CGFloat = f64;
 
-#[cfg(target_pointer_width = "32")]
-pub type NSUInteger = u32;
-#[cfg(target_pointer_width = "64")]
-pub type NSUInteger = u64;
-
 #[repr(C)]
 #[derive(Debug, Clone)]
 pub struct CGPoint {
@@ -38,14 +30,14 @@ pub struct CGPoint {
 #[derive(Debug, Clone)]
 pub struct CGRect {
     pub origin: CGPoint,
-    pub size: CGSize
+    pub size: CGSize,
 }
 
 #[repr(C)]
 #[derive(Debug, Clone)]
 pub struct CGSize {
     pub width: CGFloat,
-    pub height: CGFloat
+    pub height: CGFloat,
 }
 
 #[link(name = "UIKit", kind = "framework")]
@@ -55,33 +47,51 @@ extern {
     pub static kCFRunLoopDefaultMode: CFStringRef;
 
     // int UIApplicationMain ( int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName );
-    pub fn UIApplicationMain(argc: libc::c_int, argv: *const libc::c_char, principalClassName: id, delegateClassName: id) -> libc::c_int;
+    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;
+    pub fn CFRunLoopRunInMode(
+        mode: CFStringRef,
+        seconds: CFTimeInterval,
+        returnAfterSourceHandled: Boolean,
+    ) -> i32;
 }
 
 extern {
-    pub fn setjmp(env: *mut libc::c_void) -> libc::c_int;
-    pub fn longjmp(env: *mut libc::c_void, val: libc::c_int);
+    pub fn setjmp(env: *mut c_void) -> c_int;
+    pub fn longjmp(env: *mut c_void, val: c_int) -> !;
 }
 
-pub trait NSString {
+// 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]
+        msg_send![class!(NSString), alloc]
     }
 
-    #[allow(non_snake_case)]
-    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id;
-    #[allow(non_snake_case)]
+    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;
-    #[allow(non_snake_case)]
-    unsafe fn UTF8String(self) -> *const libc::c_char;
+    unsafe fn UTF8String(self) -> *const c_char;
 }
 
 impl NSString for id {
-    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id {
+    unsafe fn initWithUTF8String_(self, c_string: *const c_char) -> id {
         msg_send![self, initWithUTF8String:c_string as id]
     }
 
@@ -94,14 +104,7 @@ impl NSString for id {
         self.initWithUTF8String_(cstring.as_ptr())
     }
 
-    unsafe fn UTF8String(self) -> *const libc::c_char {
+    unsafe fn UTF8String(self) -> *const c_char {
         msg_send![self, UTF8String]
     }
 }
-
-#[inline]
-pub fn class(name: &str) -> *mut Class {
-    unsafe {
-        ::std::mem::transmute(Class::get(name))
-    }
-}

src/platform/linux/dlopen.rs

@@ -1,4 +1,4 @@
-#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#![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};

src/platform/linux/mod.rs

@@ -1,95 +1,79 @@
-#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#![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 CreationError;
-use CursorState;
-use MouseCursor;
-use libc;
+use parking_lot::Mutex;
+use sctk::reexports::client::ConnectError;
 
-use self::x11::XConnection;
-use self::x11::XError;
-use self::x11::XNotSupported;
+use {
+    CreationError,
+    EventsLoopClosed,
+    Icon,
+    MouseCursor,
+    ControlFlow,
+    WindowAttributes,
+};
+use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
+use window::MonitorId as RootMonitorId;
+use self::x11::{XConnection, XError};
 use self::x11::ffi::XVisualInfo;
+pub use self::x11::XNotSupported;
 
 mod dlopen;
 pub mod wayland;
 pub mod x11;
 
+/// Environment variable specifying which backend should be used on unix platform.
+///
+/// Legal values are x11 and wayland. If this variable is set only the named backend
+/// will be tried by winit. If it is not set, winit will try to connect to a wayland connection,
+/// and if it fails will fallback on x11.
+///
+/// If this variable is set with any other value, winit will panic.
+const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
+
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes {
     pub visual_infos: Option<XVisualInfo>,
     pub screen_id: Option<i32>,
+    pub resize_increments: Option<(u32, u32)>,
+    pub base_size: Option<(u32, u32)>,
+    pub class: Option<(String, String)>,
+    pub override_redirect: bool,
+    pub x11_window_type: x11::util::WindowType,
 }
 
-pub enum UnixBackend {
-    X(Arc<XConnection>),
-    Wayland(Arc<wayland::WaylandContext>),
-    Error(XNotSupported),
-} 
-
 lazy_static!(
-    pub static ref UNIX_BACKEND: UnixBackend = {
-        if let Some(ctxt) = wayland::WaylandContext::init() {
-            UnixBackend::Wayland(Arc::new(ctxt))
-        } else {
-            match XConnection::new(Some(x_error_callback)) {
-                Ok(x) => UnixBackend::X(Arc::new(x)),
-                Err(e) => UnixBackend::Error(e),
-            }
-        }
+    pub static ref X11_BACKEND: Mutex<Result<Arc<XConnection>, XNotSupported>> = {
+        Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))
     };
 );
 
-
-pub enum Window2 {
-    #[doc(hidden)]
-    X(x11::Window2),
-    #[doc(hidden)]
-    Wayland(wayland::Window)
+pub enum Window {
+    X(x11::Window),
+    Wayland(wayland::Window),
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum WindowId {
-    #[doc(hidden)]
     X(x11::WindowId),
-    #[doc(hidden)]
-    Wayland(wayland::WindowId)
+    Wayland(wayland::WindowId),
 }
 
-#[derive(Clone)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum DeviceId {
+    X(x11::DeviceId),
+    Wayland(wayland::DeviceId),
+}
+
+#[derive(Debug, Clone)]
 pub enum MonitorId {
-    #[doc(hidden)]
     X(x11::MonitorId),
-    #[doc(hidden)]
     Wayland(wayland::MonitorId),
-    #[doc(hidden)]
-    None,
-}
-
-#[inline]
-pub fn get_available_monitors() -> VecDeque<MonitorId> {
-    match *UNIX_BACKEND {
-        UnixBackend::Wayland(ref ctxt) => wayland::get_available_monitors(ctxt)
-                                .into_iter()
-                                .map(MonitorId::Wayland)
-                                .collect(),
-        UnixBackend::X(ref connec) => x11::get_available_monitors(connec)
-                                    .into_iter()
-                                    .map(MonitorId::X)
-                                    .collect(),
-        UnixBackend::Error(_) => { let mut d = VecDeque::new(); d.push_back(MonitorId::None); d},
-    }
-}
-
-#[inline]
-pub fn get_primary_monitor() -> MonitorId {
-    match *UNIX_BACKEND {
-        UnixBackend::Wayland(ref ctxt) => MonitorId::Wayland(wayland::get_primary_monitor(ctxt)),
-        UnixBackend::X(ref connec) => MonitorId::X(x11::get_primary_monitor(connec)),
-        UnixBackend::Error(_) => MonitorId::None,
-    }
 }
 
 impl MonitorId {
@@ -98,188 +82,296 @@ impl MonitorId {
         match self {
             &MonitorId::X(ref m) => m.get_name(),
             &MonitorId::Wayland(ref m) => m.get_name(),
-            &MonitorId::None => None,
         }
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
+    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(),
-            &MonitorId::None => unimplemented!()        // FIXME:
         }
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         match self {
             &MonitorId::X(ref m) => m.get_dimensions(),
             &MonitorId::Wayland(ref m) => m.get_dimensions(),
-            &MonitorId::None => (800, 600),     // FIXME:
+        }
+    }
+
+    #[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 Window2 {
+impl Window {
     #[inline]
-    pub fn new(events_loop: ::std::sync::Arc<EventsLoop>, window: &::WindowAttributes,
-               pl_attribs: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window2, CreationError>
-    {
-        match *UNIX_BACKEND {
-            UnixBackend::Wayland(ref ctxt) => {
-                if let EventsLoop::Wayland(ref evlp) = *events_loop {
-                    wayland::Window::new(evlp, ctxt.clone(), window).map(Window2::Wayland)
-                } else {
-                    // It is not possible to instanciate an EventsLoop not matching its backend
-                    unreachable!()
-                }
+    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)
             },
-
-            UnixBackend::X(ref connec) => {
-                x11::Window2::new(events_loop, connec, window, pl_attribs).map(Window2::X)
+            EventsLoop::X(ref events_loop) => {
+                x11::Window::new(events_loop, attribs, pl_attribs).map(Window::X)
             },
-            UnixBackend::Error(_) => {
-                // If the Backend is Error(), it is not possible to instanciate an EventsLoop at all,
-                // thus this function cannot be called!
-                unreachable!()
-            }
         }
     }
 
     #[inline]
     pub fn id(&self) -> WindowId {
         match self {
-            &Window2::X(ref w) => WindowId::X(w.id()),
-            &Window2::Wayland(ref w) => WindowId::Wayland(w.id())
+            &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 {
-            &Window2::X(ref w) => w.set_title(title),
-            &Window2::Wayland(ref w) => w.set_title(title)
+            &Window::X(ref w) => w.set_title(title),
+            &Window::Wayland(ref w) => w.set_title(title),
         }
     }
 
     #[inline]
     pub fn show(&self) {
         match self {
-            &Window2::X(ref w) => w.show(),
-            &Window2::Wayland(ref w) => w.show()
+            &Window::X(ref w) => w.show(),
+            &Window::Wayland(ref w) => w.show(),
         }
     }
 
     #[inline]
     pub fn hide(&self) {
         match self {
-            &Window2::X(ref w) => w.hide(),
-            &Window2::Wayland(ref w) => w.hide()
+            &Window::X(ref w) => w.hide(),
+            &Window::Wayland(ref w) => w.hide(),
         }
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
         match self {
-            &Window2::X(ref w) => w.get_position(),
-            &Window2::Wayland(ref w) => w.get_position()
+            &Window::X(ref w) => w.get_position(),
+            &Window::Wayland(ref w) => w.get_position(),
         }
     }
 
     #[inline]
-    pub fn set_position(&self, x: i32, y: i32) {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         match self {
-            &Window2::X(ref w) => w.set_position(x, y),
-            &Window2::Wayland(ref w) => w.set_position(x, y)
+            &Window::X(ref m) => m.get_inner_position(),
+            &Window::Wayland(ref m) => m.get_inner_position(),
         }
     }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+    pub fn set_position(&self, position: LogicalPosition) {
         match self {
-            &Window2::X(ref w) => w.get_inner_size(),
-            &Window2::Wayland(ref w) => w.get_inner_size()
+            &Window::X(ref w) => w.set_position(position),
+            &Window::Wayland(ref w) => w.set_position(position),
         }
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         match self {
-            &Window2::X(ref w) => w.get_outer_size(),
-            &Window2::Wayland(ref w) => w.get_outer_size()
+            &Window::X(ref w) => w.get_inner_size(),
+            &Window::Wayland(ref w) => w.get_inner_size(),
         }
     }
 
     #[inline]
-    pub fn set_inner_size(&self, x: u32, y: u32) {
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
         match self {
-            &Window2::X(ref w) => w.set_inner_size(x, y),
-            &Window2::Wayland(ref w) => w.set_inner_size(x, y)
+            &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 {
-            &Window2::X(ref w) => w.set_cursor(cursor),
-            &Window2::Wayland(ref w) => w.set_cursor(cursor)
+            &Window::X(ref w) => w.set_cursor(cursor),
+            &Window::Wayland(ref w) => w.set_cursor(cursor)
         }
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
         match self {
-            &Window2::X(ref w) => w.set_cursor_state(state),
-            &Window2::Wayland(ref w) => w.set_cursor_state(state)
+            &Window::X(ref window) => window.grab_cursor(grab),
+            &Window::Wayland(ref window) => window.grab_cursor(grab),
         }
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
+    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 {
-            &Window2::X(ref w) => w.hidpi_factor(),
-            &Window2::Wayland(ref w) => w.hidpi_factor()
+            &Window::X(ref w) => w.get_hidpi_factor(),
+            &Window::Wayland(ref w) => w.hidpi_factor() as f64,
         }
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+    pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), String> {
         match self {
-            &Window2::X(ref w) => w.set_cursor_position(x, y),
-            &Window2::Wayland(ref w) => w.set_cursor_position(x, y)
+            &Window::X(ref w) => w.set_cursor_position(position),
+            &Window::Wayland(ref w) => w.set_cursor_position(position),
         }
     }
 
     #[inline]
-    pub fn platform_display(&self) -> *mut libc::c_void {
-        use wayland_client::Proxy;
+    pub fn set_maximized(&self, maximized: bool) {
         match self {
-            &Window2::X(ref w) => w.platform_display(),
-            &Window2::Wayland(ref w) => w.get_display().ptr() as *mut _
+            &Window::X(ref w) => w.set_maximized(maximized),
+            &Window::Wayland(ref w) => w.set_maximized(maximized),
         }
     }
 
     #[inline]
-    pub fn platform_window(&self) -> *mut libc::c_void {
-        use wayland_client::Proxy;
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorId>) {
         match self {
-            &Window2::X(ref w) => w.platform_window(),
-            &Window2::Wayland(ref w) => w.get_surface().ptr() as *mut _
+            &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(dpy: *mut x11::ffi::Display, event: *mut x11::ffi::XErrorEvent)
-                                      -> libc::c_int
-{
-    use std::ffi::CStr;
-
-    if let UnixBackend::X(ref x) = *UNIX_BACKEND {
-        let mut buff: Vec<u8> = Vec::with_capacity(1024);
-        (x.xlib.XGetErrorText)(dpy, (*event).error_code as i32, buff.as_mut_ptr() as *mut libc::c_char, buff.capacity() as i32);
-        let description = CStr::from_ptr(buff.as_mut_ptr() as *const libc::c_char).to_string_lossy();
+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(),
@@ -288,58 +380,152 @@ unsafe extern "C" fn x_error_callback(dpy: *mut x11::ffi::Display, event: *mut x
             minor_code: (*event).minor_code,
         };
 
-        *x.latest_error.lock().unwrap() = Some(error);
-    }
+        eprintln!("[winit X11 error] {:#?}", error);
 
+        *xconn.latest_error.lock() = Some(error);
+    }
+    // Fun fact: this return value is completely ignored.
     0
 }
 
 pub enum EventsLoop {
-    #[doc(hidden)]
     Wayland(wayland::EventsLoop),
-    #[doc(hidden)]
     X(x11::EventsLoop)
 }
 
+#[derive(Clone)]
+pub enum EventsLoopProxy {
+    X(x11::EventsLoopProxy),
+    Wayland(wayland::EventsLoopProxy),
+}
+
 impl EventsLoop {
     pub fn new() -> EventsLoop {
-        match *UNIX_BACKEND {
-            UnixBackend::Wayland(ref ctxt) => {
-                EventsLoop::Wayland(wayland::EventsLoop::new(ctxt.clone()))
-            },
-
-            UnixBackend::X(_) => {
-                EventsLoop::X(x11::EventsLoop::new())
-            },
-
-            UnixBackend::Error(_) => {
-                panic!("Attempted to create an EventsLoop while no backend was available.")
+        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 interrupt(&self) {
+    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.interrupt(),
-            EventsLoop::X(ref evlp) => evlp.interrupt()
+            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(),
         }
     }
 
-    pub fn poll_events<F>(&self, callback: F)
-        where F: FnMut(::Event)
-    {
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
         match *self {
-            EventsLoop::Wayland(ref evlp) => evlp.poll_events(callback),
-            EventsLoop::X(ref evlp) => evlp.poll_events(callback)
+            EventsLoop::Wayland(ref evlp) => MonitorId::Wayland(evlp.get_primary_monitor()),
+            EventsLoop::X(ref evlp) => MonitorId::X(evlp.x_connection().get_primary_monitor()),
         }
     }
 
-    pub fn run_forever<F>(&self, callback: F)
+    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 evlp) => evlp.run_forever(callback),
-            EventsLoop::X(ref evlp) => evlp.run_forever(callback)
+            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/context.rs

@@ -1,297 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::{Arc, Mutex};
-
-use wayland_client::{EnvHandler, default_connect, EventQueue, EventQueueHandle, Init, Proxy};
-use wayland_client::protocol::{wl_compositor, wl_seat, wl_shell, wl_shm, wl_subcompositor,
-                               wl_display, wl_registry, wl_output, wl_surface};
-
-use super::wayland_window;
-
-/*
- * Registry and globals handling
- */
-
-wayland_env!(InnerEnv,
-    compositor: wl_compositor::WlCompositor,
-    shell: wl_shell::WlShell,
-    shm: wl_shm::WlShm,
-    subcompositor: wl_subcompositor::WlSubcompositor
-);
-
-struct WaylandEnv {
-    registry: wl_registry::WlRegistry,
-    inner: EnvHandler<InnerEnv>,
-    monitors: Vec<OutputInfo>,
-    my_id: usize,
-}
-
-struct OutputInfo {
-    output: wl_output::WlOutput,
-    id: u32,
-    scale: f32,
-    pix_size: (u32, u32),
-    name: String
-}
-
-impl OutputInfo {
-    fn new(output: wl_output::WlOutput, id: u32) -> OutputInfo {
-        OutputInfo {
-            output: output,
-            id: id,
-            scale: 1.0,
-            pix_size: (0, 0),
-            name: "".into()
-        }
-    }
-}
-
-impl WaylandEnv {
-    fn new(registry: wl_registry::WlRegistry) -> WaylandEnv {
-        WaylandEnv {
-            registry: registry,
-            inner: EnvHandler::new(),
-            monitors: Vec::new(),
-            my_id: 0,
-        }
-    }
-
-    fn get_seat(&self) -> Option<wl_seat::WlSeat> {
-        for &(name, ref interface, version) in self.inner.globals() {
-            if interface == "wl_seat" {
-                if version < 5 {
-                    panic!("Winit requires at least version 5 of the wl_seat global.");
-                }
-                let seat = self.registry.bind::<wl_seat::WlSeat>(5, name);
-                return Some(seat)
-            }
-        }
-        None
-    }
-}
-
-impl Init for WaylandEnv {
-    fn init(&mut self, evqh: &mut EventQueueHandle, index: usize) {
-        evqh.register::<_, WaylandEnv>(&self.registry, index);
-        self.my_id = index
-    }
-}
-
-impl wl_registry::Handler for WaylandEnv {
-    fn global(&mut self,
-              evqh: &mut EventQueueHandle,
-              registry: &wl_registry::WlRegistry,
-              name: u32,
-              interface: String,
-              version: u32)
-    {
-        if interface == "wl_output" {
-            // intercept outputs
-            // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
-            let output = self.registry.bind::<wl_output::WlOutput>(1, name);
-            evqh.register::<_, WaylandEnv>(&output, self.my_id);
-            self.monitors.push(OutputInfo::new(output, name));
-        }
-        self.inner.global(evqh, registry, name, interface, version);
-    }
-
-    fn global_remove(&mut self,
-                     evqh: &mut EventQueueHandle,
-                     registry: &wl_registry::WlRegistry,
-                     name: u32)
-    {
-        // prune old monitors
-        self.monitors.retain(|m| m.id != name);
-        self.inner.global_remove(evqh, registry, name);
-    }
-}
-
-declare_handler!(WaylandEnv, wl_registry::Handler, wl_registry::WlRegistry);
-
-impl wl_output::Handler for WaylandEnv {
-    fn geometry(&mut self,
-                _: &mut EventQueueHandle,
-                proxy: &wl_output::WlOutput,
-                _x: i32, _y: i32,
-                _physical_width: i32, _physical_height: i32,
-                _subpixel: wl_output::Subpixel,
-                make: String, model: String,
-                _transform: wl_output::Transform)
-    {
-        for m in self.monitors.iter_mut().filter(|m| m.output.equals(proxy)) {
-            m.name = format!("{} ({})", model, make);
-            break;
-        }
-    }
-    fn mode(&mut self,
-            _: &mut EventQueueHandle,
-            proxy: &wl_output::WlOutput,
-            flags: wl_output::Mode,
-            width: i32, height: i32,
-            _refresh: i32)
-    {
-        if flags.contains(wl_output::Current) {
-            for m in self.monitors.iter_mut().filter(|m| m.output.equals(proxy)) {
-                m.pix_size = (width as u32, height as u32);
-                break;
-            }
-        }
-    }
-    fn scale(&mut self,
-             _: &mut EventQueueHandle,
-             proxy: &wl_output::WlOutput,
-             factor: i32)
-    {
-        for m in self.monitors.iter_mut().filter(|m| m.output.equals(proxy)) {
-            m.scale = factor as f32;
-            break;
-        }
-    }
-}
-
-declare_handler!(WaylandEnv, wl_output::Handler, wl_output::WlOutput);
-
-/*
- * Main context struct
- */
-
-pub struct WaylandContext {
-    pub display: wl_display::WlDisplay,
-    evq: Mutex<EventQueue>,
-    env_id: usize,
-}
-
-impl WaylandContext {
-    pub fn init() -> Option<WaylandContext> {
-        // attempt to connect to the wayland server
-        // this handles both "no libwayland" and "no compositor" cases
-        let (display, mut event_queue) = match default_connect() {
-            Ok(ret) => ret,
-            Err(_) => return None
-        };
-
-        // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
-        let registry = display.get_registry();
-        let env_id = event_queue.add_handler_with_init(WaylandEnv::new(registry));
-        // two syncs fully initialize
-        event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost");
-        event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost");
-
-        Some(WaylandContext {
-            evq: Mutex::new(event_queue),
-            display: display,
-            env_id: env_id
-        })
-    }
-
-    pub fn dispatch_pending(&self) {
-        let mut guard = self.evq.lock().unwrap();
-        guard.dispatch_pending().expect("Wayland connection unexpectedly lost");
-    }
-
-    pub fn dispatch(&self) {
-        let mut guard = self.evq.lock().unwrap();
-        guard.dispatch().expect("Wayland connection unexpectedly lost");
-    }
-
-    pub fn flush(&self) {
-        let _ = self.display.flush();
-    }
-
-    pub fn get_seat(&self) -> Option<wl_seat::WlSeat> {
-        let mut guard = self.evq.lock().unwrap();
-        let state = guard.state();
-        state.get_handler::<WaylandEnv>(self.env_id).get_seat()
-    }
-
-    pub fn with_output<F>(&self, id: MonitorId, f: F) where F: FnOnce(&wl_output::WlOutput) {
-        let mut guard = self.evq.lock().unwrap();
-        let state = guard.state();
-        let env = state.get_handler::<WaylandEnv>(self.env_id);
-        for m in env.monitors.iter().filter(|m| m.id == id.id) {
-            f(&m.output);
-            break
-        }
-    }
-
-    pub fn create_window<H: wayland_window::Handler>(&self)
-        -> (Arc<wl_surface::WlSurface>, wayland_window::DecoratedSurface<H>)
-    {
-        let mut guard = self.evq.lock().unwrap();
-        let mut state = guard.state();
-        let env = state.get_mut_handler::<WaylandEnv>(self.env_id);
-        // this "expect" cannot trigger (see https://github.com/vberger/wayland-client-rs/issues/69)
-        let surface = Arc::new(env.inner.compositor.create_surface());
-        let decorated = wayland_window::DecoratedSurface::new(
-            &*surface, 800, 600,
-            &env.inner.compositor,
-            &env.inner.subcompositor,
-            &env.inner.shm,
-            &env.inner.shell,
-            env.get_seat(),
-            false
-        ).expect("Failed to create a tmpfile buffer.");
-        (surface, decorated)
-    }
-}
-
-/*
- * Monitors API
- */
-
-pub fn get_primary_monitor(ctxt: &Arc<WaylandContext>) -> MonitorId {
-    let mut guard = ctxt.evq.lock().unwrap();
-    let state = guard.state();
-    let env = state.get_handler::<WaylandEnv>(ctxt.env_id);
-    if let Some(ref monitor) = env.monitors.iter().next() {
-        MonitorId {
-            id: monitor.id,
-            ctxt: ctxt.clone()
-        }
-    } else {
-        panic!("No monitor is available.")
-    }
-}
-
-pub fn get_available_monitors(ctxt: &Arc<WaylandContext>) -> VecDeque<MonitorId> {
-    let mut guard = ctxt.evq.lock().unwrap();
-    let state = guard.state();
-    let env = state.get_handler::<WaylandEnv>(ctxt.env_id);
-    env.monitors.iter()
-       .map(|m| MonitorId { id: m.id, ctxt: ctxt.clone() })
-       .collect()
-}
-
-#[derive(Clone)]
-pub struct MonitorId {
-    id: u32,
-    ctxt: Arc<WaylandContext>
-}
-
-impl MonitorId {
-    pub fn get_name(&self) -> Option<String> {
-        let mut guard = self.ctxt.evq.lock().unwrap();
-        let state = guard.state();
-        let env = state.get_handler::<WaylandEnv>(self.ctxt.env_id);
-        for m in env.monitors.iter().filter(|m| m.id == self.id) {
-            return Some(m.name.clone())
-        }
-        // if we reach here, this monitor does not exist any more
-        None
-    }
-
-    #[inline]
-    pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
-        ::native_monitor::NativeMonitorId::Unavailable
-    }
-
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        let mut guard = self.ctxt.evq.lock().unwrap();
-        let state = guard.state();
-        let env = state.get_handler::<WaylandEnv>(self.ctxt.env_id);
-        for m in env.monitors.iter().filter(|m| m.id == self.id) {
-            return m.pix_size
-        }
-        // if we reach here, this monitor does not exist any more
-        (0,0)
-    }
-}

src/platform/linux/wayland/keyboard.rs

@@ -1,87 +1,187 @@
 use std::sync::{Arc, Mutex};
 
-use {VirtualKeyCode, ElementState, WindowEvent as Event};
+use super::{make_wid, DeviceId, EventsLoopProxy, EventsLoopSink};
+use sctk::keyboard::{
+    self, map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatEvent, KeyRepeatKind,
+};
+use sctk::reexports::client::protocol::wl_keyboard;
+use sctk::reexports::client::{NewProxy, Proxy};
+use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
 
-use events::ModifiersState;
-
-use super::{wayland_kbd, EventsLoopSink, WindowId};
-use wayland_client::EventQueueHandle;
-use wayland_client::protocol::wl_keyboard;
-
-pub struct KbdHandler {
+pub fn init_keyboard(
+    keyboard: NewProxy<wl_keyboard::WlKeyboard>,
     sink: Arc<Mutex<EventsLoopSink>>,
-    pub target: Option<WindowId>
-}
-
-impl KbdHandler {
-    pub fn new(sink: Arc<Mutex<EventsLoopSink>>) -> KbdHandler {
-        KbdHandler { sink: sink, target: None }
-    }
-}
-
-impl wayland_kbd::Handler for KbdHandler {
-    fn key(&mut self,
-           _evqh: &mut EventQueueHandle,
-           _proxy: &wl_keyboard::WlKeyboard,
-           _serial: u32,
-           _time: u32,
-           mods: &wayland_kbd::ModifiersState,
-           rawkey: u32,
-           keysym: u32,
-           state: wl_keyboard::KeyState,
-           utf8: Option<String>)
-    {
-        if let Some(wid) = self.target {
-            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 = self.sink.lock().unwrap();
-            guard.send_event(
-                Event::KeyboardInput(
-                    state,
-                    rawkey as u8,
-                    vkcode,
-                    ModifiersState {
-                        shift: mods.shift,
-                        ctrl: mods.ctrl,
-                        alt: mods.alt,
-                        logo: mods.logo
+    events_loop_proxy: EventsLoopProxy,
+) -> Proxy<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 ret = map_keyboard_auto_with_repeat(
+        keyboard,
+        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);
+                        }
                     }
-                ),
-                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(Event::ReceivedCharacter(chr), wid);
                 }
             }
+            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(),
+                        },
+                    },
+                    wid,
+                );
+                if let Some(txt) = repeat_event.utf8 {
+                    for chr in txt.chars() {
+                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
+                    }
+                }
+                events_loop_proxy.wakeup().unwrap();
+            }
+        },
+    );
+
+    match ret {
+        Ok(keyboard) => keyboard,
+        Err((_, keyboard)) => {
+            // This is a fallback impl if libxkbcommon was not available
+            // This case should probably never happen, as most wayland
+            // compositors _need_ libxkbcommon anyway...
+            //
+            // In this case, we don't have the keymap information (it is
+            // supposed to be serialized by the compositor using libxkbcommon)
+
+            // { variables to be captured by the closure
+            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(),
+                                },
+                            },
+                            wid,
+                        );
+                    }
+                }
+                _ => (),
+            })
         }
     }
 }
 
 fn key_to_vkey(rawkey: u32, keysym: u32) -> Option<VirtualKeyCode> {
     match rawkey {
-         1 => Some(VirtualKeyCode::Escape),
-         2 => Some(VirtualKeyCode::Key1),
-         3 => Some(VirtualKeyCode::Key2),
-         4 => Some(VirtualKeyCode::Key3),
-         5 => Some(VirtualKeyCode::Key4),
-         6 => Some(VirtualKeyCode::Key5),
-         7 => Some(VirtualKeyCode::Key6),
-         8 => Some(VirtualKeyCode::Key7),
-         9 => Some(VirtualKeyCode::Key8),
+        1 => Some(VirtualKeyCode::Escape),
+        2 => Some(VirtualKeyCode::Key1),
+        3 => Some(VirtualKeyCode::Key2),
+        4 => Some(VirtualKeyCode::Key3),
+        5 => Some(VirtualKeyCode::Key4),
+        6 => Some(VirtualKeyCode::Key5),
+        7 => Some(VirtualKeyCode::Key6),
+        8 => Some(VirtualKeyCode::Key7),
+        9 => Some(VirtualKeyCode::Key8),
         10 => Some(VirtualKeyCode::Key9),
         11 => Some(VirtualKeyCode::Key0),
-        _  => keysym_to_vkey(keysym)
+        _ => keysym_to_vkey(keysym),
     }
 }
 
 fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
-    use super::wayland_kbd::keysyms;
+    use sctk::keyboard::keysyms;
     match keysym {
         // letters
         keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
@@ -111,15 +211,15 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_Y | keysyms::XKB_KEY_y => Some(VirtualKeyCode::Y),
         keysyms::XKB_KEY_Z | keysyms::XKB_KEY_z => Some(VirtualKeyCode::Z),
         // F--
-        keysyms::XKB_KEY_F1  => Some(VirtualKeyCode::F1),
-        keysyms::XKB_KEY_F2  => Some(VirtualKeyCode::F2),
-        keysyms::XKB_KEY_F3  => Some(VirtualKeyCode::F3),
-        keysyms::XKB_KEY_F4  => Some(VirtualKeyCode::F4),
-        keysyms::XKB_KEY_F5  => Some(VirtualKeyCode::F5),
-        keysyms::XKB_KEY_F6  => Some(VirtualKeyCode::F6),
-        keysyms::XKB_KEY_F7  => Some(VirtualKeyCode::F7),
-        keysyms::XKB_KEY_F8  => Some(VirtualKeyCode::F8),
-        keysyms::XKB_KEY_F9  => Some(VirtualKeyCode::F9),
+        keysyms::XKB_KEY_F1 => Some(VirtualKeyCode::F1),
+        keysyms::XKB_KEY_F2 => Some(VirtualKeyCode::F2),
+        keysyms::XKB_KEY_F3 => Some(VirtualKeyCode::F3),
+        keysyms::XKB_KEY_F4 => Some(VirtualKeyCode::F4),
+        keysyms::XKB_KEY_F5 => Some(VirtualKeyCode::F5),
+        keysyms::XKB_KEY_F6 => Some(VirtualKeyCode::F6),
+        keysyms::XKB_KEY_F7 => Some(VirtualKeyCode::F7),
+        keysyms::XKB_KEY_F8 => Some(VirtualKeyCode::F8),
+        keysyms::XKB_KEY_F9 => Some(VirtualKeyCode::F9),
         keysyms::XKB_KEY_F10 => Some(VirtualKeyCode::F10),
         keysyms::XKB_KEY_F11 => Some(VirtualKeyCode::F11),
         keysyms::XKB_KEY_F12 => Some(VirtualKeyCode::F12),
@@ -180,7 +280,6 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
         // => Some(VirtualKeyCode::LBracket),
         keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
-        // => Some(VirtualKeyCode::LMenu),
         keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
         // => Some(VirtualKeyCode::LWin),
         // => Some(VirtualKeyCode::Mail),
@@ -203,7 +302,6 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
         // => Some(VirtualKeyCode::RBracket),
         keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
-        // => Some(VirtualKeyCode::RMenu),
         keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
         // => Some(VirtualKeyCode::RWin),
         keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
@@ -213,6 +311,7 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         // => Some(VirtualKeyCode::Subtract),
         // => Some(VirtualKeyCode::Sysrq),
         keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
+        keysyms::XKB_KEY_ISO_Left_Tab => Some(VirtualKeyCode::Tab),
         // => Some(VirtualKeyCode::Underline),
         // => Some(VirtualKeyCode::Unlabeled),
         keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
@@ -226,7 +325,21 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         // => Some(VirtualKeyCode::WebSearch),
         // => Some(VirtualKeyCode::WebStop),
         // => Some(VirtualKeyCode::Yen),
+        keysyms::XKB_KEY_XF86Copy => Some(VirtualKeyCode::Copy),
+        keysyms::XKB_KEY_XF86Paste => Some(VirtualKeyCode::Paste),
+        keysyms::XKB_KEY_XF86Cut => Some(VirtualKeyCode::Cut),
         // fallback
-        _ => None
+        _ => None,
+    }
+}
+
+impl From<keyboard::ModifiersState> for ModifiersState {
+    fn from(mods: keyboard::ModifiersState) -> ModifiersState {
+        ModifiersState {
+            shift: mods.shift,
+            ctrl: mods.ctrl,
+            alt: mods.alt,
+            logo: mods.logo,
+        }
     }
 }

src/platform/linux/wayland/mod.rs

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

src/platform/linux/wayland/pointer.rs

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

@@ -0,0 +1,93 @@
+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,87 +1,165 @@
-use std::sync::{Arc, Mutex};
-use std::sync::atomic::AtomicBool;
+use std::collections::VecDeque;
+use std::sync::{Arc, Mutex, Weak};
 
-use wayland_client::{EventQueue, EventQueueHandle, Proxy};
-use wayland_client::protocol::{wl_display,wl_surface,wl_shell_surface};
-
-use {CreationError, MouseCursor, CursorState, WindowAttributes};
+use {CreationError, MouseCursor, WindowAttributes};
+use dpi::{LogicalPosition, LogicalSize};
 use platform::MonitorId as PlatformMonitorId;
+use window::MonitorId as RootMonitorId;
 
-use super::{WaylandContext, EventsLoop};
-use super::wayland_window;
-use super::wayland_window::DecoratedSurface;
+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 {
-    // the global wayland context
-    ctxt: Arc<WaylandContext>,
-    // the EventQueue of our EventsLoop
-    evq: Arc<Mutex<EventQueue>>,
-    // signal to advertize the EventsLoop when we are destroyed
-    cleanup_signal: Arc<AtomicBool>,
-    // our wayland surface
-    surface: Arc<wl_surface::WlSurface>,
-    // our current inner dimensions
-    size: Mutex<(u32, u32)>,
-    // the id of our DecoratedHandler in the EventQueue
-    decorated_id: usize
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct WindowId(usize);
-
-#[inline]
-pub fn make_wid(s: &wl_surface::WlSurface) -> WindowId {
-    WindowId(s.ptr() as usize)
+    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, ctxt: Arc<WaylandContext>, attributes: &WindowAttributes)  -> Result<Window, CreationError>
-    {
-        let (width, height) = attributes.dimensions.unwrap_or((800,600));
+    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)));
 
-        let (surface, decorated) = ctxt.create_window::<DecoratedHandler>();
+        // monitor tracking
+        let monitor_list = Arc::new(Mutex::new(MonitorList::new()));
 
-        // init DecoratedSurface
-        let (evq, cleanup_signal) = evlp.get_window_init();
-        let decorated_id = {
-            let mut evq_guard = evq.lock().unwrap();
-            let decorated_id = evq_guard.add_handler_with_init(decorated);
-            {
-                // initialize the DecoratedHandler
-                let mut state = evq_guard.state();
-                let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(decorated_id);
-                *(decorated.handler()) = Some(DecoratedHandler::new());
-
-                // set fullscreen if necessary
-                if let Some(PlatformMonitorId::Wayland(ref monitor_id)) = attributes.monitor {
-                    ctxt.with_output(monitor_id.clone(), |output| {
-                        decorated.set_fullscreen(
-                            wl_shell_surface::FullscreenMethod::Default,
-                            0,
-                            Some(output)
-                        )
+        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(),
                     });
-                } else if attributes.decorations {
-                    decorated.set_decorate(true);
+                    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);
+                        }
+                    }
                 }
-                // Finally, set the decorations size
-                decorated.resize(width as i32, height as i32);
             }
-            decorated_id
-        };
-        let me = Window {
-            ctxt: ctxt,
-            evq: evq,
-            cleanup_signal: cleanup_signal,
+        });
+
+        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,
-            size: Mutex::new((width, height)),
-            decorated_id: decorated_id
-        };
-
-        // register ourselves to the EventsLoop
-        evlp.register_window(me.decorated_id, me.surface.clone());
-
-        Ok(me)
+            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]
@@ -90,10 +168,7 @@ impl Window {
     }
 
     pub fn set_title(&self, title: &str) {
-        let mut guard = self.evq.lock().unwrap();
-        let mut state = guard.state();
-        let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(self.decorated_id);
-        decorated.set_title(title.into())
+        self.frame.lock().unwrap().set_title(title.into());
     }
 
     #[inline]
@@ -107,34 +182,86 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
         // Not possible with wayland
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _x: i32, _y: i32) {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         // Not possible with wayland
-    }
-
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        Some(self.size.lock().unwrap().clone())
+        None
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    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 as u32, h as u32))
+        // 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, x: u32, y: u32) {
-        let mut guard = self.evq.lock().unwrap();
-        let mut state = guard.state();
-        let mut decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(self.decorated_id);
-        decorated.resize(x as i32, y as i32);
+    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]
@@ -143,63 +270,189 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
-        use CursorState::{Grab, Normal, Hide};
-        // TODO : not yet possible on wayland to grab cursor
-        match state {
-            Grab => Err("Cursor cannot be grabbed on wayland yet.".to_string()),
-            Hide => Err("Cursor cannot be hidden on wayland yet.".to_string()),
-            Normal => Ok(())
-        }
+    pub fn hide_cursor(&self, _hide: bool) {
+        // TODO: This isn't possible on Wayland yet
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        // TODO
-        1.0
+    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, _x: i32, _y: i32) -> Result<(), ()> {
-        // TODO: not yet possible on wayland
-        Err(())
+    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) -> &wl_display::WlDisplay {
-        &self.ctxt.display
+
+    pub fn get_display(&self) -> &Display {
+        &*self.display
     }
-    
-    pub fn get_surface(&self) -> &wl_surface::WlSurface {
+
+    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.surface.destroy();
-        self.cleanup_signal.store(true, ::std::sync::atomic::Ordering::Relaxed);
+        *(self.kill_switch.0.lock().unwrap()) = true;
+        *(self.kill_switch.1.lock().unwrap()) = true;
     }
 }
 
-pub struct DecoratedHandler {
-    newsize: Option<(u32, u32)>
+/*
+ * 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>
 }
 
-impl DecoratedHandler {
-    fn new() -> DecoratedHandler { DecoratedHandler { newsize: None }}
+pub struct WindowStore {
+    windows: Vec<InternalWindow>,
+}
 
-    pub fn take_newsize(&mut self) -> Option<(u32, u32)> {
-        self.newsize.take()
+impl WindowStore {
+    pub fn new() -> WindowStore {
+        WindowStore {
+            windows: Vec::new(),
+        }
     }
-}
 
-impl wayland_window::Handler for DecoratedHandler {
-    fn configure(&mut self,
-                 _: &mut EventQueueHandle,
-                 _: wl_shell_surface::Resize,
-                 width: i32, height: i32)
+    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>>),
     {
-        use std::cmp::max;
-        self.newsize = Some((max(width,1) as u32, max(height,1) as u32));
+        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/dnd.rs

@@ -0,0 +1,219 @@
+use std::io;
+use std::sync::Arc;
+use std::path::{Path, PathBuf};
+use std::str::Utf8Error;
+use std::os::raw::*;
+
+use percent_encoding::percent_decode;
+
+use super::{ffi, util, XConnection, XError};
+
+#[derive(Debug)]
+pub struct DndAtoms {
+    pub aware: ffi::Atom,
+    pub enter: ffi::Atom,
+    pub leave: ffi::Atom,
+    pub drop: ffi::Atom,
+    pub position: ffi::Atom,
+    pub status: ffi::Atom,
+    pub action_private: ffi::Atom,
+    pub selection: ffi::Atom,
+    pub finished: ffi::Atom,
+    pub type_list: ffi::Atom,
+    pub uri_list: ffi::Atom,
+    pub none: ffi::Atom,
+}
+
+impl DndAtoms {
+    pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> {
+        let names = [
+            b"XdndAware\0".as_ptr() as *mut c_char,
+            b"XdndEnter\0".as_ptr() as *mut c_char,
+            b"XdndLeave\0".as_ptr() as *mut c_char,
+            b"XdndDrop\0".as_ptr() as *mut c_char,
+            b"XdndPosition\0".as_ptr() as *mut c_char,
+            b"XdndStatus\0".as_ptr() as *mut c_char,
+            b"XdndActionPrivate\0".as_ptr() as *mut c_char,
+            b"XdndSelection\0".as_ptr() as *mut c_char,
+            b"XdndFinished\0".as_ptr() as *mut c_char,
+            b"XdndTypeList\0".as_ptr() as *mut c_char,
+            b"text/uri-list\0".as_ptr() as *mut c_char,
+            b"None\0".as_ptr() as *mut c_char,
+        ];
+        let atoms = unsafe { xconn.get_atoms(&names) }?;
+        Ok(DndAtoms {
+            aware: atoms[0],
+            enter: atoms[1],
+            leave: atoms[2],
+            drop: atoms[3],
+            position: atoms[4],
+            status: atoms[5],
+            action_private: atoms[6],
+            selection: atoms[7],
+            finished: atoms[8],
+            type_list: atoms[9],
+            uri_list: atoms[10],
+            none: atoms[11],
+        })
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum DndState {
+    Accepted,
+    Rejected,
+}
+
+#[derive(Debug)]
+pub enum DndDataParseError {
+    EmptyData,
+    InvalidUtf8(Utf8Error),
+    HostnameSpecified(String),
+    UnexpectedProtocol(String),
+    UnresolvablePath(io::Error),
+}
+
+impl From<Utf8Error> for DndDataParseError {
+    fn from(e: Utf8Error) -> Self {
+        DndDataParseError::InvalidUtf8(e)
+    }
+}
+
+impl From<io::Error> for DndDataParseError {
+    fn from(e: io::Error) -> Self {
+        DndDataParseError::UnresolvablePath(e)
+    }
+}
+
+pub struct Dnd {
+    xconn: Arc<XConnection>,
+    pub atoms: DndAtoms,
+    // Populated by XdndEnter event handler
+    pub version: Option<c_long>,
+    pub type_list: Option<Vec<c_ulong>>,
+    // Populated by XdndPosition event handler
+    pub source_window: Option<c_ulong>,
+    // Populated by SelectionNotify event handler (triggered by XdndPosition event handler)
+    pub result: Option<Result<Vec<PathBuf>, DndDataParseError>>,
+}
+
+impl Dnd {
+    pub fn new(xconn: Arc<XConnection>) -> Result<Self, XError> {
+        let atoms = DndAtoms::new(&xconn)?;
+        Ok(Dnd {
+            xconn,
+            atoms,
+            version: None,
+            type_list: None,
+            source_window: None,
+            result: None,
+        })
+    }
+
+    pub fn reset(&mut self) {
+        self.version = None;
+        self.type_list = None;
+        self.source_window = None;
+        self.result = None;
+    }
+
+    pub unsafe fn send_status(
+        &self,
+        this_window: c_ulong,
+        target_window: c_ulong,
+        state: DndState,
+    ) -> Result<(), XError> {
+        let (accepted, action) = match state {
+            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()
+    }
+
+    pub unsafe fn send_finished(
+        &self,
+        this_window: c_ulong,
+        target_window: c_ulong,
+        state: DndState,
+    ) -> Result<(), XError> {
+        let (accepted, action) = match state {
+            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()
+    }
+
+    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,
+        )
+    }
+
+    pub unsafe fn convert_selection(&self, window: c_ulong, time: c_ulong) {
+        (self.xconn.xlib.XConvertSelection)(
+            self.xconn.display,
+            self.atoms.selection,
+            self.atoms.uri_list,
+            self.atoms.selection,
+            window,
+            time,
+        );
+    }
+
+    pub unsafe fn read_data(
+        &self,
+        window: c_ulong,
+    ) -> Result<Vec<c_uchar>, util::GetPropertyError> {
+        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> {
+        if !data.is_empty() {
+            let mut path_list = Vec::new();
+            let decoded = percent_decode(data).decode_utf8()?.into_owned();
+            for uri in decoded.split("\r\n").filter(|u| !u.is_empty()) {
+                // The format is specified as protocol://host/path
+                // However, it's typically simply protocol:///path
+                let path_str = if uri.starts_with("file://") {
+                    let path_str = uri.replace("file://", "");
+                    if !path_str.starts_with('/') {
+                        // A hostname is specified
+                        // Supporting this case is beyond the scope of my mental health
+                        return Err(DndDataParseError::HostnameSpecified(path_str));
+                    }
+                    path_str
+                } else {
+                    // Only the file protocol is supported
+                    return Err(DndDataParseError::UnexpectedProtocol(uri.to_owned()));
+                };
+
+                let path = Path::new(&path_str).canonicalize()?;
+                path_list.push(path);
+            }
+            Ok(path_list)
+        } else {
+            Err(DndDataParseError::EmptyData)
+        }
+    }
+}

src/platform/linux/x11/events.rs

@@ -2,8 +2,8 @@ use {events, libc};
 use super::ffi;
 use VirtualKeyCode;
 
-pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
-    Some(match scancode {
+pub fn keysym_to_element(keysym: libc::c_uint) -> Option<VirtualKeyCode> {
+    Some(match keysym {
         ffi::XK_BackSpace => events::VirtualKeyCode::Back,
         ffi::XK_Tab => events::VirtualKeyCode::Tab,
         //ffi::XK_Linefeed => events::VirtualKeyCode::Linefeed,
@@ -67,19 +67,19 @@ pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
         //ffi::XK_KP_F2 => events::VirtualKeyCode::Kp_f2,
         //ffi::XK_KP_F3 => events::VirtualKeyCode::Kp_f3,
         //ffi::XK_KP_F4 => events::VirtualKeyCode::Kp_f4,
-        //ffi::XK_KP_Home => events::VirtualKeyCode::Kp_home,
-        //ffi::XK_KP_Left => events::VirtualKeyCode::NumpadLeft,
-        //ffi::XK_KP_Up => events::VirtualKeyCode::NumpadUp,
-        //ffi::XK_KP_Right => events::VirtualKeyCode::NumpadRight,
-        //ffi::XK_KP_Down => events::VirtualKeyCode::NumpadDown,
+        ffi::XK_KP_Home => events::VirtualKeyCode::Home,
+        ffi::XK_KP_Left => events::VirtualKeyCode::Left,
+        ffi::XK_KP_Up => events::VirtualKeyCode::Up,
+        ffi::XK_KP_Right => events::VirtualKeyCode::Right,
+        ffi::XK_KP_Down => events::VirtualKeyCode::Down,
         //ffi::XK_KP_Prior => events::VirtualKeyCode::Kp_prior,
-        //ffi::XK_KP_Page_Up => events::VirtualKeyCode::NumpadPageUp,
+        ffi::XK_KP_Page_Up => events::VirtualKeyCode::PageUp,
         //ffi::XK_KP_Next => events::VirtualKeyCode::Kp_next,
-        //ffi::XK_KP_Page_Down => events::VirtualKeyCode::NumpadPageDown,
-        //ffi::XK_KP_End => events::VirtualKeyCode::NumpadEnd,
+        ffi::XK_KP_Page_Down => events::VirtualKeyCode::PageDown,
+        ffi::XK_KP_End => events::VirtualKeyCode::End,
         //ffi::XK_KP_Begin => events::VirtualKeyCode::Kp_begin,
-        //ffi::XK_KP_Insert => events::VirtualKeyCode::NumpadInsert,
-        //ffi::XK_KP_Delete => events::VirtualKeyCode::NumpadDelete,
+        ffi::XK_KP_Insert => events::VirtualKeyCode::Insert,
+        ffi::XK_KP_Delete => events::VirtualKeyCode::Delete,
         ffi::XK_KP_Equal => events::VirtualKeyCode::NumpadEquals,
         //ffi::XK_KP_Multiply => events::VirtualKeyCode::NumpadMultiply,
         //ffi::XK_KP_Add => events::VirtualKeyCode::NumpadAdd,
@@ -171,6 +171,7 @@ pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
         //ffi::XK_Super_R => events::VirtualKeyCode::Super_r,
         //ffi::XK_Hyper_L => events::VirtualKeyCode::Hyper_l,
         //ffi::XK_Hyper_R => events::VirtualKeyCode::Hyper_r,
+        ffi::XK_ISO_Left_Tab => events::VirtualKeyCode::Tab,
         ffi::XK_space => events::VirtualKeyCode::Space,
         //ffi::XK_exclam => events::VirtualKeyCode::Exclam,
         //ffi::XK_quotedbl => events::VirtualKeyCode::Quotedbl,
@@ -999,6 +1000,9 @@ pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
         //ffi::XK_Hebrew_switch => events::VirtualKeyCode::Hebrew_switch,
         ffi::XF86XK_Back => VirtualKeyCode::NavigateBackward,
         ffi::XF86XK_Forward => VirtualKeyCode::NavigateForward,
+        ffi::XF86XK_Copy => VirtualKeyCode::Copy,
+        ffi::XF86XK_Paste => VirtualKeyCode::Paste,
+        ffi::XF86XK_Cut => VirtualKeyCode::Cut,
         _ => return None
     })
 }

src/platform/linux/x11/ffi.rs

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

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

@@ -0,0 +1,185 @@
+use std::ptr;
+use std::sync::Arc;
+use std::collections::HashMap;
+use std::os::raw::c_char;
+
+use super::{ffi, XConnection, XError};
+
+use super::inner::{close_im, ImeInner};
+use super::input_method::PotentialInputMethods;
+use super::context::{ImeContextCreationError, ImeContext};
+
+pub unsafe fn xim_set_callback(
+    xconn: &Arc<XConnection>,
+    xim: ffi::XIM,
+    field: *const c_char,
+    callback: *mut ffi::XIMCallback,
+) -> 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.check_errors()
+}
+
+// Set a callback for when an input method matching the current locale modifiers becomes
+// available. Note that this has nothing to do with what input methods are open or able to be
+// opened, and simply uses the modifiers that are set when the callback is set.
+// * This is called per locale modifier, not per input method opened with that locale modifier.
+// * Trying to set this for multiple locale modifiers causes problems, i.e. one of the rebuilt
+//   input contexts would always silently fail to use the input method.
+pub unsafe fn set_instantiate_callback(
+    xconn: &Arc<XConnection>,
+    client_data: ffi::XPointer,
+) -> Result<(), XError> {
+    (xconn.xlib.XRegisterIMInstantiateCallback)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+        Some(xim_instantiate_callback),
+        client_data,
+    );
+    xconn.check_errors()
+}
+
+pub unsafe fn unset_instantiate_callback(
+    xconn: &Arc<XConnection>,
+    client_data: ffi::XPointer,
+) -> Result<(), XError> {
+    (xconn.xlib.XUnregisterIMInstantiateCallback)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+        Some(xim_instantiate_callback),
+        client_data,
+    );
+    xconn.check_errors()
+}
+
+pub unsafe fn set_destroy_callback(
+    xconn: &Arc<XConnection>,
+    im: ffi::XIM,
+    inner: &ImeInner,
+) -> Result<(), XError> {
+    xim_set_callback(
+        &xconn,
+        im,
+        ffi::XNDestroyCallback_0.as_ptr() as *const _,
+        &inner.destroy_callback as *const _ as *mut _,
+    )
+}
+
+#[derive(Debug)]
+enum ReplaceImError {
+    MethodOpenFailed(PotentialInputMethods),
+    ContextCreationFailed(ImeContextCreationError),
+    SetDestroyCallbackFailed(XError),
+}
+
+// Attempt to replace current IM (which may or may not be presently valid) with a new one. This
+// includes replacing all existing input contexts and free'ing resources as necessary. This only
+// modifies existing state if all operations succeed.
+unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
+    let xconn = &(*inner).xconn;
+
+    let (new_im, is_fallback) = {
+        let new_im = (*inner).potential_input_methods.open_im(xconn, None);
+        let is_fallback = new_im.is_fallback();
+        (
+            new_im.ok().ok_or_else(|| {
+                ReplaceImError::MethodOpenFailed((*inner).potential_input_methods.clone())
+            })?,
+            is_fallback,
+        )
+    };
+
+    // It's important to always set a destroy callback, since there's otherwise potential for us
+    // to try to use or free a resource that's already been destroyed on the server.
+    {
+        let result = set_destroy_callback(xconn, new_im.im, &*inner);
+        if result.is_err() {
+            let _ = close_im(xconn, new_im.im);
+        }
+        result
+    }.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,
+            );
+            if result.is_err() {
+                let _ = close_im(xconn, new_im.im);
+            }
+            result.map_err(ReplaceImError::ContextCreationFailed)?
+        };
+        new_contexts.insert(*window, Some(new_context));
+    }
+
+    // If we've made it this far, everything succeeded.
+    let _ = (*inner).destroy_all_contexts_if_necessary();
+    let _ = (*inner).close_im_if_necessary();
+    (*inner).im = new_im.im;
+    (*inner).contexts = new_contexts;
+    (*inner).is_destroyed = false;
+    (*inner).is_fallback = is_fallback;
+    Ok(())
+}
+
+pub unsafe extern fn xim_instantiate_callback(
+    _display: *mut ffi::Display,
+    client_data: ffi::XPointer,
+    // This field is unsupplied.
+    _call_data: ffi::XPointer,
+) {
+    let inner: *mut ImeInner = client_data as _;
+    if !inner.is_null() {
+        let xconn = &(*inner).xconn;
+        let result = replace_im(inner);
+        if result.is_ok() {
+            let _ = unset_instantiate_callback(xconn, client_data);
+            (*inner).is_fallback = false;
+        } else if result.is_err() && (*inner).is_destroyed {
+            // We have no usable input methods!
+            result.expect("Failed to reopen input method");
+        }
+    }
+}
+
+// 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(
+    _xim: ffi::XIM,
+    client_data: ffi::XPointer,
+    // This field is unsupplied.
+    _call_data: ffi::XPointer,
+) {
+    let inner: *mut ImeInner = client_data as _;
+    if !inner.is_null() {
+        (*inner).is_destroyed = true;
+        let xconn = &(*inner).xconn;
+        if !(*inner).is_fallback {
+            let _ = set_instantiate_callback(xconn, client_data);
+            // Attempt to open fallback input method.
+            let result = replace_im(inner);
+            if result.is_ok() {
+                (*inner).is_fallback = true;
+            } else {
+                // We have no usable input methods!
+                result.expect("Failed to open fallback input method");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,134 @@
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::{c_short, c_void};
+
+use super::{ffi, util, XConnection, XError};
+
+#[derive(Debug)]
+pub enum ImeContextCreationError {
+    XError(XError),
+    Null,
+}
+
+unsafe fn create_pre_edit_attr<'a>(
+    xconn: &'a Arc<XConnection>,
+    ic_spot: &'a ffi::XPoint,
+) -> util::XSmartPointer<'a, c_void> {
+    util::XSmartPointer::new(
+        xconn,
+        (xconn.xlib.XVaCreateNestedList)(
+            0,
+            ffi::XNSpotLocation_0.as_ptr() as *const _,
+            ic_spot,
+            ptr::null_mut::<()>(),
+        ),
+    ).expect("XVaCreateNestedList returned NULL")
+}
+
+// WARNING: this struct doesn't destroy its XIC resource when dropped.
+// This is intentional, as it doesn't have enough information to know whether or not the context
+// still exists on the server. Since `ImeInner` has that awareness, destruction must be handled
+// through `ImeInner`.
+#[derive(Debug)]
+pub struct ImeContext {
+    pub ic: ffi::XIC,
+    pub ic_spot: ffi::XPoint,
+}
+
+impl ImeContext {
+    pub unsafe fn new(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+        ic_spot: Option<ffi::XPoint>,
+    ) -> Result<Self, ImeContextCreationError> {
+        let ic = if let Some(ic_spot) = ic_spot {
+            ImeContext::create_ic_with_spot(xconn, im, window, ic_spot)
+        } else {
+            ImeContext::create_ic(xconn, im, window)
+        };
+
+        let ic = ic.ok_or(ImeContextCreationError::Null)?;
+        xconn.check_errors().map_err(ImeContextCreationError::XError)?;
+
+        Ok(ImeContext {
+            ic,
+            ic_spot: ic_spot.unwrap_or_else(|| ffi::XPoint { x: 0, y: 0 }),
+        })
+    }
+
+    unsafe fn create_ic(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+    ) -> Option<ffi::XIC> {
+        let ic = (xconn.xlib.XCreateIC)(
+            im,
+            ffi::XNInputStyle_0.as_ptr() as *const _,
+            ffi::XIMPreeditNothing | ffi::XIMStatusNothing,
+            ffi::XNClientWindow_0.as_ptr() as *const _,
+            window,
+            ptr::null_mut::<()>(),
+        );
+        if ic.is_null() {
+            None
+        } else {
+            Some(ic)
+        }
+    }
+
+    unsafe fn create_ic_with_spot(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+        ic_spot: ffi::XPoint,
+    ) -> Option<ffi::XIC> {
+        let pre_edit_attr = create_pre_edit_attr(xconn, &ic_spot);
+        let ic = (xconn.xlib.XCreateIC)(
+            im,
+            ffi::XNInputStyle_0.as_ptr() as *const _,
+            ffi::XIMPreeditNothing | ffi::XIMStatusNothing,
+            ffi::XNClientWindow_0.as_ptr() as *const _,
+            window,
+            ffi::XNPreeditAttributes_0.as_ptr() as *const _,
+            pre_edit_attr.ptr,
+            ptr::null_mut::<()>(),
+        );
+        if ic.is_null() {
+            None
+        } else {
+            Some(ic)
+        }
+    }
+
+    pub fn focus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+        unsafe {
+            (xconn.xlib.XSetICFocus)(self.ic);
+        }
+        xconn.check_errors()
+    }
+
+    pub fn unfocus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+        unsafe {
+            (xconn.xlib.XUnsetICFocus)(self.ic);
+        }
+        xconn.check_errors()
+    }
+
+    pub fn set_spot(&mut self, xconn: &Arc<XConnection>, x: c_short, y: c_short) {
+        if self.ic_spot.x == x && self.ic_spot.y == y {
+            return;
+        }
+        self.ic_spot = ffi::XPoint { x, y };
+
+        unsafe {
+            let pre_edit_attr = create_pre_edit_attr(xconn, &self.ic_spot);
+            (xconn.xlib.XSetICValues)(
+                self.ic,
+                ffi::XNPreeditAttributes_0.as_ptr() as *const _,
+                pre_edit_attr.ptr,
+                ptr::null_mut::<()>(),
+            );
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+use std::mem;
+use std::ptr;
+use std::sync::Arc;
+use std::collections::HashMap;
+
+use super::{ffi, XConnection, XError};
+
+use super::input_method::PotentialInputMethods;
+use super::context::ImeContext;
+
+pub unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
+    (xconn.xlib.XCloseIM)(im);
+    xconn.check_errors()
+}
+
+pub unsafe fn destroy_ic(xconn: &Arc<XConnection>, ic: ffi::XIC) -> Result<(), XError> {
+    (xconn.xlib.XDestroyIC)(ic);
+    xconn.check_errors()
+}
+
+pub struct ImeInner {
+    pub xconn: Arc<XConnection>,
+    // WARNING: this is initially null!
+    pub im: ffi::XIM,
+    pub potential_input_methods: PotentialInputMethods,
+    pub contexts: HashMap<ffi::Window, Option<ImeContext>>,
+    // WARNING: this is initially zeroed!
+    pub destroy_callback: ffi::XIMCallback,
+    // Indicates whether or not the the input method was destroyed on the server end
+    // (i.e. if ibus/fcitx/etc. was terminated/restarted)
+    pub is_destroyed: bool,
+    pub is_fallback: bool,
+}
+
+impl ImeInner {
+    pub fn new(
+        xconn: Arc<XConnection>,
+        potential_input_methods: PotentialInputMethods,
+    ) -> Self {
+        ImeInner {
+            xconn,
+            im: ptr::null_mut(),
+            potential_input_methods,
+            contexts: HashMap::new(),
+            destroy_callback: unsafe { mem::zeroed() },
+            is_destroyed: false,
+            is_fallback: false,
+        }
+    }
+
+    pub unsafe fn close_im_if_necessary(&self) -> Result<bool, XError> {
+        if !self.is_destroyed {
+            close_im(&self.xconn, self.im).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub unsafe fn destroy_ic_if_necessary(&self, ic: ffi::XIC) -> Result<bool, XError> {
+        if !self.is_destroyed {
+            destroy_ic(&self.xconn, ic).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub unsafe fn destroy_all_contexts_if_necessary(&self) -> Result<bool, XError> {
+        for context in self.contexts.values() {
+            if let &Some(ref context) = context {
+                self.destroy_ic_if_necessary(context.ic)?;
+            }
+        }
+        Ok(!self.is_destroyed)
+    }
+}

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

@@ -0,0 +1,283 @@
+use std::env;
+use std::fmt;
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::c_char;
+use std::ffi::{CStr, CString, IntoStringError};
+
+use parking_lot::Mutex;
+
+use super::{ffi, util, XConnection, XError};
+
+lazy_static! {
+    static ref GLOBAL_LOCK: Mutex<()> = Default::default();
+}
+
+unsafe fn open_im(
+    xconn: &Arc<XConnection>,
+    locale_modifiers: &CStr,
+) -> Option<ffi::XIM> {
+    let _lock = GLOBAL_LOCK.lock();
+
+    // XSetLocaleModifiers returns...
+    // * The current locale modifiers if it's given a NULL pointer.
+    // * The new locale modifiers if we succeeded in setting them.
+    // * NULL if the locale modifiers string is malformed.
+    (xconn.xlib.XSetLocaleModifiers)(locale_modifiers.as_ptr());
+
+    let im = (xconn.xlib.XOpenIM)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+    );
+
+    if im.is_null() {
+        None
+    } else {
+        Some(im)
+    }
+}
+
+#[derive(Debug)]
+pub struct InputMethod {
+    pub im: ffi::XIM,
+    name: String,
+}
+
+impl InputMethod {
+    fn new(im: ffi::XIM, name: String) -> Self {
+        InputMethod { im, name }
+    }
+}
+
+#[derive(Debug)]
+pub enum InputMethodResult {
+    /// Input method used locale modifier from `XMODIFIERS` environment variable.
+    XModifiers(InputMethod),
+    /// Input method used internal fallback locale modifier.
+    Fallback(InputMethod),
+    /// Input method could not be opened using any locale modifier tried.
+    Failure,
+}
+
+impl InputMethodResult {
+    pub fn is_fallback(&self) -> bool {
+        if let &InputMethodResult::Fallback(_) = self {
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn ok(self) -> Option<InputMethod> {
+        use self::InputMethodResult::*;
+        match self {
+            XModifiers(im) | Fallback(im) => Some(im),
+            Failure => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+enum GetXimServersError {
+    XError(XError),
+    GetPropertyError(util::GetPropertyError),
+    InvalidUtf8(IntoStringError),
+}
+
+// The root window has a property named XIM_SERVERS, which contains a list of atoms represeting
+// the availabile XIM servers. For instance, if you're using ibus, it would contain an atom named
+// "@server=ibus". It's possible for this property to contain multiple atoms, though presumably
+// rare. Note that we replace "@server=" with "@im=" in order to match the format of locale
+// modifiers, since we don't want a user who's looking at logs to ask "am I supposed to set
+// XMODIFIERS to `@server=ibus`?!?"
+unsafe fn get_xim_servers(xconn: &Arc<XConnection>) -> Result<Vec<String>, GetXimServersError> {
+    let servers_atom = xconn.get_atom_unchecked(b"XIM_SERVERS\0");
+
+    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 names: Vec<*const c_char> = Vec::with_capacity(atoms.len());
+    (xconn.xlib.XGetAtomNames)(
+        xconn.display,
+        atoms.as_mut_ptr(),
+        atoms.len() as _,
+        names.as_mut_ptr() as _,
+    );
+    names.set_len(atoms.len());
+
+    let mut formatted_names = Vec::with_capacity(names.len());
+    for name in names {
+        let string = CStr::from_ptr(name)
+            .to_owned()
+            .into_string()
+            .map_err(GetXimServersError::InvalidUtf8)?;
+        (xconn.xlib.XFree)(name as _);
+        formatted_names.push(string.replace("@server=", "@im="));
+    }
+    xconn.check_errors().map_err(GetXimServersError::XError)?;
+    Ok(formatted_names)
+}
+
+#[derive(Clone)]
+struct InputMethodName {
+    c_string: CString,
+    string: String,
+}
+
+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,
+        }
+    }
+
+    pub fn from_str(string: &str) -> Self {
+        let c_string = CString::new(string)
+            .expect("String used to construct CString contained null byte");
+        InputMethodName {
+            c_string,
+            string: string.to_owned(),
+        }
+    }
+}
+
+impl fmt::Debug for InputMethodName {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.string.fmt(f)
+    }
+}
+
+#[derive(Debug, Clone)]
+struct PotentialInputMethod {
+    name: InputMethodName,
+    successful: Option<bool>,
+}
+
+impl PotentialInputMethod {
+    pub fn from_string(string: String) -> Self {
+        PotentialInputMethod {
+            name: InputMethodName::from_string(string),
+            successful: None,
+        }
+    }
+
+    pub fn from_str(string: &str) -> Self {
+        PotentialInputMethod {
+            name: InputMethodName::from_str(string),
+            successful: None,
+        }
+    }
+
+    pub fn reset(&mut self) {
+        self.successful = None;
+    }
+
+    pub fn open_im(&mut self, xconn: &Arc<XConnection>) -> Option<InputMethod> {
+        let im = unsafe { open_im(xconn, &self.name.c_string) };
+        self.successful = Some(im.is_some());
+        im.map(|im| InputMethod::new(im, self.name.string.clone()))
+    }
+}
+
+// By logging this struct, you get a sequential listing of every locale modifier tried, where it
+// came from, and if it succceeded.
+#[derive(Debug, Clone)]
+pub struct PotentialInputMethods {
+    // On correctly configured systems, the XMODIFIERS environemnt variable tells us everything we
+    // need to know.
+    xmodifiers: Option<PotentialInputMethod>,
+    // We have some standard options at our disposal that should ostensibly always work. For users
+    // who only need compose sequences, this ensures that the program launches without a hitch
+    // For users who need more sophisticated IME features, this is more or less a silent failure.
+    // Logging features should be added in the future to allow both audiences to be effectively
+    // served.
+    fallbacks: [PotentialInputMethod; 2],
+    // For diagnostic purposes, we include the list of XIM servers that the server reports as
+    // being available.
+    _xim_servers: Result<Vec<String>, GetXimServersError>,
+}
+
+impl PotentialInputMethods {
+    pub fn new(xconn: &Arc<XConnection>) -> Self {
+        let xmodifiers = env::var("XMODIFIERS")
+            .ok()
+            .map(PotentialInputMethod::from_string);
+        PotentialInputMethods {
+            // Since passing "" to XSetLocaleModifiers results in it defaulting to the value of
+            // XMODIFIERS, it's worth noting what happens if XMODIFIERS is also "". If simply
+            // running the program with `XMODIFIERS="" cargo run`, then assuming XMODIFIERS is
+            // defined in the profile (or parent environment) then that parent XMODIFIERS is used.
+            // If that XMODIFIERS value is also "" (i.e. if you ran `export XMODIFIERS=""`), then
+            // XSetLocaleModifiers uses the default local input method. Note that defining
+            // XMODIFIERS as "" is different from XMODIFIERS not being defined at all, since in
+            // that case, we get `None` and end up skipping ahead to the next method.
+            xmodifiers,
+            fallbacks: [
+                // This is a standard input method that supports compose equences, which should
+                // always be available. `@im=none` appears to mean the same thing.
+                PotentialInputMethod::from_str("@im=local"),
+                // This explicitly specifies to use the implementation-dependent default, though
+                // that seems to be equivalent to just using the local input method.
+                PotentialInputMethod::from_str("@im="),
+            ],
+            // The XIM_SERVERS property can have surprising values. For instance, when I exited
+            // ibus to run fcitx, it retained the value denoting ibus. Even more surprising is
+            // that the fcitx input method could only be successfully opened using "@im=ibus".
+            // Presumably due to this quirk, it's actually possible to alternate between ibus and
+            // fcitx in a running application.
+            _xim_servers: unsafe { get_xim_servers(xconn) },
+        }
+    }
+
+    // This resets the `successful` field of every potential input method, ensuring we have
+    // accurate information when this struct is re-used by the destruction/instantiation callbacks.
+    fn reset(&mut self) {
+        if let Some(ref mut input_method) = self.xmodifiers {
+            input_method.reset();
+        }
+
+        for input_method in &mut self.fallbacks {
+            input_method.reset();
+        }
+    }
+
+    pub fn open_im(
+        &mut self,
+        xconn: &Arc<XConnection>,
+        callback: Option<&Fn() -> ()>,
+    ) -> InputMethodResult {
+        use self::InputMethodResult::*;
+
+        self.reset();
+
+        if let Some(ref mut input_method) = self.xmodifiers {
+            let im = input_method.open_im(xconn);
+            if let Some(im) = im {
+                return XModifiers(im);
+            } else {
+                if let Some(ref callback) = callback {
+                    callback();
+                }
+            }
+        }
+
+        for input_method in &mut self.fallbacks {
+            let im = input_method.open_im(xconn);
+            if let Some(im) = im {
+                return Fallback(im);
+            }
+        }
+
+        Failure
+    }
+}

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

@@ -0,0 +1,165 @@
+// Important: all XIM calls need to happen from the same thread!
+
+mod inner;
+mod input_method;
+mod context;
+mod callbacks;
+
+use std::sync::Arc;
+use std::sync::mpsc::{Receiver, Sender};
+
+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 type ImeReceiver = Receiver<(ffi::Window, i16, i16)>;
+pub type ImeSender = Sender<(ffi::Window, i16, i16)>;
+
+#[derive(Debug)]
+pub enum ImeCreationError {
+    OpenFailure(PotentialInputMethods),
+    SetDestroyCallbackFailed(XError),
+}
+
+pub struct Ime {
+    xconn: Arc<XConnection>,
+    // The actual meat of this struct is boxed away, since it needs to have a fixed location in
+    // memory so we can pass a pointer to it around.
+    inner: Box<ImeInner>,
+}
+
+impl Ime {
+    pub fn new(xconn: Arc<XConnection>) -> Result<Self, ImeCreationError> {
+        let potential_input_methods = PotentialInputMethods::new(&xconn);
+
+        let (mut inner, client_data) = {
+            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 {
+                client_data,
+                callback: Some(xim_destroy_callback),
+            };
+            inner = unsafe { Box::from_raw(inner_ptr) };
+            inner.destroy_callback = destroy_callback;
+            (inner, client_data)
+        };
+
+        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 is_fallback = input_method.is_fallback();
+        if let Some(input_method) = input_method.ok() {
+            inner.im = input_method.im;
+            inner.is_fallback = is_fallback;
+            unsafe {
+                let result = set_destroy_callback(&xconn, input_method.im, &*inner)
+                    .map_err(ImeCreationError::SetDestroyCallbackFailed);
+                if result.is_err() {
+                    let _ = close_im(&xconn, input_method.im);
+                }
+                result?;
+            }
+            Ok(Ime { xconn, inner })
+        } else {
+            Err(ImeCreationError::OpenFailure(inner.potential_input_methods))
+        }
+    }
+
+    pub fn is_destroyed(&self) -> bool {
+        self.inner.is_destroyed
+    }
+
+    // This pattern is used for various methods here:
+    // 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>
+    {
+        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,
+            ) }?)
+        };
+        self.inner.contexts.insert(window, context);
+        Ok(!self.is_destroyed())
+    }
+
+    pub fn get_context(&self, window: ffi::Window) -> Option<ffi::XIC> {
+        if self.is_destroyed() {
+            return None;
+        }
+        if let Some(&Some(ref context)) = self.inner.contexts.get(&window) {
+            Some(context.ic)
+        } else {
+            None
+        }
+    }
+
+    pub fn remove_context(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if let Some(Some(context)) = self.inner.contexts.remove(&window) {
+            unsafe {
+                self.inner.destroy_ic_if_necessary(context.ic)?;
+            }
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn focus(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if self.is_destroyed() {
+            return Ok(false);
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.focus(&self.xconn).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn unfocus(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if self.is_destroyed() {
+            return Ok(false);
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.unfocus(&self.xconn).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn send_xim_spot(&mut self, window: ffi::Window, x: i16, y: i16) {
+        if self.is_destroyed() {
+            return;
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.set_spot(&self.xconn, x as _, y as _);
+        }
+    }
+}
+
+impl Drop for Ime {
+    fn drop(&mut self) {
+        unsafe {
+            let _ = self.inner.destroy_all_contexts_if_necessary();
+            let _ = self.inner.close_im_if_necessary();
+        }
+    }
+}

src/platform/linux/x11/input.rs

@@ -1,391 +0,0 @@
-use std::sync::Arc;
-
-use libc;
-use std::{mem, ptr};
-use std::ffi::CString;
-use std::slice::from_raw_parts;
-
-use WindowAttributes;
-
-use events::WindowEvent as Event;
-use events::ModifiersState;
-
-use super::{events, ffi};
-use super::XConnection;
-
-#[derive(Debug)]
-enum AxisType {
-    HorizontalScroll,
-    VerticalScroll
-}
-
-#[derive(Debug)]
-struct Axis {
-    id: i32,
-    device_id: i32,
-    axis_number: i32,
-    axis_type: AxisType,
-    scroll_increment: f64,
-}
-
-#[derive(Debug)]
-struct AxisValue {
-    device_id: i32,
-    axis_number: i32,
-    value: f64
-}
-
-struct InputState {
-    /// Last-seen cursor position within a window in (x, y)
-    /// coordinates
-    cursor_pos: (f64, f64),
-    /// Last-seen positions of axes, used to report delta
-    /// movements when a new absolute axis value is received
-    axis_values: Vec<AxisValue>
-}
-
-pub struct XInputEventHandler {
-    display: Arc<XConnection>,
-    window: ffi::Window,
-    ic: ffi::XIC,
-    axis_list: Vec<Axis>,
-    current_state: InputState,
-    multitouch: bool,
-}
-
-impl XInputEventHandler {
-    pub fn new(display: &Arc<XConnection>, window: ffi::Window, ic: ffi::XIC,
-               window_attrs: &WindowAttributes) -> XInputEventHandler {
-        // query XInput support
-        let mut opcode: libc::c_int = 0;
-        let mut event: libc::c_int = 0;
-        let mut error: libc::c_int = 0;
-        let xinput_str = CString::new("XInputExtension").unwrap();
-
-        unsafe {
-            if (display.xlib.XQueryExtension)(display.display, xinput_str.as_ptr(), &mut opcode, &mut event, &mut error) == ffi::False {
-                panic!("XInput not available")
-            }
-        }
-
-        let mut xinput_major_ver = ffi::XI_2_Major;
-        let mut xinput_minor_ver = ffi::XI_2_Minor;
-
-        unsafe {
-            if (display.xinput2.XIQueryVersion)(display.display, &mut xinput_major_ver, &mut xinput_minor_ver) != ffi::Success as libc::c_int {
-                panic!("Unable to determine XInput version");
-            }
-        }
-
-        // specify the XInput events we want to receive.
-        // Button clicks and mouse events are handled via XInput
-        // events. Key presses are still handled via plain core
-        // X11 events.
-        let mut mask: [libc::c_uchar; 3] = [0; 3];
-        let mut input_event_mask = ffi::XIEventMask {
-            deviceid: ffi::XIAllMasterDevices,
-            mask_len: mask.len() as i32,
-            mask: mask.as_mut_ptr()
-        };
-        let events = &[
-            ffi::XI_ButtonPress,
-            ffi::XI_ButtonRelease,
-            ffi::XI_Motion,
-            ffi::XI_Enter,
-            ffi::XI_Leave,
-            ffi::XI_FocusIn,
-            ffi::XI_FocusOut,
-            ffi::XI_TouchBegin,
-            ffi::XI_TouchUpdate,
-            ffi::XI_TouchEnd,
-        ];
-        for event in events {
-            ffi::XISetMask(&mut mask, *event);
-        }
-
-        unsafe {
-            match (display.xinput2.XISelectEvents)(display.display, window, &mut input_event_mask, 1) {
-                status if status as u8 == ffi::Success => (),
-                err => panic!("Failed to select events {:?}", err)
-            }
-        }
-
-        XInputEventHandler {
-            display: display.clone(),
-            window: window,
-            ic: ic,
-            axis_list: read_input_axis_info(display),
-            current_state: InputState {
-                cursor_pos: (0.0, 0.0),
-                axis_values: Vec::new()
-            },
-            multitouch: window_attrs.multitouch,
-        }
-    }
-
-    pub fn translate_key_event(&self, event: &mut ffi::XKeyEvent) -> Vec<Event> {
-        use events::WindowEvent::{KeyboardInput, ReceivedCharacter};
-        use events::ElementState::{Pressed, Released};
-
-        let mut translated_events = Vec::new();
-
-        let state;
-        if event.type_ == ffi::KeyPress {
-            let raw_ev: *mut ffi::XKeyEvent = event;
-            unsafe { (self.display.xlib.XFilterEvent)(mem::transmute(raw_ev), self.window) };
-            state = Pressed;
-        } else {
-            state = Released;
-        }
-
-        let mut kp_keysym = 0;
-
-        let mut ev_mods = ModifiersState::default();
-
-        let written = unsafe {
-            use std::str;
-
-            let mut buffer: [u8; 16] = [mem::uninitialized(); 16];
-            let raw_ev: *mut ffi::XKeyEvent = event;
-            let count = (self.display.xlib.Xutf8LookupString)(self.ic, mem::transmute(raw_ev),
-            mem::transmute(buffer.as_mut_ptr()),
-            buffer.len() as libc::c_int, &mut kp_keysym, ptr::null_mut());
-
-            {
-                // Translate x event state to mods
-                let state = event.state;
-                if (state & ffi::Mod1Mask) != 0 {
-                    ev_mods.alt = true;
-                }
-
-                if (state & ffi::ShiftMask) != 0 {
-                    ev_mods.shift = true;
-                }
-
-                if (state & ffi::ControlMask) != 0 {
-                    ev_mods.ctrl = true;
-                }
-
-                if (state & ffi::Mod4Mask) != 0 {
-                    ev_mods.logo = true;
-                }
-            }
-
-            str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string()
-        };
-
-        for chr in written.chars() {
-            translated_events.push(ReceivedCharacter(chr));
-        }
-
-        let mut keysym = unsafe {
-            (self.display.xlib.XKeycodeToKeysym)(self.display.display, event.keycode as ffi::KeyCode, 0)
-        };
-
-        if (ffi::XK_KP_Space as libc::c_ulong <= keysym) && (keysym <= ffi::XK_KP_9 as libc::c_ulong) {
-            keysym = kp_keysym
-        };
-
-        let vkey = events::keycode_to_element(keysym as libc::c_uint);
-
-        translated_events.push(KeyboardInput(state, event.keycode as u8, vkey, ev_mods));
-        translated_events
-    }
-
-    pub fn translate_event(&mut self, cookie: &ffi::XGenericEventCookie) -> Option<Event> {
-        use events::WindowEvent::{Focused, MouseEntered, MouseInput, MouseLeft, MouseMoved, MouseWheel};
-        use events::ElementState::{Pressed, Released};
-        use events::MouseButton::{Left, Right, Middle};
-        use events::MouseScrollDelta::LineDelta;
-        use events::{Touch, TouchPhase};
-
-        match cookie.evtype {
-            ffi::XI_ButtonPress | ffi::XI_ButtonRelease => {
-                let event_data: &ffi::XIDeviceEvent = unsafe{mem::transmute(cookie.data)};
-                if self.multitouch && (event_data.flags & ffi::XIPointerEmulated) != 0 {
-                    // Deliver multi-touch events instead of emulated mouse events.
-                    return None
-                }
-                let state = if cookie.evtype == ffi::XI_ButtonPress {
-                    Pressed
-                } else {
-                    Released
-                };
-                match event_data.detail as u32 {
-                    ffi::Button1 => Some(MouseInput(state, Left)),
-                    ffi::Button2 => Some(MouseInput(state, Middle)),
-                    ffi::Button3 => Some(MouseInput(state, Right)),
-                    ffi::Button4 | ffi::Button5 => {
-                        if event_data.flags & ffi::XIPointerEmulated == 0 {
-                            // scroll event from a traditional wheel with
-                            // distinct 'clicks'
-                            let delta = if event_data.detail as u32 == ffi::Button4 {
-                                1.0
-                            } else {
-                                -1.0
-                            };
-                            Some(MouseWheel(LineDelta(0.0, delta), TouchPhase::Moved))
-                        } else {
-                            // emulated button event from a touch/smooth-scroll
-                            // event. Ignore these events and handle scrolling
-                            // via XI_Motion event handler instead
-                            None
-                        }
-                    }
-                    _ => None
-                }
-            },
-            ffi::XI_Motion => {
-                let event_data: &ffi::XIDeviceEvent = unsafe{mem::transmute(cookie.data)};
-                if self.multitouch && (event_data.flags & ffi::XIPointerEmulated) != 0 {
-                    // Deliver multi-touch events instead of emulated mouse events.
-                    return None
-                }
-                let axis_state = event_data.valuators;
-                let mask = unsafe{ from_raw_parts(axis_state.mask, axis_state.mask_len as usize) };
-                let mut axis_count = 0;
-
-                let mut scroll_delta = (0.0, 0.0);
-                for axis_id in 0..axis_state.mask_len {
-                    if ffi::XIMaskIsSet(&mask, axis_id) {
-                        let axis_value = unsafe{*axis_state.values.offset(axis_count)};
-                        let delta = calc_scroll_deltas(event_data, axis_id, axis_value, &self.axis_list,
-                                                       &mut self.current_state.axis_values);
-                        scroll_delta.0 += delta.0;
-                        scroll_delta.1 += delta.1;
-                        axis_count += 1;
-                    }
-                }
-
-                if scroll_delta.0.abs() > 0.0 || scroll_delta.1.abs() > 0.0 {
-                    Some(MouseWheel(LineDelta(scroll_delta.0 as f32, scroll_delta.1 as f32),
-                                    TouchPhase::Moved))
-                } else {
-                    let new_cursor_pos = (event_data.event_x, event_data.event_y);
-                    if new_cursor_pos != self.current_state.cursor_pos {
-                        self.current_state.cursor_pos = new_cursor_pos;
-                        Some(MouseMoved(new_cursor_pos.0 as i32, new_cursor_pos.1 as i32))
-                    } else {
-                        None
-                    }
-                }
-            },
-            ffi::XI_Enter => {
-                // axis movements whilst the cursor is outside the window
-                // will alter the absolute value of the axes. We only want to
-                // report changes in the axis value whilst the cursor is above
-                // our window however, so clear the previous axis state whenever
-                // the cursor re-enters the window
-                self.current_state.axis_values.clear();
-                Some(MouseEntered)
-            },
-            ffi::XI_Leave => Some(MouseLeft),
-            ffi::XI_FocusIn => Some(Focused(true)),
-            ffi::XI_FocusOut => Some(Focused(false)),
-            ffi::XI_TouchBegin | ffi::XI_TouchUpdate | ffi::XI_TouchEnd => {
-                if !self.multitouch {
-                    return None
-                }
-                let event_data: &ffi::XIDeviceEvent = unsafe{mem::transmute(cookie.data)};
-                let phase = match cookie.evtype {
-                    ffi::XI_TouchBegin => TouchPhase::Started,
-                    ffi::XI_TouchUpdate => TouchPhase::Moved,
-                    ffi::XI_TouchEnd => TouchPhase::Ended,
-                    _ => unreachable!()
-                };
-                Some(Event::Touch(Touch {
-                    phase: phase,
-                    location: (event_data.event_x, event_data.event_y),
-                    id: event_data.detail as u64,
-                }))
-            }
-            _ => None
-        }
-    }
-}
-
-fn read_input_axis_info(display: &Arc<XConnection>) -> Vec<Axis> {
-    let mut axis_list = Vec::new();
-    let mut device_count = 0;
-
-    // Check all input devices for scroll axes.
-    let devices = unsafe{
-        (display.xinput2.XIQueryDevice)(display.display, ffi::XIAllDevices, &mut device_count)
-    };
-    for i in 0..device_count {
-        let device = unsafe { *(devices.offset(i as isize)) };
-        for k in 0..device.num_classes {
-            let class = unsafe { *(device.classes.offset(k as isize)) };
-            match unsafe { (*class)._type } {
-                // Note that scroll axis
-                // are reported both as 'XIScrollClass' and 'XIValuatorClass'
-                // axes. For the moment we only care about scrolling axes.
-                ffi::XIScrollClass => {
-                    let scroll_class: &ffi::XIScrollClassInfo = unsafe{mem::transmute(class)};
-                    axis_list.push(Axis{
-                        id: scroll_class.sourceid,
-                        device_id: device.deviceid,
-                        axis_number: scroll_class.number,
-                        axis_type: match scroll_class.scroll_type {
-                            ffi::XIScrollTypeHorizontal => AxisType::HorizontalScroll,
-                            ffi::XIScrollTypeVertical => AxisType::VerticalScroll,
-                            _ => { unreachable!() }
-                        },
-                        scroll_increment: scroll_class.increment,
-                    })
-                },
-                _ => {}
-            }
-        }
-    }
-
-    unsafe {
-        (display.xinput2.XIFreeDeviceInfo)(devices);
-    }
-
-    axis_list
-}
-
-/// Given an input motion event for an axis and the previous
-/// state of the axes, return the horizontal/vertical
-/// scroll deltas
-fn calc_scroll_deltas(event: &ffi::XIDeviceEvent,
-                     axis_id: i32,
-                     axis_value: f64,
-                     axis_list: &[Axis],
-                     prev_axis_values: &mut Vec<AxisValue>) -> (f64, f64) {
-    let prev_value_pos = prev_axis_values.iter().position(|prev_axis| {
-        prev_axis.device_id == event.sourceid &&
-            prev_axis.axis_number == axis_id
-    });
-    let delta = match prev_value_pos {
-        Some(idx) => prev_axis_values[idx].value - axis_value,
-        None => 0.0
-    };
-
-    let new_axis_value = AxisValue{
-        device_id: event.sourceid,
-        axis_number: axis_id,
-        value: axis_value
-    };
-
-    match prev_value_pos {
-        Some(idx) => prev_axis_values[idx] = new_axis_value,
-        None => prev_axis_values.push(new_axis_value)
-    }
-
-    let mut scroll_delta = (0.0, 0.0);
-
-    for axis in axis_list.iter() {
-        if axis.id == event.sourceid &&
-            axis.axis_number == axis_id {
-                match axis.axis_type {
-                    AxisType::HorizontalScroll => scroll_delta.0 = delta / axis.scroll_increment,
-                    AxisType::VerticalScroll => scroll_delta.1 = delta / axis.scroll_increment
-                }
-            }
-    }
-
-    scroll_delta
-}
-

src/platform/linux/x11/monitor.rs

@@ -1,44 +1,269 @@
-use std::collections::VecDeque;
-use std::sync::Arc;
+use std::os::raw::*;
 
-use super::XConnection;
-use native_monitor::NativeMonitorId;
+use parking_lot::Mutex;
 
-#[derive(Clone)]
-pub struct MonitorId(pub Arc<XConnection>, pub u32);
+use {PhysicalPosition, PhysicalSize};
+use super::{util, XConnection, XError};
+use super::ffi::{
+    RRCrtcChangeNotifyMask,
+    RROutputPropertyNotifyMask,
+    RRScreenChangeNotifyMask,
+    True,
+    Window,
+    XRRScreenResources,
+};
 
-pub fn get_available_monitors(x: &Arc<XConnection>) -> VecDeque<MonitorId> {
-    let nb_monitors = unsafe { (x.xlib.XScreenCount)(x.display) };
-    x.check_errors().expect("Failed to call XScreenCount");
+// Used to test XRandR < 1.5 code path. This should always be committed as false.
+const FORCE_RANDR_COMPAT: bool = false;
+// Also used for testing. This should always be committed as false.
+const DISABLE_MONITOR_LIST_CACHING: bool = false;
 
-    let mut monitors = VecDeque::new();
-    monitors.extend((0 .. nb_monitors).map(|i| MonitorId(x.clone(), i as u32)));
-    monitors
+lazy_static! {
+    static ref XRANDR_VERSION: Mutex<Option<(c_int, c_int)>> = Mutex::default();
+    static ref MONITORS: Mutex<Option<Vec<MonitorId>>> = Mutex::default();
 }
 
-#[inline]
-pub fn get_primary_monitor(x: &Arc<XConnection>) -> MonitorId {
-    let primary_monitor = unsafe { (x.xlib.XDefaultScreen)(x.display) };
-    x.check_errors().expect("Failed to call XDefaultScreen");
-    MonitorId(x.clone(), primary_monitor as u32)
+fn version_is_at_least(major: c_int, minor: c_int) -> bool {
+    if let Some((avail_major, avail_minor)) = *XRANDR_VERSION.lock() {
+        if avail_major == major {
+            avail_minor >= minor
+        } else {
+            avail_major > major
+        }
+    } else {
+        unreachable!();
+    }
+}
+
+pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorId>> {
+    // We update this lazily.
+    (*MONITORS.lock()).take()
+}
+
+#[derive(Debug, Clone)]
+pub struct MonitorId {
+    /// The actual id
+    id: u32,
+    /// The name of the monitor
+    pub(crate) name: String,
+    /// The size of the monitor
+    dimensions: (u32, u32),
+    /// The position of the monitor in the X screen
+    position: (i32, i32),
+    /// If the monitor is the primary one
+    primary: bool,
+    /// The DPI scale factor
+    pub(crate) hidpi_factor: f64,
+    /// Used to determine which windows are on this monitor
+    pub(crate) rect: util::AaRect,
 }
 
 impl MonitorId {
+    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()) };
+        let rect = util::AaRect::new(position, dimensions);
+        MonitorId {
+            id,
+            name,
+            hidpi_factor,
+            dimensions,
+            position,
+            primary,
+            rect,
+        }
+    }
+
     pub fn get_name(&self) -> Option<String> {
-        let MonitorId(_, screen_num) = *self;
-        Some(format!("Monitor #{}", screen_num))
+        Some(self.name.clone())
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> NativeMonitorId {
-        NativeMonitorId::Numeric(self.1)
+    pub fn get_native_identifier(&self) -> u32 {
+        self.id as u32
     }
 
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        let screen = unsafe { (self.0.xlib.XScreenOfDisplay)(self.0.display, self.1 as i32) };
-        let width = unsafe { (self.0.xlib.XWidthOfScreen)(screen) };
-        let height = unsafe { (self.0.xlib.XHeightOfScreen)(screen) };
-        self.0.check_errors().expect("Failed to get monitor dimensions");
-        (width as u32, height as u32)
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.dimensions.into()
+    }
+
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.position.into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.hidpi_factor
+    }
+}
+
+impl XConnection {
+    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorId {
+        let monitors = self.get_available_monitors();
+        let default = monitors
+            .get(0)
+            .expect("[winit] Failed to find any monitors using XRandR.");
+
+        let window_rect = match window_rect {
+            Some(rect) => rect,
+            None => return default.to_owned(),
+        };
+
+        let mut largest_overlap = 0;
+        let mut matched_monitor = default;
+        for monitor in &monitors {
+            let overlapping_area = window_rect.get_overlapping_area(&monitor.rect);
+            if overlapping_area > largest_overlap {
+                largest_overlap = overlapping_area;
+                matched_monitor = &monitor;
+            }
+        }
+
+        matched_monitor.to_owned()
+    }
+
+    fn query_monitor_list(&self) -> Vec<MonitorId> {
+        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);
+            if resources.is_null() {
+                panic!("[winit] `XRRGetScreenResources` returned NULL. That should only happen if the root window doesn't exist.");
+            }
+
+            let mut available;
+            let mut has_primary = false;
+
+            if self.xrandr_1_5.is_some() && version_is_at_least(1, 5) && !FORCE_RANDR_COMPAT {
+                // We're in XRandR >= 1.5, enumerate monitors. This supports things like MST and
+                // 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);
+                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(
+                        self,
+                        resources,
+                        monitor_index as u32,
+                        monitor.into(),
+                        is_primary,
+                    ));
+                }
+                (xrandr_1_5.XRRFreeMonitors)(monitors);
+            } else {
+                // We're in XRandR < 1.5, enumerate CRTCs. Everything will work except MST and
+                // videowall setups will also show monitors that aren't in the logical groups the user
+                // cares about.
+                let primary = (self.xrandr.XRRGetOutputPrimary)(self.display, root);
+                available = Vec::with_capacity((*resources).ncrtc as usize);
+                for crtc_index in 0..(*resources).ncrtc {
+                    let crtc_id = *((*resources).crtcs.offset(crtc_index as isize));
+                    let crtc = (self.xrandr.XRRGetCrtcInfo)(self.display, resources, crtc_id);
+                    let is_active = (*crtc).width > 0 && (*crtc).height > 0 && (*crtc).noutput > 0;
+                    if is_active {
+                        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,
+                        ));
+                    }
+                    (self.xrandr.XRRFreeCrtcInfo)(crtc);
+                }
+            }
+
+            // If no monitors were detected as being primary, we just pick one ourselves!
+            if !has_primary {
+                if let Some(ref mut fallback) = available.first_mut() {
+                    // Setting this here will come in handy if we ever add an `is_primary` method.
+                    fallback.primary = true;
+                }
+            }
+
+            (self.xrandr.XRRFreeScreenResources)(resources);
+            available
+        }
+    }
+
+    pub fn get_available_monitors(&self) -> Vec<MonitorId> {
+        let mut monitors_lock = MONITORS.lock();
+        (*monitors_lock)
+            .as_ref()
+            .cloned()
+            .or_else(|| {
+                let monitors = Some(self.query_monitor_list());
+                if !DISABLE_MONITOR_LIST_CACHING {
+                    (*monitors_lock) = monitors.clone();
+                }
+                monitors
+            })
+            .unwrap()
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        self.get_available_monitors()
+            .into_iter()
+            .find(|monitor| monitor.primary)
+            .expect("[winit] Failed to find any monitors using XRandR.")
+    }
+
+    pub fn select_xrandr_input(&self, root: Window) -> Result<c_int, XError> {
+        {
+            let mut version_lock = XRANDR_VERSION.lock();
+            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,
+                    )
+                };
+                if has_extension != True {
+                    panic!("[winit] XRandR extension not available.");
+                }
+                *version_lock = Some((major, minor));
+            }
+        }
+
+        let mut event_offset = 0;
+        let mut error_offset = 0;
+        let status = unsafe {
+            (self.xrandr.XRRQueryExtension)(
+                self.display,
+                &mut event_offset,
+                &mut error_offset,
+            )
+        };
+
+        if status != True {
+            self.check_errors()?;
+            unreachable!("[winit] `XRRQueryExtension` failed but no error was received.");
+        }
+
+        let mask = RRCrtcChangeNotifyMask
+            | RROutputPropertyNotifyMask
+            | RRScreenChangeNotifyMask;
+        unsafe { (self.xrandr.XRRSelectInput)(self.display, root, mask) };
+
+        Ok(event_offset)
     }
 }

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

@@ -0,0 +1,72 @@
+use std::collections::HashMap;
+use std::ffi::{CStr, CString};
+use std::fmt::Debug;
+use std::os::raw::*;
+
+use parking_lot::Mutex;
+
+use super::*;
+
+type AtomCache = HashMap<CString, ffi::Atom>;
+
+lazy_static! {
+    static ref ATOM_CACHE: Mutex<AtomCache> = Mutex::new(HashMap::with_capacity(2048));
+}
+
+impl XConnection {
+    pub fn get_atom<T: AsRef<CStr> + Debug>(&self, name: T) -> ffi::Atom {
+        let name = name.as_ref();
+        let mut atom_cache_lock = ATOM_CACHE.lock();
+        let cached_atom = (*atom_cache_lock).get(name).cloned();
+        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,
+            ) };
+            if atom == 0 {
+                let msg = format!(
+                    "`XInternAtom` failed, which really shouldn't happen. Atom: {:?}, Error: {:#?}",
+                    name,
+                    self.check_errors(),
+                );
+                panic!(msg);
+            }
+            /*println!(
+                "XInternAtom name:{:?} atom:{:?}",
+                name,
+                atom,
+            );*/
+            (*atom_cache_lock).insert(name.to_owned(), atom);
+            atom
+        }
+    }
+
+    pub unsafe fn get_atom_unchecked(&self, name: &[u8]) -> ffi::Atom {
+        debug_assert!(CStr::from_bytes_with_nul(name).is_ok());
+        let name = CStr::from_bytes_with_nul_unchecked(name);
+        self.get_atom(name)
+    }
+
+    // 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> {
+        let mut atoms = Vec::with_capacity(names.len());
+        (self.xlib.XInternAtoms)(
+            self.display,
+            names.as_ptr() as *mut _,
+            names.len() as c_int,
+            ffi::False,
+            atoms.as_mut_ptr(),
+        );
+        self.check_errors()?;
+        atoms.set_len(names.len());
+        /*println!(
+            "XInternAtoms atoms:{:?}",
+            atoms,
+        );*/
+        Ok(atoms)
+    }
+}

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

@@ -0,0 +1,95 @@
+use super::*;
+
+pub type ClientMsgPayload = [c_long; 5];
+
+impl XConnection {
+    pub fn send_event<T: Into<ffi::XEvent>>(
+        &self,
+        target_window: c_ulong,
+        event_mask: Option<c_long>,
+        event: T,
+    ) -> Flusher {
+        let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
+        unsafe {
+            (self.xlib.XSendEvent)(
+                self.display,
+                target_window,
+                ffi::False,
+                event_mask,
+                &mut event.into(),
+            );
+        }
+        Flusher::new(self)
+    }
+
+    pub fn send_client_msg(
+        &self,
+        window: c_ulong,        // The window this is "about"; not necessarily this window
+        target_window: c_ulong, // The window we're sending to
+        message_type: ffi::Atom,
+        event_mask: Option<c_long>,
+        data: ClientMsgPayload,
+    ) -> Flusher {
+        let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
+        event.type_ = ffi::ClientMessage;
+        event.display = self.display;
+        event.window = window;
+        event.message_type = message_type;
+        event.format = c_long::FORMAT as c_int;
+        event.data = unsafe { mem::transmute(data) };
+        self.send_event(target_window, event_mask, event)
+    }
+
+    // Prepare yourself for the ultimate in unsafety!
+    // You should favor `send_client_msg` whenever possible, but some protocols (i.e. startup notification) require you
+    // to send more than one message worth of data.
+    pub fn send_client_msg_multi<T: Formattable>(
+        &self,
+        window: c_ulong,        // The window this is "about"; not necessarily this window
+        target_window: c_ulong, // The window we're sending to
+        message_type: ffi::Atom,
+        event_mask: Option<c_long>,
+        data: &[T],
+    ) -> Flusher {
+        let format = T::FORMAT;
+        let size_of_t = mem::size_of::<T>();
+        debug_assert_eq!(size_of_t, format.get_actual_size());
+        let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
+        event.type_ = ffi::ClientMessage;
+        event.display = self.display;
+        event.window = window;
+        event.message_type = message_type;
+        event.format = format as c_int;
+
+        let t_per_payload = format.get_payload_size() / size_of_t;
+        assert!(t_per_payload > 0);
+        let payload_count = data.len() / t_per_payload;
+        let payload_remainder = data.len() % t_per_payload;
+        let payload_ptr = data.as_ptr() as *const ClientMsgPayload;
+
+        let mut payload_index = 0;
+        while payload_index < payload_count {
+            let payload = unsafe { payload_ptr.offset(payload_index as isize) };
+            payload_index += 1;
+            event.data = unsafe { mem::transmute(*payload) };
+            self.send_event(target_window, event_mask, &event).queue();
+        }
+
+        if payload_remainder > 0 {
+            let mut payload: ClientMsgPayload = [0; 5];
+            let t_payload = payload.as_mut_ptr() as *mut T;
+            let invalid_payload = unsafe { payload_ptr.offset(payload_index as isize) };
+            let invalid_t_payload = invalid_payload as *const T;
+            let mut t_index = 0;
+            while t_index < payload_remainder {
+                let valid_t = unsafe { invalid_t_payload.offset(t_index as isize) };
+                unsafe { (*t_payload.offset(t_index as isize)) = (*valid_t).clone() };
+                t_index += 1;
+            }
+            event.data = unsafe { mem::transmute(payload) };
+            self.send_event(target_window, event_mask, &event).queue();
+        }
+
+        Flusher::new(self)
+    }
+}

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

@@ -0,0 +1,58 @@
+use std::fmt::Debug;
+use std::mem;
+use std::os::raw::*;
+
+// This isn't actually the number of the bits in the format.
+// X11 does a match on this value to determine which type to call sizeof on.
+// Thus, we use 32 for c_long, since 32 maps to c_long which maps to 64.
+// ...if that sounds confusing, then you know why this enum is here.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Format {
+    Char = 8,
+    Short = 16,
+    Long = 32,
+}
+
+impl Format {
+    pub fn from_format(format: usize) -> Option<Self> {
+        match format {
+            8 => Some(Format::Char),
+            16 => Some(Format::Short),
+            32 => Some(Format::Long),
+            _ => None,
+        }
+    }
+
+    pub fn is_same_size_as<T>(&self) -> bool {
+        mem::size_of::<T>() == self.get_actual_size()
+    }
+
+    pub fn get_actual_size(&self) -> usize {
+        match self {
+            &Format::Char => mem::size_of::<c_char>(),
+            &Format::Short => mem::size_of::<c_short>(),
+            &Format::Long => mem::size_of::<c_long>(),
+        }
+    }
+
+    pub fn get_payload_size(&self) -> usize {
+        match self {
+            // Due to the wonders of X11, half the space goes unused if you're not using longs (on 64-bit).
+            &Format::Char => mem::size_of::<c_char>() * 20,
+            &Format::Short => mem::size_of::<c_short>() * 10,
+            &Format::Long => mem::size_of::<c_long>() * 5,
+        }
+    }
+}
+
+pub trait Formattable: Debug + Clone + Copy + PartialEq + PartialOrd {
+    const FORMAT: Format;
+}
+
+// You might be surprised by the absence of c_int, but not as surprised as X11 would be by the presence of it.
+impl Formattable for c_schar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_uchar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_short { const FORMAT: Format = Format::Short; }
+impl Formattable for c_ushort { const FORMAT: Format = Format::Short; }
+impl Formattable for c_long { const FORMAT: Format = Format::Long; }
+impl Formattable for c_ulong { const FORMAT: Format = Format::Long; }

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

@@ -0,0 +1,387 @@
+use std::cmp;
+
+use super::*;
+use {LogicalPosition, LogicalSize};
+
+// Friendly neighborhood axis-aligned rectangle
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AaRect {
+    x: i64,
+    y: i64,
+    width: i64,
+    height: i64,
+}
+
+impl AaRect {
+    pub fn new((x, y): (i32, i32), (width, height): (u32, u32)) -> Self {
+        let (x, y) = (x as i64, y as i64);
+        let (width, height) = (width as i64, height as i64);
+        AaRect { x, y, width, height }
+    }
+
+    pub fn contains_point(&self, x: i64, y: i64) -> bool {
+        x >= self.x && x <= self.x + self.width && y >= self.y && y <= self.y + self.height
+    }
+
+    pub fn get_overlapping_area(&self, other: &Self) -> i64 {
+        let x_overlap = cmp::max(
+            0,
+            cmp::min(self.x + self.width, other.x + other.width) - cmp::max(self.x, other.x),
+        );
+        let y_overlap = cmp::max(
+            0,
+            cmp::min(self.y + self.height, other.y + other.height) - cmp::max(self.y, other.y),
+        );
+        x_overlap * y_overlap
+    }
+}
+
+#[derive(Debug)]
+pub struct TranslatedCoords {
+    pub x_rel_root: c_int,
+    pub y_rel_root: c_int,
+    pub child: ffi::Window,
+}
+
+#[derive(Debug)]
+pub struct Geometry {
+    pub root: ffi::Window,
+    // If you want positions relative to the root window, use translate_coords.
+    // Note that the overwhelming majority of window managers are reparenting WMs, thus the window
+    // ID we get from window creation is for a nested window used as the window's client area. If
+    // you call get_geometry with that window ID, then you'll get the position of that client area
+    // window relative to the parent it's nested in (the frame), which isn't helpful if you want
+    // to know the frame position.
+    pub x_rel_parent: c_int,
+    pub y_rel_parent: c_int,
+    // In that same case, this will give you client area size.
+    pub width: c_uint,
+    pub height: c_uint,
+    // xmonad and dwm were the only WMs tested that use the border return at all.
+    // The majority of WMs seem to simply fill it with 0 unconditionally.
+    pub border: c_uint,
+    pub depth: c_uint,
+}
+
+#[derive(Debug, Clone)]
+pub struct FrameExtents {
+    pub left: c_ulong,
+    pub right: c_ulong,
+    pub top: c_ulong,
+    pub bottom: c_ulong,
+}
+
+impl FrameExtents {
+    pub fn new(left: c_ulong, right: c_ulong, top: c_ulong, bottom: c_ulong) -> Self {
+        FrameExtents { left, right, top, bottom }
+    }
+
+    pub fn from_border(border: c_ulong) -> Self {
+        Self::new(border, border, border, border)
+    }
+
+    pub fn as_logical(&self, factor: f64) -> LogicalFrameExtents {
+        let logicalize = |value: c_ulong| value as f64 / factor;
+        LogicalFrameExtents {
+            left: logicalize(self.left),
+            right: logicalize(self.right),
+            top: logicalize(self.top),
+            bottom: logicalize(self.bottom),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct LogicalFrameExtents {
+    pub left: f64,
+    pub right: f64,
+    pub top: f64,
+    pub bottom: f64,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FrameExtentsHeuristicPath {
+    Supported,
+    UnsupportedNested,
+    UnsupportedBordered,
+}
+
+#[derive(Debug, Clone)]
+pub struct FrameExtentsHeuristic {
+    pub frame_extents: FrameExtents,
+    pub heuristic_path: FrameExtentsHeuristicPath,
+}
+
+impl FrameExtentsHeuristic {
+    pub fn inner_pos_to_outer(&self, x: i32, y: i32) -> (i32, i32) {
+        use self::FrameExtentsHeuristicPath::*;
+        if self.heuristic_path != UnsupportedBordered {
+            (x - self.frame_extents.left as i32, y - self.frame_extents.top as i32)
+        } else {
+            (x, y)
+        }
+    }
+
+    pub fn inner_pos_to_outer_logical(&self, mut logical: LogicalPosition, factor: f64) -> LogicalPosition {
+        use self::FrameExtentsHeuristicPath::*;
+        if self.heuristic_path != UnsupportedBordered {
+            let frame_extents = self.frame_extents.as_logical(factor);
+            logical.x -= frame_extents.left;
+            logical.y -= frame_extents.top;
+        }
+        logical
+    }
+
+    pub fn inner_size_to_outer(&self, width: u32, height: u32) -> (u32, u32) {
+        (
+            width.saturating_add(
+                self.frame_extents.left.saturating_add(self.frame_extents.right) as u32
+            ),
+            height.saturating_add(
+                self.frame_extents.top.saturating_add(self.frame_extents.bottom) as u32
+            ),
+        )
+    }
+
+    pub fn inner_size_to_outer_logical(&self, mut logical: LogicalSize, factor: f64) -> LogicalSize {
+        let frame_extents = self.frame_extents.as_logical(factor);
+        logical.width += frame_extents.left + frame_extents.right;
+        logical.height += frame_extents.top + frame_extents.bottom;
+        logical
+    }
+}
+
+impl XConnection {
+    // This is adequate for get_inner_position
+    pub fn translate_coords(&self, window: ffi::Window, root: ffi::Window) -> Result<TranslatedCoords, XError> {
+        let mut translated_coords: TranslatedCoords = unsafe { mem::uninitialized() };
+        unsafe {
+            (self.xlib.XTranslateCoordinates)(
+                self.display,
+                window,
+                root,
+                0,
+                0,
+                &mut translated_coords.x_rel_root,
+                &mut translated_coords.y_rel_root,
+                &mut translated_coords.child,
+            );
+        }
+        //println!("XTranslateCoordinates coords:{:?}", translated_coords);
+        self.check_errors().map(|_| translated_coords)
+    }
+
+    // This is adequate for get_inner_size
+    pub fn get_geometry(&self, window: ffi::Window) -> Result<Geometry, XError> {
+        let mut geometry: Geometry = unsafe { mem::uninitialized() };
+        let _status = unsafe {
+            (self.xlib.XGetGeometry)(
+                self.display,
+                window,
+                &mut geometry.root,
+                &mut geometry.x_rel_parent,
+                &mut geometry.y_rel_parent,
+                &mut geometry.width,
+                &mut geometry.height,
+                &mut geometry.border,
+                &mut geometry.depth,
+            )
+        };
+        //println!("XGetGeometry geo:{:?}", geometry);
+        self.check_errors().map(|_| geometry)
+    }
+
+    fn get_frame_extents(&self, window: ffi::Window) -> Option<FrameExtents> {
+        let extents_atom = unsafe { self.get_atom_unchecked(b"_NET_FRAME_EXTENTS\0") };
+
+        if !hint_is_supported(extents_atom) {
+            return None;
+        }
+
+        // Of the WMs tested, xmonad, i3, dwm, IceWM (1.3.x and earlier), and blackbox don't
+        // support this. As this is part of EWMH (Extended Window Manager Hints), it's likely to
+        // be unsupported by many smaller WMs.
+        let extents: Option<Vec<c_ulong>> = self.get_property(
+            window,
+            extents_atom,
+            ffi::XA_CARDINAL,
+        ).ok();
+
+        extents.and_then(|extents| {
+            if extents.len() >= 4 {
+                Some(FrameExtents {
+                    left: extents[0],
+                    right: extents[1],
+                    top: extents[2],
+                    bottom: extents[3],
+                })
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn is_top_level(&self, window: ffi::Window, root: ffi::Window) -> Option<bool> {
+        let client_list_atom = unsafe { self.get_atom_unchecked(b"_NET_CLIENT_LIST\0") };
+
+        if !hint_is_supported(client_list_atom) {
+            return None;
+        }
+
+        let client_list: Option<Vec<ffi::Window>> = self.get_property(
+            root,
+            client_list_atom,
+            ffi::XA_WINDOW,
+        ).ok();
+
+        client_list.map(|client_list| client_list.contains(&window))
+    }
+
+    fn get_parent_window(&self, window: ffi::Window) -> Result<ffi::Window, XError> {
+        let parent = unsafe {
+            let mut root: ffi::Window = mem::uninitialized();
+            let mut parent: ffi::Window = mem::uninitialized();
+            let mut children: *mut ffi::Window = ptr::null_mut();
+            let mut nchildren: c_uint = mem::uninitialized();
+
+            // What's filled into `parent` if `window` is the root window?
+            let _status = (self.xlib.XQueryTree)(
+                self.display,
+                window,
+                &mut root,
+                &mut parent,
+                &mut children,
+                &mut nchildren,
+            );
+
+            // The list of children isn't used
+            if children != ptr::null_mut() {
+                (self.xlib.XFree)(children as *mut _);
+            }
+
+            parent
+        };
+        self.check_errors().map(|_| parent)
+    }
+
+    fn climb_hierarchy(&self, window: ffi::Window, root: ffi::Window) -> Result<ffi::Window, XError> {
+        let mut outer_window = window;
+        loop {
+            let candidate = self.get_parent_window(outer_window)?;
+            if candidate == root {
+                break;
+            }
+            outer_window = candidate;
+        }
+        Ok(outer_window)
+    }
+
+    pub fn get_frame_extents_heuristic(&self, window: ffi::Window, root: ffi::Window) -> FrameExtentsHeuristic {
+        use self::FrameExtentsHeuristicPath::*;
+
+        // Position relative to root window.
+        // With rare exceptions, this is the position of a nested window. Cases where the window
+        // isn't nested are outlined in the comments throghout this function, but in addition to
+        // that, fullscreen windows often aren't nested.
+        let (inner_y_rel_root, child) = {
+            let coords = self.translate_coords(window, root).expect("Failed to translate window coordinates");
+            (
+                coords.y_rel_root,
+                coords.child,
+            )
+        };
+
+        let (width, height, border) = {
+            let inner_geometry = self.get_geometry(window).expect("Failed to get inner window geometry");
+            (
+                inner_geometry.width,
+                inner_geometry.height,
+                inner_geometry.border,
+            )
+        };
+
+        // The first condition is only false for un-nested windows, but isn't always false for
+        // un-nested windows. Mutter/Muffin/Budgie and Marco present a mysterious discrepancy:
+        // when y is on the range [0, 2] and if the window has been unfocused since being
+        // undecorated (or was undecorated upon construction), the first condition is true,
+        // requiring us to rely on the second condition.
+        let nested = !(window == child || self.is_top_level(child, root) == Some(true));
+
+        // Hopefully the WM supports EWMH, allowing us to get exact info on the window frames.
+        if let Some(mut frame_extents) = self.get_frame_extents(window) {
+            // Mutter/Muffin/Budgie and Marco preserve their decorated frame extents when
+            // decorations are disabled, but since the window becomes un-nested, it's easy to
+            // catch.
+            if !nested {
+                frame_extents = FrameExtents::new(0, 0, 0, 0);
+            }
+
+            // The difference between the nested window's position and the outermost window's
+            // position is equivalent to the frame size. In most scenarios, this is equivalent to
+            // manually climbing the hierarchy as is done in the case below. Here's a list of
+            // known discrepancies:
+            // * Mutter/Muffin/Budgie gives decorated windows a margin of 9px (only 7px on top) in
+            //   addition to a 1px semi-transparent border. The margin can be easily observed by
+            //   using a screenshot tool to get a screenshot of a selected window, and is
+            //   presumably used for drawing drop shadows. Getting window geometry information
+            //   via hierarchy-climbing results in this margin being included in both the
+            //   position and outer size, so a window positioned at (0, 0) would be reported as
+            //   having a position (-10, -8).
+            // * Compiz has a drop shadow margin just like Mutter/Muffin/Budgie, though it's 10px
+            //   on all sides, and there's no additional border.
+            // * Enlightenment otherwise gets a y position equivalent to inner_y_rel_root.
+            //   Without decorations, there's no difference. This is presumably related to
+            //   Enlightenment's fairly unique concept of window position; it interprets
+            //   positions given to XMoveWindow as a client area position rather than a position
+            //   of the overall window.
+
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: Supported,
+            }
+        } else if nested {
+            // If the position value we have is for a nested window used as the client area, we'll
+            // just climb up the hierarchy and get the geometry of the outermost window we're
+            // nested in.
+            let outer_window = self.climb_hierarchy(window, root).expect("Failed to climb window hierarchy");
+            let (outer_y, outer_width, outer_height) = {
+                let outer_geometry = self.get_geometry(outer_window).expect("Failed to get outer window geometry");
+                (
+                    outer_geometry.y_rel_parent,
+                    outer_geometry.width,
+                    outer_geometry.height,
+                )
+            };
+
+            // Since we have the geometry of the outermost window and the geometry of the client
+            // area, we can figure out what's in between.
+            let diff_x = outer_width.saturating_sub(width);
+            let diff_y = outer_height.saturating_sub(height);
+            let offset_y = inner_y_rel_root.saturating_sub(outer_y) as c_uint;
+
+            let left = diff_x / 2;
+            let right = left;
+            let top = offset_y;
+            let bottom = diff_y.saturating_sub(offset_y);
+
+            let frame_extents = FrameExtents::new(
+                left.into(),
+                right.into(),
+                top.into(),
+                bottom.into(),
+            );
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: UnsupportedNested,
+            }
+        } else {
+            // This is the case for xmonad and dwm, AKA the only WMs tested that supplied a
+            // border value. This is convenient, since we can use it to get an accurate frame.
+            let frame_extents = FrameExtents::from_border(border.into());
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: UnsupportedBordered,
+            }
+        }
+    }
+}

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

@@ -0,0 +1,211 @@
+use std::sync::Arc;
+
+use super::*;
+
+pub const MWM_HINTS_DECORATIONS: c_ulong = 2;
+
+#[derive(Debug)]
+pub enum StateOperation {
+    Remove = 0, // _NET_WM_STATE_REMOVE
+    Add = 1,    // _NET_WM_STATE_ADD
+    Toggle = 2, // _NET_WM_STATE_TOGGLE
+}
+
+impl From<bool> for StateOperation {
+    fn from(op: bool) -> Self {
+        if op {
+            StateOperation::Add
+        } else {
+            StateOperation::Remove
+        }
+    }
+}
+
+/// X window type. Maps directly to
+/// [`_NET_WM_WINDOW_TYPE`](https://specifications.freedesktop.org/wm-spec/1.3/ar01s05.html).
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum WindowType {
+    /// A desktop feature. This can include a single window containing desktop icons with the same dimensions as the
+    /// screen, allowing the desktop environment to have full control of the desktop, without the need for proxying
+    /// root window clicks.
+    Desktop,
+    /// A dock or panel feature. Typically a Window Manager would keep such windows on top of all other windows.
+    Dock,
+    /// Toolbar windows. "Torn off" from the main application.
+    Toolbar,
+    /// Pinnable menu windows. "Torn off" from the main application.
+    Menu,
+    /// A small persistent utility window, such as a palette or toolbox.
+    Utility,
+    /// The window is a splash screen displayed as an application is starting up.
+    Splash,
+    /// This is a dialog window.
+    Dialog,
+    /// This is a normal, top-level window.
+    Normal,
+}
+
+impl Default for WindowType {
+    fn default() -> Self {
+        WindowType::Normal
+    }
+}
+
+impl WindowType {
+    pub(crate) fn as_atom(&self, xconn: &Arc<XConnection>) -> ffi::Atom {
+        use self::WindowType::*;
+        let atom_name: &[u8] = match self {
+            &Desktop => b"_NET_WM_WINDOW_TYPE_DESKTOP\0",
+            &Dock => b"_NET_WM_WINDOW_TYPE_DOCK\0",
+            &Toolbar => b"_NET_WM_WINDOW_TYPE_TOOLBAR\0",
+            &Menu => b"_NET_WM_WINDOW_TYPE_MENU\0",
+            &Utility => b"_NET_WM_WINDOW_TYPE_UTILITY\0",
+            &Splash => b"_NET_WM_WINDOW_TYPE_SPLASH\0",
+            &Dialog => b"_NET_WM_WINDOW_TYPE_DIALOG\0",
+            &Normal => b"_NET_WM_WINDOW_TYPE_NORMAL\0",
+        };
+        unsafe { xconn.get_atom_unchecked(atom_name) }
+    }
+}
+
+pub struct NormalHints<'a> {
+    size_hints: XSmartPointer<'a, ffi::XSizeHints>,
+}
+
+impl<'a> NormalHints<'a> {
+    pub fn new(xconn: &'a XConnection) -> Self {
+        NormalHints { size_hints: xconn.alloc_size_hints() }
+    }
+
+    pub fn has_flag(&self, flag: c_long) -> bool {
+        has_flag(self.size_hints.flags, flag)
+    }
+
+    fn getter(&self, flag: c_long, field1: &c_int, field2: &c_int) -> Option<(u32, u32)> {
+        if self.has_flag(flag) {
+            Some((*field1 as _, *field2 as _))
+        } else {
+            None
+        }
+    }
+
+    pub fn get_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PSize, &self.size_hints.width, &self.size_hints.height)
+    }
+
+    // WARNING: This hint is obsolete
+    pub fn set_size(&mut self, size: Option<(u32, u32)>) {
+        if let Some((width, height)) = size {
+            self.size_hints.flags |= ffi::PSize;
+            self.size_hints.width = width as c_int;
+            self.size_hints.height = height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PSize;
+        }
+    }
+
+    pub fn get_max_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PMaxSize, &self.size_hints.max_width, &self.size_hints.max_height)
+    }
+
+    pub fn set_max_size(&mut self, max_size: Option<(u32, u32)>) {
+        if let Some((max_width, max_height)) = max_size {
+            self.size_hints.flags |= ffi::PMaxSize;
+            self.size_hints.max_width = max_width as c_int;
+            self.size_hints.max_height = max_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PMaxSize;
+        }
+    }
+
+    pub fn get_min_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PMinSize, &self.size_hints.min_width, &self.size_hints.min_height)
+    }
+
+    pub fn set_min_size(&mut self, min_size: Option<(u32, u32)>) {
+        if let Some((min_width, min_height)) = min_size {
+            self.size_hints.flags |= ffi::PMinSize;
+            self.size_hints.min_width = min_width as c_int;
+            self.size_hints.min_height = min_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PMinSize;
+        }
+    }
+
+    pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PResizeInc, &self.size_hints.width_inc, &self.size_hints.height_inc)
+    }
+
+    pub fn set_resize_increments(&mut self, resize_increments: Option<(u32, u32)>) {
+        if let Some((width_inc, height_inc)) = resize_increments {
+            self.size_hints.flags |= ffi::PResizeInc;
+            self.size_hints.width_inc = width_inc as c_int;
+            self.size_hints.height_inc = height_inc as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PResizeInc;
+        }
+    }
+
+    pub fn get_base_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PBaseSize, &self.size_hints.base_width, &self.size_hints.base_height)
+    }
+
+    pub fn set_base_size(&mut self, base_size: Option<(u32, u32)>) {
+        if let Some((base_width, base_height)) = base_size {
+            self.size_hints.flags |= ffi::PBaseSize;
+            self.size_hints.base_width = base_width as c_int;
+            self.size_hints.base_height = base_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PBaseSize;
+        }
+    }
+}
+
+impl XConnection {
+    pub fn get_wm_hints(&self, window: ffi::Window) -> Result<XSmartPointer<ffi::XWMHints>, XError> {
+        let wm_hints = unsafe { (self.xlib.XGetWMHints)(self.display, window) };
+        self.check_errors()?;
+        let wm_hints = if wm_hints.is_null() {
+            self.alloc_wm_hints()
+        } else {
+            XSmartPointer::new(self, wm_hints).unwrap()
+        };
+        Ok(wm_hints)
+    }
+
+    pub fn set_wm_hints(&self, window: ffi::Window, wm_hints: XSmartPointer<ffi::XWMHints>) -> Flusher {
+        unsafe {
+            (self.xlib.XSetWMHints)(
+                self.display,
+                window,
+                wm_hints.ptr,
+            );
+        }
+        Flusher::new(self)
+    }
+
+    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints, XError> {
+        let size_hints = self.alloc_size_hints();
+        let mut supplied_by_user: c_long = unsafe { mem::uninitialized() };
+        unsafe {
+            (self.xlib.XGetWMNormalHints)(
+                self.display,
+                window,
+                size_hints.ptr,
+                &mut supplied_by_user,
+            );
+        }
+        self.check_errors().map(|_| NormalHints { size_hints })
+    }
+
+    pub fn set_normal_hints(&self, window: ffi::Window, normal_hints: NormalHints) -> Flusher {
+        unsafe {
+            (self.xlib.XSetWMNormalHints)(
+                self.display,
+                window,
+                normal_hints.size_hints.ptr,
+            );
+        }
+        Flusher::new(self)
+    }
+}

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

@@ -0,0 +1,34 @@
+use {Icon, Pixel, PIXEL_SIZE};
+use super::*;
+
+impl Pixel {
+    pub fn to_packed_argb(&self) -> Cardinal {
+        let mut cardinal = 0;
+        assert!(CARDINAL_SIZE >= PIXEL_SIZE);
+        let as_bytes = &mut cardinal as *mut _ as *mut u8;
+        unsafe {
+            *as_bytes.offset(0) = self.b;
+            *as_bytes.offset(1) = self.g;
+            *as_bytes.offset(2) = self.r;
+            *as_bytes.offset(3) = self.a;
+        }
+        cardinal
+    }
+}
+
+impl Icon {
+    pub(crate) fn to_cardinals(&self) -> Vec<Cardinal> {
+        assert_eq!(self.rgba.len() % PIXEL_SIZE, 0);
+        let pixel_count = self.rgba.len() / PIXEL_SIZE;
+        assert_eq!(pixel_count, (self.width * self.height) as usize);
+        let mut data = Vec::with_capacity(pixel_count);
+        data.push(self.width as Cardinal);
+        data.push(self.height as Cardinal);
+        let pixels = self.rgba.as_ptr() as *const Pixel;
+        for pixel_index in 0..pixel_count {
+            let pixel = unsafe { &*pixels.offset(pixel_index as isize) };
+            data.push(pixel.to_packed_argb());
+        }
+        data
+    }
+}

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

@@ -0,0 +1,159 @@
+use std::str;
+
+use super::*;
+use events::ModifiersState;
+
+pub const VIRTUAL_CORE_POINTER: c_int = 2;
+pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
+
+// A base buffer size of 1kB uses a negligible amount of RAM while preventing us from having to
+// re-allocate (and make another round-trip) in the *vast* majority of cases.
+// To test if `lookup_utf8` works correctly, set this to 1.
+const TEXT_BUFFER_SIZE: usize = 1024;
+
+impl From<ffi::XIModifierState> for ModifiersState {
+    fn from(mods: ffi::XIModifierState) -> Self {
+        let state = mods.effective as c_uint;
+        ModifiersState {
+            alt: state & ffi::Mod1Mask != 0,
+            shift: state & ffi::ShiftMask != 0,
+            ctrl: state & ffi::ControlMask != 0,
+            logo: state & ffi::Mod4Mask != 0,
+        }
+    }
+}
+
+pub struct PointerState<'a> {
+    xconn: &'a XConnection,
+    root: ffi::Window,
+    child: ffi::Window,
+    pub root_x: c_double,
+    pub root_y: c_double,
+    win_x: c_double,
+    win_y: c_double,
+    buttons: ffi::XIButtonState,
+    modifiers: ffi::XIModifierState,
+    group: ffi::XIGroupState,
+    relative_to_window: bool,
+}
+
+impl<'a> PointerState<'a> {
+    pub fn get_modifier_state(&self) -> ModifiersState {
+        self.modifiers.into()
+    }
+}
+
+impl<'a> Drop for PointerState<'a> {
+    fn drop(&mut self) {
+        if !self.buttons.mask.is_null() {
+            unsafe {
+                // This is why you need to read the docs carefully...
+                (self.xconn.xlib.XFree)(self.buttons.mask as _);
+            }
+        }
+    }
+}
+
+impl XConnection {
+    pub fn select_xinput_events(&self, window: c_ulong, device_id: c_int, mask: i32) -> Flusher {
+        let mut event_mask = ffi::XIEventMask {
+            deviceid: device_id,
+            mask: &mask as *const _ as *mut c_uchar,
+            mask_len: mem::size_of_val(&mask) as c_int,
+        };
+        unsafe {
+            (self.xinput2.XISelectEvents)(
+                self.display,
+                window,
+                &mut event_mask as *mut ffi::XIEventMask,
+                1, // number of masks to read from pointer above
+            );
+        }
+        Flusher::new(self)
+    }
+
+    #[allow(dead_code)]
+    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher> {
+        let status = unsafe {
+            (self.xlib.XkbSelectEvents)(
+                self.display,
+                device_id,
+                mask,
+                mask,
+            )
+        };
+        if status == ffi::True {
+            Some(Flusher::new(self))
+        } else {
+            None
+        }
+    }
+
+    pub fn query_pointer(&self, window: ffi::Window, device_id: c_int) -> Result<PointerState, XError> {
+        unsafe {
+            let mut pointer_state: PointerState = mem::uninitialized();
+            pointer_state.xconn = self;
+            pointer_state.relative_to_window = (self.xinput2.XIQueryPointer)(
+                self.display,
+                device_id,
+                window,
+                &mut pointer_state.root,
+                &mut pointer_state.child,
+                &mut pointer_state.root_x,
+                &mut pointer_state.root_y,
+                &mut pointer_state.win_x,
+                &mut pointer_state.win_y,
+                &mut pointer_state.buttons,
+                &mut pointer_state.modifiers,
+                &mut pointer_state.group,
+            ) == ffi::True;
+            if let Err(err) = self.check_errors() {
+                // Running the destrutor would be bad news for us...
+                mem::forget(pointer_state);
+                Err(err)
+            } else {
+                Ok(pointer_state)
+            }
+        }
+    }
+
+    fn lookup_utf8_inner(
+        &self,
+        ic: ffi::XIC,
+        key_event: &mut ffi::XKeyEvent,
+        buffer: &mut [u8],
+    ) -> (ffi::KeySym, ffi::Status, c_int) {
+        let mut keysym: ffi::KeySym = 0;
+        let mut status: ffi::Status = 0;
+        let count = unsafe {
+            (self.xlib.Xutf8LookupString)(
+                ic,
+                key_event,
+                buffer.as_mut_ptr() as *mut c_char,
+                buffer.len() as c_int,
+                &mut keysym,
+                &mut status,
+            )
+        };
+        (keysym, status, count)
+    }
+
+    pub fn lookup_utf8(&self, ic: ffi::XIC, key_event: &mut ffi::XKeyEvent) -> String {
+        let mut buffer: [u8; TEXT_BUFFER_SIZE] = unsafe { mem::uninitialized() };
+        let (_, status, count) = self.lookup_utf8_inner(ic, key_event, &mut buffer);
+        // The buffer overflowed, so we'll make a new one on the heap.
+        if status == ffi::XBufferOverflow {
+            let mut buffer = Vec::with_capacity(count as usize);
+            unsafe { buffer.set_len(count as usize) };
+            let (_, _, new_count) = self.lookup_utf8_inner(ic, key_event, &mut buffer);
+            debug_assert_eq!(count, new_count);
+            str::from_utf8(&buffer[..count as usize])
+                .unwrap_or("")
+                .to_string()
+        } else {
+            str::from_utf8(&buffer[..count as usize])
+                .unwrap_or("")
+                .to_string()
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+use std::ops::{Deref, DerefMut};
+
+use super::*;
+
+pub struct XSmartPointer<'a, T> {
+    xconn: &'a XConnection,
+    pub ptr: *mut T,
+}
+
+impl<'a, T> XSmartPointer<'a, T> {
+    // You're responsible for only passing things to this that should be XFree'd.
+    // Returns None if ptr is null.
+    pub fn new(xconn: &'a XConnection, ptr: *mut T) -> Option<Self> {
+        if !ptr.is_null() {
+            Some(XSmartPointer {
+                xconn,
+                ptr,
+            })
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a, T> Deref for XSmartPointer<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.ptr }
+    }
+}
+
+impl<'a, T> DerefMut for XSmartPointer<'a, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.ptr }
+    }
+}
+
+impl<'a, T> Drop for XSmartPointer<'a, T> {
+    fn drop(&mut self) {
+        unsafe {
+            (self.xconn.xlib.XFree)(self.ptr as *mut _);
+        }
+    }
+}
+
+impl XConnection {
+    pub fn alloc_class_hint(&self) -> XSmartPointer<ffi::XClassHint> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocClassHint)() })
+            .expect("`XAllocClassHint` returned null; out of memory")
+    }
+
+    pub fn alloc_size_hints(&self) -> XSmartPointer<ffi::XSizeHints> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocSizeHints)() })
+            .expect("`XAllocSizeHints` returned null; out of memory")
+    }
+
+    pub fn alloc_wm_hints(&self) -> XSmartPointer<ffi::XWMHints> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocWMHints)() })
+            .expect("`XAllocWMHints` returned null; out of memory")
+    }
+}

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

@@ -0,0 +1,104 @@
+// Welcome to the util module, where we try to keep you from shooting yourself in the foot.
+// *results may vary
+
+mod atom;
+mod client_msg;
+mod format;
+mod geometry;
+mod hint;
+mod icon;
+mod input;
+mod memory;
+mod randr;
+mod window_property;
+mod wm;
+
+pub use self::atom::*;
+pub use self::client_msg::*;
+pub use self::format::*;
+pub use self::geometry::*;
+pub use self::hint::*;
+pub use self::icon::*;
+pub use self::input::*;
+pub use self::memory::*;
+pub use self::randr::*;
+pub use self::window_property::*;
+pub use self::wm::*;
+
+use std::mem;
+use std::ptr;
+use std::ops::BitAnd;
+use std::os::raw::*;
+
+use super::{ffi, XConnection, XError};
+
+pub fn reinterpret<'a, A, B>(a: &'a A) -> &'a B {
+    let b_ptr = a as *const _ as *const B;
+    unsafe { &*b_ptr }
+}
+
+pub fn maybe_change<T: PartialEq>(field: &mut Option<T>, value: T) -> bool {
+    let wrapped = Some(value);
+    if *field != wrapped {
+        *field = wrapped;
+        true
+    } else {
+        false
+    }
+}
+
+pub fn has_flag<T>(bitset: T, flag: T) -> bool
+where T:
+    Copy + PartialEq + BitAnd<T, Output = T>
+{
+    bitset & flag == flag
+}
+
+#[must_use = "This request was made asynchronously, and is still in the output buffer. You must explicitly choose to either `.flush()` (empty the output buffer, sending the request now) or `.queue()` (wait to send the request, allowing you to continue to add more requests without additional round-trips). For more information, see the documentation for `util::flush_requests`."]
+pub struct Flusher<'a> {
+    xconn: &'a XConnection,
+}
+
+impl<'a> Flusher<'a> {
+    pub fn new(xconn: &'a XConnection) -> Self {
+        Flusher { xconn }
+    }
+
+    // "I want this request sent now!"
+    pub fn flush(self) -> Result<(), XError> {
+        self.xconn.flush_requests()
+    }
+
+    // "I want the response now too!"
+    pub fn sync(self) -> Result<(), XError> {
+        self.xconn.sync_with_server()
+    }
+
+    // "I'm aware that this request hasn't been sent, and I'm okay with waiting."
+    pub fn queue(self) {}
+}
+
+impl XConnection {
+    // This is impoartant, so pay attention!
+    // Xlib has an output buffer, and tries to hide the async nature of X from you.
+    // This buffer contains the requests you make, and is flushed under various circumstances:
+    // 1. `XPending`, `XNextEvent`, and `XWindowEvent` flush "as needed"
+    // 2. `XFlush` explicitly flushes
+    // 3. `XSync` flushes and blocks until all requests are responded to
+    // 4. Calls that have a return dependent on a response (i.e. `XGetWindowProperty`) sync internally.
+    //    When in doubt, check the X11 source; if a function calls `_XReply`, it flushes and waits.
+    // All util functions that abstract an async function will return a `Flusher`.
+    pub fn flush_requests(&self) -> Result<(), XError> {
+        unsafe { (self.xlib.XFlush)(self.display) };
+        //println!("XFlush");
+        // This isn't necessarily a useful time to check for errors (since our request hasn't
+        // necessarily been processed yet)
+        self.check_errors()
+    }
+
+    pub fn sync_with_server(&self) -> Result<(), XError> {
+        unsafe { (self.xlib.XSync)(self.display, ffi::False) };
+        //println!("XSync");
+        self.check_errors()
+    }
+}

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

@@ -0,0 +1,100 @@
+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/linux/x11/util/window_property.rs

@@ -0,0 +1,144 @@
+use std;
+
+use super::*;
+
+pub type Cardinal = c_long;
+pub const CARDINAL_SIZE: usize = mem::size_of::<c_long>();
+
+#[derive(Debug, Clone)]
+pub enum GetPropertyError {
+    XError(XError),
+    TypeMismatch(ffi::Atom),
+    FormatMismatch(c_int),
+    NothingAllocated,
+}
+
+impl GetPropertyError {
+    pub fn is_actual_property_type(&self, t: ffi::Atom) -> bool {
+        if let GetPropertyError::TypeMismatch(actual_type) = *self {
+            actual_type == t
+        } else {
+            false
+        }
+    }
+}
+
+// Number of 32-bit chunks to retrieve per iteration of get_property's inner loop.
+// To test if `get_property` works correctly, set this to 1.
+const PROPERTY_BUFFER_SIZE: c_long = 1024; // 4k of RAM ought to be enough for anyone!
+
+#[derive(Debug)]
+pub enum PropMode {
+    Replace = ffi::PropModeReplace as isize,
+    Prepend = ffi::PropModePrepend as isize,
+    Append = ffi::PropModeAppend as isize,
+}
+
+impl XConnection {
+    pub fn get_property<T: Formattable>(
+        &self,
+        window: c_ulong,
+        property: ffi::Atom,
+        property_type: ffi::Atom,
+    ) -> Result<Vec<T>, GetPropertyError> {
+        let mut data = Vec::new();
+        let mut offset = 0;
+
+        let mut done = false;
+        while !done {
+            unsafe {
+                let mut actual_type: ffi::Atom = mem::uninitialized();
+                let mut actual_format: c_int = mem::uninitialized();
+                let mut quantity_returned: c_ulong = mem::uninitialized();
+                let mut bytes_after: c_ulong = mem::uninitialized();
+                let mut buf: *mut c_uchar = ptr::null_mut();
+                (self.xlib.XGetWindowProperty)(
+                    self.display,
+                    window,
+                    property,
+                    // This offset is in terms of 32-bit chunks.
+                    offset,
+                    // This is the quanity of 32-bit chunks to receive at once.
+                    PROPERTY_BUFFER_SIZE,
+                    ffi::False,
+                    property_type,
+                    &mut actual_type,
+                    &mut actual_format,
+                    // This is the quantity of items we retrieved in our format, NOT of 32-bit chunks!
+                    &mut quantity_returned,
+                    // ...and this is a quantity of bytes. So, this function deals in 3 different units.
+                    &mut bytes_after,
+                    &mut buf,
+                );
+
+                if let Err(e) = self.check_errors() {
+                    return Err(GetPropertyError::XError(e));
+                }
+
+                if actual_type != property_type {
+                    return Err(GetPropertyError::TypeMismatch(actual_type));
+                }
+
+                let format_mismatch = Format::from_format(actual_format as _) != Some(T::FORMAT);
+                if format_mismatch {
+                    return Err(GetPropertyError::FormatMismatch(actual_format));
+                }
+
+                if !buf.is_null() {
+                    offset += PROPERTY_BUFFER_SIZE;
+                    let new_data = std::slice::from_raw_parts(
+                        buf as *mut T,
+                        quantity_returned as usize,
+                    );
+                    /*println!(
+                        "XGetWindowProperty prop:{:?} fmt:{:02} len:{:02} off:{:02} out:{:02}, buf:{:?}",
+                        property,
+                        mem::size_of::<T>() * 8,
+                        data.len(),
+                        offset,
+                        quantity_returned,
+                        new_data,
+                    );*/
+                    data.extend_from_slice(&new_data);
+                    // Fun fact: XGetWindowProperty allocates one extra byte at the end.
+                    (self.xlib.XFree)(buf as _); // Don't try to access new_data after this.
+                } else {
+                    return Err(GetPropertyError::NothingAllocated);
+                }
+
+                done = bytes_after == 0;
+            }
+        }
+
+        Ok(data)
+    }
+
+    pub fn change_property<'a, T: Formattable>(
+        &'a self,
+        window: c_ulong,
+        property: ffi::Atom,
+        property_type: ffi::Atom,
+        mode: PropMode,
+        new_value: &[T],
+    ) -> Flusher<'a> {
+        debug_assert_eq!(mem::size_of::<T>(), T::FORMAT.get_actual_size());
+        unsafe {
+            (self.xlib.XChangeProperty)(
+                self.display,
+                window,
+                property,
+                property_type,
+                T::FORMAT as c_int,
+                mode as c_int,
+                new_value.as_ptr() as *const c_uchar,
+                new_value.len() as c_int,
+            );
+        }
+        /*println!(
+            "XChangeProperty prop:{:?} val:{:?}",
+            property,
+            new_value,
+        );*/
+        Flusher::new(self)
+    }
+}

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

@@ -0,0 +1,141 @@
+use parking_lot::Mutex;
+
+use super::*;
+
+// This info is global to the window manager.
+lazy_static! {
+    static ref SUPPORTED_HINTS: Mutex<Vec<ffi::Atom>> = Mutex::new(Vec::with_capacity(0));
+    static ref WM_NAME: Mutex<Option<String>> = Mutex::new(None);
+}
+
+pub fn hint_is_supported(hint: ffi::Atom) -> bool {
+    (*SUPPORTED_HINTS.lock()).contains(&hint)
+}
+
+pub fn wm_name_is_one_of(names: &[&str]) -> bool {
+    if let Some(ref name) = *WM_NAME.lock() {
+        names.contains(&name.as_str())
+    } else {
+        false
+    }
+}
+
+impl XConnection {
+    pub fn update_cached_wm_info(&self, root: ffi::Window) {
+        *SUPPORTED_HINTS.lock() = self.get_supported_hints(root);
+        *WM_NAME.lock() = self.get_wm_name(root);
+    }
+
+    fn get_supported_hints(&self, root: ffi::Window) -> Vec<ffi::Atom> {
+        let supported_atom = unsafe { self.get_atom_unchecked(b"_NET_SUPPORTED\0") };
+        self.get_property(
+            root,
+            supported_atom,
+            ffi::XA_ATOM,
+        ).unwrap_or_else(|_| Vec::with_capacity(0))
+    }
+
+    fn get_wm_name(&self, root: ffi::Window) -> Option<String> {
+        let check_atom = unsafe { self.get_atom_unchecked(b"_NET_SUPPORTING_WM_CHECK\0") };
+        let wm_name_atom = unsafe { self.get_atom_unchecked(b"_NET_WM_NAME\0") };
+
+        // Mutter/Muffin/Budgie doesn't have _NET_SUPPORTING_WM_CHECK in its _NET_SUPPORTED, despite
+        // it working and being supported. This has been reported upstream, but due to the
+        // inavailability of time machines, we'll just try to get _NET_SUPPORTING_WM_CHECK
+        // regardless of whether or not the WM claims to support it.
+        //
+        // Blackbox 0.70 also incorrectly reports not supporting this, though that appears to be fixed
+        // in 0.72.
+        /*if !supported_hints.contains(&check_atom) {
+            return None;
+        }*/
+
+        // IceWM (1.3.x and earlier) doesn't report supporting _NET_WM_NAME, but will nonetheless
+        // provide us with a value for it. Note that the unofficial 1.4 fork of IceWM works fine.
+        /*if !supported_hints.contains(&wm_name_atom) {
+            return None;
+        }*/
+
+        // Of the WMs tested, only xmonad and dwm fail to provide a WM name.
+
+        // Querying this property on the root window will give us the ID of a child window created by
+        // the WM.
+        let root_window_wm_check = {
+            let result = self.get_property(
+                root,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
+
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
+
+            if let Some(wm_check) = wm_check {
+                wm_check
+            } else {
+                return None;
+            }
+        };
+
+        // Querying the same property on the child window we were given, we should get this child
+        // window's ID again.
+        let child_window_wm_check = {
+            let result = self.get_property(
+                root_window_wm_check,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
+
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
+
+            if let Some(wm_check) = wm_check {
+                wm_check
+            } else {
+                return None;
+            }
+        };
+
+        // These values should be the same.
+        if root_window_wm_check != child_window_wm_check {
+            return None;
+        }
+
+        // All of that work gives us a window ID that we can get the WM name from.
+        let wm_name = {
+            let utf8_string_atom = unsafe { self.get_atom_unchecked(b"UTF8_STRING\0") };
+
+            let result = self.get_property(
+                root_window_wm_check,
+                wm_name_atom,
+                utf8_string_atom,
+            );
+
+            // IceWM requires this. IceWM was also the only WM tested that returns a null-terminated
+            // string. For more fun trivia, IceWM is also unique in including version and uname
+            // information in this string (this means you'll have to be careful if you want to match
+            // against it, though).
+            // The unofficial 1.4 fork of IceWM still includes the extra details, but properly
+            // returns a UTF8 string that isn't null-terminated.
+            let no_utf8 = if let Err(ref err) = result {
+                err.is_actual_property_type(ffi::XA_STRING)
+            } else {
+                false
+            };
+
+            if no_utf8 {
+                self.get_property(
+                    root_window_wm_check,
+                    wm_name_atom,
+                    ffi::XA_STRING,
+                )
+            } else {
+                result
+            }
+        }.ok();
+
+        wm_name.and_then(|wm_name| String::from_utf8(wm_name).ok())
+    }
+}

src/platform/linux/x11/xdisplay.rs

@@ -1,16 +1,19 @@
 use std::ptr;
 use std::fmt;
 use std::error::Error;
-use std::sync::Mutex;
 
 use libc;
+use parking_lot::Mutex;
 
 use super::ffi;
 
 /// A connection to an X server.
 pub struct XConnection {
     pub xlib: ffi::Xlib,
-    pub xf86vmode: ffi::Xf86vmode,
+    /// Exposes XRandR functions from version < 1.5
+    pub xrandr: ffi::Xrandr_2_2_0,
+    /// Exposes XRandR functions from version = 1.5
+    pub xrandr_1_5: Option<ffi::Xrandr>,
     pub xcursor: ffi::Xcursor,
     pub xinput2: ffi::XInput2,
     pub xlib_xcb: ffi::Xlib_xcb,
@@ -26,11 +29,12 @@ pub type XErrorHandler = Option<unsafe extern fn(*mut ffi::Display, *mut ffi::XE
 impl XConnection {
     pub fn new(error_handler: XErrorHandler) -> Result<XConnection, XNotSupported> {
         // opening the libraries
-        let xlib = try!(ffi::Xlib::open());
-        let xcursor = try!(ffi::Xcursor::open());
-        let xf86vmode = try!(ffi::Xf86vmode::open());
-        let xinput2 = try!(ffi::XInput2::open());
-        let xlib_xcb = try!(ffi::Xlib_xcb::open());
+        let xlib = ffi::Xlib::open()?;
+        let xcursor = ffi::Xcursor::open()?;
+        let xrandr = ffi::Xrandr_2_2_0::open()?;
+        let xrandr_1_5 = ffi::Xrandr::open().ok();
+        let xinput2 = ffi::XInput2::open()?;
+        let xlib_xcb = ffi::Xlib_xcb::open()?;
 
         unsafe { (xlib.XInitThreads)() };
         unsafe { (xlib.XSetErrorHandler)(error_handler) };
@@ -45,12 +49,13 @@ impl XConnection {
         };
 
         Ok(XConnection {
-            xlib: xlib,
-            xf86vmode: xf86vmode,
-            xcursor: xcursor,
-            xinput2: xinput2,
-            xlib_xcb: xlib_xcb,
-            display: display,
+            xlib,
+            xrandr,
+            xrandr_1_5,
+            xcursor,
+            xinput2,
+            xlib_xcb,
+            display,
             latest_error: Mutex::new(None),
         })
     }
@@ -58,8 +63,7 @@ impl XConnection {
     /// Checks whether an error has been triggered by the previous function calls.
     #[inline]
     pub fn check_errors(&self) -> Result<(), XError> {
-        let error = self.latest_error.lock().unwrap().take();
-
+        let error = self.latest_error.lock().take();
         if let Some(error) = error {
             Err(error)
         } else {
@@ -70,7 +74,13 @@ impl XConnection {
     /// Ignores any previous error.
     #[inline]
     pub fn ignore_error(&self) {
-        *self.latest_error.lock().unwrap() = None;
+        *self.latest_error.lock() = None;
+    }
+}
+
+impl fmt::Debug for XConnection {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.display.fmt(f)
     }
 }
 

src/platform/macos/events_loop.rs

@@ -1,16 +1,23 @@
+use {ControlFlow, EventsLoopClosed};
 use cocoa::{self, appkit, foundation};
-use cocoa::appkit::{NSApplication, NSEvent, NSView, NSWindow};
-use events::{self, ElementState, Event, MouseButton, TouchPhase, WindowEvent, ModifiersState};
-use super::window::Window;
+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 {
-    pub windows: std::sync::Mutex<Vec<std::sync::Weak<Window>>>,
-    pub pending_events: std::sync::Mutex<std::collections::VecDeque<Event>>,
-    modifiers: std::sync::Mutex<Modifiers>,
-    interrupted: std::sync::atomic::AtomicBool,
+    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
@@ -22,6 +29,9 @@ pub struct EventsLoop {
     user_callback: UserCallback,
 }
 
+#[derive(Clone)]
+pub struct Proxy {}
+
 struct Modifiers {
     shift_pressed: bool,
     ctrl_pressed: bool,
@@ -33,14 +43,76 @@ struct Modifiers {
 //
 // - ensure the callback pointer is never accidentally cloned
 // - ensure that only the `EventsLoop` can `store` and `drop` the callback pointer
-// - `unsafe impl Send` and `Sync` so that `Send` and `Sync` can be implemented for `EventsLoop`.
+// - Share access to the user callback with the NSWindow callbacks.
 pub struct UserCallback {
-    mutex: std::sync::Mutex<Option<*mut FnMut(Event)>>,
+    mutex: Mutex<Option<*mut FnMut(Event)>>,
 }
 
 
-unsafe impl Send for UserCallback {}
-unsafe impl Sync for UserCallback {}
+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 {
 
@@ -91,43 +163,41 @@ impl UserCallback {
 impl EventsLoop {
 
     pub fn new() -> Self {
-        let modifiers = Modifiers {
-            shift_pressed: false,
-            ctrl_pressed: false,
-            win_pressed: false,
-            alt_pressed: false,
-        };
+        // 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 {
-            windows: std::sync::Mutex::new(Vec::new()),
-            pending_events: std::sync::Mutex::new(std::collections::VecDeque::new()),
-            modifiers: std::sync::Mutex::new(modifiers),
-            interrupted: std::sync::atomic::AtomicBool::new(false),
-            user_callback: UserCallback { mutex: std::sync::Mutex::new(None) },
+            shared: Arc::new(Shared::new()),
+            modifiers: Modifiers::new(),
         }
     }
 
-    pub fn poll_events<F>(&self, mut callback: F)
+    pub fn poll_events<F>(&mut self, mut callback: F)
         where F: FnMut(Event),
     {
         unsafe {
-            if !msg_send![cocoa::base::class("NSThread"), isMainThread] {
+            if !msg_send![class!(NSThread), isMainThread] {
                 panic!("Events can only be polled from the main thread on macOS");
             }
         }
 
-        self.user_callback.store(&mut callback);
+        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.call_user_callback_with_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_(
-                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
+                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
                     foundation::NSDate::distantPast(cocoa::base::nil),
                     foundation::NSDefaultRunLoopMode,
                     cocoa::base::YES);
@@ -138,38 +208,48 @@ impl EventsLoop {
 
                 match event {
                     // Call the user's callback.
-                    Some(event) => self.user_callback.call_with_event(event),
+                    Some(event) => self.shared.user_callback.call_with_event(event),
                     None => break,
                 }
             }
         }
 
-        self.user_callback.drop();
+        self.shared.user_callback.drop();
     }
 
-    pub fn run_forever<F>(&self, mut callback: F)
-        where F: FnMut(Event)
+    pub fn run_forever<F>(&mut self, mut callback: F)
+        where F: FnMut(Event) -> ControlFlow
     {
-        self.interrupted.store(false, std::sync::atomic::Ordering::Relaxed);
-
         unsafe {
-            if !msg_send![cocoa::base::class("NSThread"), isMainThread] {
+            if !msg_send![class!(NSThread), isMainThread] {
                 panic!("Events can only be polled from the main thread on macOS");
             }
         }
 
-        self.user_callback.store(&mut callback);
+        // 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.call_user_callback_with_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_(
-                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
+                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
                     foundation::NSDate::distantFuture(cocoa::base::nil),
                     foundation::NSDefaultRunLoopMode,
                     cocoa::base::YES);
@@ -181,84 +261,19 @@ impl EventsLoop {
                 let _: () = msg_send![pool, release];
 
                 if let Some(event) = maybe_event {
-                    self.user_callback.call_with_event(event);
+                    self.shared.user_callback.call_with_event(event);
+                    if let ControlFlow::Break = control_flow.get() {
+                        break;
+                    }
                 }
             }
-
-            if self.interrupted.load(std::sync::atomic::Ordering::Relaxed) {
-                self.interrupted.store(false, std::sync::atomic::Ordering::Relaxed);
-                break;
-            }
         }
 
-        self.user_callback.drop();
-    }
-
-    pub fn interrupt(&self) {
-        self.interrupted.store(true, std::sync::atomic::Ordering::Relaxed);
-
-        // 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);
-        }
-    }
-
-    // Removes the window with the given `Id` from the `windows` list.
-    //
-    // This is called when a window is either `Closed` or `Drop`ped.
-    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 => true,
-            });
-        }
-    }
-
-    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);
-        }
+        self.shared.user_callback.drop();
     }
 
     // Convert some given `NSEvent` into a winit `Event`.
-    unsafe fn ns_event_to_event(&self, ns_event: cocoa::base::id) -> Option<Event> {
+    unsafe fn ns_event_to_event(&mut self, ns_event: cocoa::base::id) -> Option<Event> {
         if ns_event == cocoa::base::nil {
             return None;
         }
@@ -279,14 +294,11 @@ impl EventsLoop {
 
         // 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.
-        match event_type {
-            appkit::NSKeyDown => (),
-            _ => appkit::NSApp().sendEvent_(ns_event),
-        }
+        appkit::NSApp().sendEvent_(ns_event);
 
-        let windows = self.windows.lock().unwrap();
+        let windows = self.shared.windows.lock().unwrap();
         let maybe_window = windows.iter()
-            .filter_map(std::sync::Weak::upgrade)
+            .filter_map(Weak::upgrade)
             .find(|window| window_id == window.id());
 
         let into_event = |window_event| Event::WindowEvent {
@@ -296,126 +308,82 @@ impl EventsLoop {
 
         // Returns `Some` window if one of our windows is the key window.
         let maybe_key_window = || windows.iter()
-            .filter_map(std::sync::Weak::upgrade)
+            .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 {
-
-            appkit::NSKeyDown => {
-                let mut events = std::collections::VecDeque::new();
-                let received_c_str = foundation::NSString::UTF8String(ns_event.characters());
-                let received_str = std::ffi::CStr::from_ptr(received_c_str);
-                for received_char in std::str::from_utf8(received_str.to_bytes()).unwrap().chars() {
-                    let window_event = WindowEvent::ReceivedCharacter(received_char);
-                    events.push_back(into_event(window_event));
-                }
-
-                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
-                let state = ElementState::Pressed;
-                let code = NSEvent::keyCode(ns_event) as u8;
-                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
-                events.push_back(into_event(window_event));
-                let event = events.pop_front();
-                self.pending_events.lock().unwrap().extend(events.into_iter());
-                event
-            },
-
-            appkit::NSKeyUp => {
-                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
-
-                let state = ElementState::Released;
-                let code = NSEvent::keyCode(ns_event) as u8;
-                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
-                Some(into_event(window_event))
-            },
-
-            appkit::NSFlagsChanged => {
-                let mut modifiers = self.modifiers.lock().unwrap();
-
-                unsafe fn modifier_event(event: cocoa::base::id,
-                                         keymask: appkit::NSEventModifierFlags,
-                                         key: events::VirtualKeyCode,
-                                         key_pressed: bool) -> Option<WindowEvent>
-                {
-                    if !key_pressed && NSEvent::modifierFlags(event).contains(keymask) {
-                        let state = ElementState::Pressed;
-                        let code = NSEvent::keyCode(event) as u8;
-                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
-                        Some(window_event)
-
-                    } else if key_pressed && !NSEvent::modifierFlags(event).contains(keymask) {
-                        let state = ElementState::Released;
-                        let code = NSEvent::keyCode(event) as u8;
-                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
-                        Some(window_event)
-
-                    } else {
-                        None
+            // 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,
-                                                           appkit::NSShiftKeyMask,
-                                                           events::VirtualKeyCode::LShift,
-                                                           modifiers.shift_pressed)
-                {
-                    modifiers.shift_pressed = !modifiers.shift_pressed;
+
+                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,
-                                                           appkit::NSControlKeyMask,
-                                                           events::VirtualKeyCode::LControl,
-                                                           modifiers.ctrl_pressed)
-                {
-                    modifiers.ctrl_pressed = !modifiers.ctrl_pressed;
+                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,
-                                                           appkit::NSCommandKeyMask,
-                                                           events::VirtualKeyCode::LWin,
-                                                           modifiers.win_pressed)
-                {
-                    modifiers.win_pressed = !modifiers.win_pressed;
+                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,
-                                                           appkit::NSAlternateKeyMask,
-                                                           events::VirtualKeyCode::LAlt,
-                                                           modifiers.alt_pressed)
-                {
-                    modifiers.alt_pressed = !modifiers.alt_pressed;
+                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.pending_events.lock().unwrap().extend(events.into_iter());
+                self.shared.pending_events
+                    .lock()
+                    .unwrap()
+                    .extend(events.into_iter());
                 event
             },
 
-            appkit::NSLeftMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Left))) },
-            appkit::NSLeftMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Left))) },
-            appkit::NSRightMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Right))) },
-            appkit::NSRightMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Right))) },
-            appkit::NSOtherMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Middle))) },
-            appkit::NSOtherMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Middle))) },
-
-            appkit::NSMouseEntered => { Some(into_event(WindowEvent::MouseEntered)) },
-            appkit::NSMouseExited => { Some(into_event(WindowEvent::MouseLeft)) },
-
-            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`.
+            appkit::NSMouseEntered => {
                 let window = match maybe_window.or_else(maybe_key_window) {
                     Some(window) => window,
                     None => return None,
@@ -430,51 +398,114 @@ impl EventsLoop {
                 } else {
                     window.view.convertPoint_fromView_(window_point, cocoa::base::nil)
                 };
-                let view_rect = NSView::frame(*window.view);
-                let scale_factor = window.hidpi_factor();
 
-                let x = (scale_factor * view_point.x as f32) as i32;
-                let y = (scale_factor * (view_rect.size.height - view_point.y) as f32) as i32;
-                let window_event = WindowEvent::MouseMoved(x, y);
+                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 };
-                Some(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`.
-                let window = match maybe_window {
-                    Some(window) => window,
-                    None => return None,
-                };
+                if maybe_window.is_none() {
+                    return None;
+                }
 
                 use events::MouseScrollDelta::{LineDelta, PixelDelta};
-                let scale_factor = window.hidpi_factor();
                 let delta = if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
-                    PixelDelta(scale_factor * ns_event.scrollingDeltaX() as f32,
-                               scale_factor * ns_event.scrollingDeltaY() as f32)
+                    PixelDelta((
+                        ns_event.scrollingDeltaX() as f64,
+                        ns_event.scrollingDeltaY() as f64,
+                    ).into())
                 } else {
-                    LineDelta(scale_factor * ns_event.scrollingDeltaX() as f32,
-                              scale_factor * ns_event.scrollingDeltaY() as f32)
+                    // TODO: This is probably wrong
+                    LineDelta(
+                        ns_event.scrollingDeltaX() as f32,
+                        ns_event.scrollingDeltaY() as f32,
+                    )
                 };
                 let phase = match ns_event.phase() {
-                    appkit::NSEventPhaseMayBegin | appkit::NSEventPhaseBegan => TouchPhase::Started,
-                    appkit::NSEventPhaseEnded => TouchPhase::Ended,
+                    NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => TouchPhase::Started,
+                    NSEventPhase::NSEventPhaseEnded => TouchPhase::Ended,
                     _ => TouchPhase::Moved,
                 };
-                let window_event = WindowEvent::MouseWheel(delta, phase);
+                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(pressure, 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(into_event(WindowEvent::Awakened))
+                    Some(Event::Awakened)
                 },
                 _ => None,
             },
@@ -483,10 +514,37 @@ impl EventsLoop {
         }
     }
 
+    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(())
+    }
+}
 
-fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
+pub fn to_virtual_key_code(code: c_ushort) -> Option<events::VirtualKeyCode> {
     Some(match code {
         0x00 => events::VirtualKeyCode::A,
         0x01 => events::VirtualKeyCode::S,
@@ -542,14 +600,14 @@ fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
         0x33 => events::VirtualKeyCode::Back,
         //0x34 => unkown,
         0x35 => events::VirtualKeyCode::Escape,
-        0x36 => events::VirtualKeyCode::RWin,
-        0x37 => events::VirtualKeyCode::LWin,
+        0x36 => events::VirtualKeyCode::LWin,
+        0x37 => events::VirtualKeyCode::RWin,
         0x38 => events::VirtualKeyCode::LShift,
         //0x39 => Caps lock,
-        //0x3a => Left alt,
+        0x3a => events::VirtualKeyCode::LAlt,
         0x3b => events::VirtualKeyCode::LControl,
         0x3c => events::VirtualKeyCode::RShift,
-        //0x3d => Right alt,
+        0x3d => events::VirtualKeyCode::RAlt,
         0x3e => events::VirtualKeyCode::RControl,
         //0x3f => Fn key,
         //0x40 => F17 Key,
@@ -617,18 +675,51 @@ fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
         0x7e => events::VirtualKeyCode::Up,
         //0x7f =>  unkown,
 
+        0xa => events::VirtualKeyCode::Caret,
         _ => return None,
     })
 }
 
-fn event_mods(event: cocoa::base::id) -> ModifiersState {
+pub fn event_mods(event: cocoa::base::id) -> ModifiersState {
     let flags = unsafe {
         NSEvent::modifierFlags(event)
     };
     ModifiersState {
-        shift: flags.contains(appkit::NSShiftKeyMask),
-        ctrl: flags.contains(appkit::NSControlKeyMask),
-        alt: flags.contains(appkit::NSAlternateKeyMask),
-        logo: flags.contains(appkit::NSCommandKeyMask),
+        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/ffi.rs

@@ -0,0 +1,107 @@
+// TODO: Upstream these
+
+#![allow(dead_code, non_snake_case, non_upper_case_globals)]
+
+use cocoa::base::id;
+use cocoa::foundation::{NSInteger, NSUInteger};
+use objc;
+
+pub const NSNotFound: NSInteger = NSInteger::max_value();
+
+#[repr(C)]
+pub struct NSRange {
+    pub location: NSUInteger,
+    pub length: NSUInteger,
+}
+
+impl NSRange {
+    #[inline]
+    pub fn new(location: NSUInteger, length: NSUInteger) -> NSRange {
+        NSRange { location, length }
+    }
+}
+
+unsafe impl objc::Encode for NSRange {
+    fn encode() -> objc::Encoding {
+        let encoding = format!(
+            // TODO: Verify that this is correct
+            "{{NSRange={}{}}}",
+            NSUInteger::encode().as_str(),
+            NSUInteger::encode().as_str(),
+        );
+        unsafe { objc::Encoding::from_str(&encoding) }
+    }
+}
+
+pub trait NSMutableAttributedString: Sized {
+    unsafe fn alloc(_: Self) -> id {
+        msg_send![class!(NSMutableAttributedString), alloc]
+    }
+
+    unsafe fn init(self) -> id; // *mut NSMutableAttributedString
+    unsafe fn initWithString(self, string: id) -> id;
+    unsafe fn initWithAttributedString(self, string: id) -> id;
+
+    unsafe fn string(self) -> id; // *mut NSString
+    unsafe fn mutableString(self) -> id; // *mut NSMutableString
+    unsafe fn length(self) -> NSUInteger;
+}
+
+impl NSMutableAttributedString for id {
+    unsafe fn init(self) -> id {
+        msg_send![self, init]
+    }
+
+    unsafe fn initWithString(self, string: id) -> id {
+        msg_send![self, initWithString:string]
+    }
+
+    unsafe fn initWithAttributedString(self, string: id) -> id {
+        msg_send![self, initWithAttributedString:string]
+    }
+
+    unsafe fn string(self) -> id {
+        msg_send![self, string]
+    }
+
+    unsafe fn mutableString(self) -> id {
+        msg_send![self, mutableString]
+    }
+
+    unsafe fn length(self) -> NSUInteger {
+        msg_send![self, length]
+    }
+}
+
+pub const kCGBaseWindowLevelKey: NSInteger = 0;
+pub const kCGMinimumWindowLevelKey: NSInteger = 1;
+pub const kCGDesktopWindowLevelKey: NSInteger = 2;
+pub const kCGBackstopMenuLevelKey: NSInteger = 3;
+pub const kCGNormalWindowLevelKey: NSInteger = 4;
+pub const kCGFloatingWindowLevelKey: NSInteger = 5;
+pub const kCGTornOffMenuWindowLevelKey: NSInteger = 6;
+pub const kCGDockWindowLevelKey: NSInteger = 7;
+pub const kCGMainMenuWindowLevelKey: NSInteger = 8;
+pub const kCGStatusWindowLevelKey: NSInteger = 9;
+pub const kCGModalPanelWindowLevelKey: NSInteger = 10;
+pub const kCGPopUpMenuWindowLevelKey: NSInteger = 11;
+pub const kCGDraggingWindowLevelKey: NSInteger = 12;
+pub const kCGScreenSaverWindowLevelKey: NSInteger = 13;
+pub const kCGMaximumWindowLevelKey: NSInteger = 14;
+pub const kCGOverlayWindowLevelKey: NSInteger = 15;
+pub const kCGHelpWindowLevelKey: NSInteger = 16;
+pub const kCGUtilityWindowLevelKey: NSInteger = 17;
+pub const kCGDesktopIconWindowLevelKey: NSInteger = 18;
+pub const kCGCursorWindowLevelKey: NSInteger = 19;
+pub const kCGNumberOfWindowLevelKeys: NSInteger = 20;
+
+pub enum NSWindowLevel {
+    NSNormalWindowLevel = kCGBaseWindowLevelKey as _,
+    NSFloatingWindowLevel = kCGFloatingWindowLevelKey as _,
+    NSTornOffMenuWindowLevel = kCGTornOffMenuWindowLevelKey as _,
+    NSModalPanelWindowLevel = kCGModalPanelWindowLevelKey as _,
+    NSMainMenuWindowLevel = kCGMainMenuWindowLevelKey as _,
+    NSStatusWindowLevel = kCGStatusWindowLevelKey as _,
+    NSPopUpMenuWindowLevel = kCGPopUpMenuWindowLevelKey as _,
+    NSScreenSaverWindowLevel = kCGScreenSaverWindowLevelKey as _,
+}

src/platform/macos/mod.rs

@@ -1,38 +1,45 @@
 #![cfg(target_os = "macos")]
 
-pub use self::events_loop::EventsLoop;
-pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
-pub use self::window::{Id as WindowId, PlatformSpecificWindowBuilderAttributes, Window};
+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 Window2 {
-    pub window: ::std::sync::Arc<Window>,
+pub struct Window {
+    pub window: Arc<Window2>,
 }
 
-impl ::std::ops::Deref for Window2 {
-    type Target = Window;
+impl ::std::ops::Deref for Window {
+    type Target = Window2;
     #[inline]
-    fn deref(&self) -> &Window {
+    fn deref(&self) -> &Window2 {
         &*self.window
     }
 }
 
-impl Window2 {
+impl Window {
 
-    pub fn new(events_loop: ::std::sync::Arc<EventsLoop>,
-               attributes: &::WindowAttributes,
-               pl_attribs: &PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
+    pub fn new(events_loop: &EventsLoop,
+               attributes: ::WindowAttributes,
+               pl_attribs: PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
     {
-        let weak_events_loop = ::std::sync::Arc::downgrade(&events_loop);
-        let window = ::std::sync::Arc::new(try!(Window::new(weak_events_loop, attributes, pl_attribs)));
-        let weak_window = ::std::sync::Arc::downgrade(&window);
-        events_loop.windows.lock().unwrap().push(weak_window);
-        Ok(Window2 { window: window })
+        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,50 +1,147 @@
-use core_graphics::display;
 use std::collections::VecDeque;
-use native_monitor::NativeMonitorId;
+use std::fmt;
 
-#[derive(Clone)]
-pub struct MonitorId(u32);
+use cocoa::appkit::NSScreen;
+use cocoa::base::{id, nil};
+use cocoa::foundation::{NSString, NSUInteger};
+use core_graphics::display::{CGDirectDisplayID, CGDisplay, CGDisplayBounds};
 
-pub fn get_available_monitors() -> VecDeque<MonitorId> {
-    let mut monitors = VecDeque::new();
-    unsafe {
-        let max_displays = 10u32;
-        let mut active_displays = [0u32; 10];
-        let mut display_count = 0;
-        display::CGGetActiveDisplayList(max_displays, &mut active_displays[0], &mut display_count);
-        for i in 0..display_count as usize {
-            monitors.push_back(MonitorId(active_displays[i]));
+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)
     }
-    monitors
 }
 
-#[inline]
 pub fn get_primary_monitor() -> MonitorId {
-    let id = unsafe { MonitorId(display::CGMainDisplayID()) };
+    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 = unsafe { display::CGDisplayModelNumber(display_id) };
+        let screen_num = CGDisplay::new(display_id).model_number();
         Some(format!("Monitor #{}", screen_num))
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> NativeMonitorId {
-        let MonitorId(display_id) = *self;
-        NativeMonitorId::Numeric(display_id)
+    pub fn get_native_identifier(&self) -> u32 {
+        self.0
     }
 
-    pub fn get_dimensions(&self) -> (u32, u32) {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         let MonitorId(display_id) = *self;
-        let dimension = unsafe {
-            let height = display::CGDisplayPixelsHigh(display_id);
-            let width = display::CGDisplayPixelsWide(display_id);
-            (width as u32, height as u32)
+        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
         };
-        dimension
+        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

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

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

@@ -3,7 +3,7 @@ pub use self::platform::*;
 #[cfg(target_os = "windows")]
 #[path="windows/mod.rs"]
 mod platform;
-#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#[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")]
@@ -15,8 +15,12 @@ mod platform;
 #[cfg(target_os = "ios")]
 #[path="ios/mod.rs"]
 mod platform;
+#[cfg(target_os = "emscripten")]
+#[path="emscripten/mod.rs"]
+mod platform;
 
 #[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 = "openbsd")))]
-use this_platform_is_not_supported;
+  not(target_os = "freebsd"), not(target_os = "netbsd"), not(target_os = "openbsd"),
+  not(target_os = "emscripten")))]
+compile_error!("The platform you're compiling for is not supported by winit");

src/platform/windows/callback.rs

@@ -1,407 +0,0 @@
-use std::mem;
-use std::ptr;
-use std::cell::RefCell;
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
-use std::ffi::OsString;
-use std::os::windows::ffi::OsStringExt;
-
-use CursorState;
-use WindowEvent as Event;
-use events::ModifiersState;
-use super::event;
-use super::WindowState;
-
-use user32;
-use shell32;
-use winapi;
-
-/// There's no parameters passed to the callback function, so it needs to get
-/// its context (the HWND, the Sender for events, etc.) stashed in
-/// a thread-local variable.
-thread_local!(pub static CONTEXT_STASH: RefCell<Option<ThreadLocalData>> = RefCell::new(None));
-
-pub struct ThreadLocalData {
-    pub win: winapi::HWND,
-    pub sender: Sender<Event>,
-    pub window_state: Arc<Mutex<WindowState>>,
-    pub mouse_in_window: bool
-}
-
-/// Equivalent to the windows api [MINMAXINFO](https://msdn.microsoft.com/en-us/library/windows/desktop/ms632605%28v=vs.85%29.aspx)
-/// struct. Used because winapi-rs doesn't have this declared.
-#[repr(C)]
-#[allow(dead_code)]
-struct MinMaxInfo {
-    reserved: winapi::POINT, // Do not use/change
-    max_size: winapi::POINT,
-    max_position: winapi::POINT,
-    min_track: winapi::POINT,
-    max_track: winapi::POINT
-}
-
-/// Checks that the window is the good one, and if so send the event to it.
-fn send_event(input_window: winapi::HWND, event: Event) {
-    CONTEXT_STASH.with(|context_stash| {
-        let context_stash = context_stash.borrow();
-        let stored = match *context_stash {
-            None => return,
-            Some(ref v) => v
-        };
-
-        let &ThreadLocalData { ref win, ref sender, .. } = stored;
-
-        if win != &input_window {
-            return;
-        }
-
-        sender.send(event).ok();  // ignoring if closed
-    });
-}
-
-/// This is the callback that is called by `DispatchMessage` in the events loop.
-///
-/// Returning 0 tells the Win32 API that the message has been processed.
-// FIXME: detect WM_DWMCOMPOSITIONCHANGED and call DwmEnableBlurBehindWindow if necessary
-pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
-                                       wparam: winapi::WPARAM, lparam: winapi::LPARAM)
-                                       -> winapi::LRESULT
-{
-    match msg {
-        winapi::WM_DESTROY => {
-            use events::WindowEvent::Closed;
-
-            CONTEXT_STASH.with(|context_stash| {
-                let context_stash = context_stash.borrow();
-                let stored = match *context_stash {
-                    None => return,
-                    Some(ref v) => v
-                };
-
-                let &ThreadLocalData { ref win, .. } = stored;
-
-                if win == &window {
-                    user32::PostQuitMessage(0);
-                }
-            });
-
-            send_event(window, Closed);
-            0
-        },
-
-        winapi::WM_ERASEBKGND => {
-            1
-        },
-
-        winapi::WM_SIZE => {
-            use events::WindowEvent::Resized;
-            let w = winapi::LOWORD(lparam as winapi::DWORD) as u32;
-            let h = winapi::HIWORD(lparam as winapi::DWORD) as u32;
-            send_event(window, Resized(w, h));
-            0
-        },
-
-        winapi::WM_MOVE => {
-            use events::WindowEvent::Moved;
-            let x = winapi::LOWORD(lparam as winapi::DWORD) as i32;
-            let y = winapi::HIWORD(lparam as winapi::DWORD) as i32;
-            send_event(window, Moved(x, y));
-            0
-        },
-
-        winapi::WM_CHAR => {
-            use std::mem;
-            use events::WindowEvent::ReceivedCharacter;
-            let chr: char = mem::transmute(wparam as u32);
-            send_event(window, ReceivedCharacter(chr));
-            0
-        },
-
-        // Prevents default windows menu hotkeys playing unwanted
-        // "ding" sounds. Alternatively could check for WM_SYSCOMMAND
-        // with wparam being SC_KEYMENU, but this may prevent some
-        // other unwanted default hotkeys as well.
-        winapi::WM_SYSCHAR => {
-            0
-        }
-
-        winapi::WM_MOUSEMOVE => {
-            use events::WindowEvent::{MouseEntered, MouseMoved};
-            let mouse_outside_window = CONTEXT_STASH.with(|context_stash| {
-                let mut context_stash = context_stash.borrow_mut();
-                if let Some(context_stash) = context_stash.as_mut() {
-                    if !context_stash.mouse_in_window {
-                        context_stash.mouse_in_window = true;
-                        return true;
-                    }
-                }
-
-                false
-            });
-
-            if mouse_outside_window {
-                send_event(window, MouseEntered);
-                
-                // Calling TrackMouseEvent in order to receive mouse leave events.
-                user32::TrackMouseEvent(&mut winapi::TRACKMOUSEEVENT {
-                    cbSize: mem::size_of::<winapi::TRACKMOUSEEVENT>() as winapi::DWORD,
-                    dwFlags: winapi::TME_LEAVE,
-                    hwndTrack: window,
-                    dwHoverTime: winapi::HOVER_DEFAULT,
-                });
-            }
-
-            let x = winapi::GET_X_LPARAM(lparam) as i32;
-            let y = winapi::GET_Y_LPARAM(lparam) as i32;
-
-            send_event(window, MouseMoved(x, y));
-
-            0
-        },
-
-        winapi::WM_MOUSELEAVE => {
-            use events::WindowEvent::MouseLeft;
-            let mouse_in_window = CONTEXT_STASH.with(|context_stash| {
-                let mut context_stash = context_stash.borrow_mut();
-                if let Some(context_stash) = context_stash.as_mut() {
-                    if context_stash.mouse_in_window {
-                        context_stash.mouse_in_window = false;
-                        return true;
-                    }
-                }
-
-                false
-            });
-
-            if mouse_in_window {
-                send_event(window, MouseLeft);
-            }
-
-            0
-        },
-
-        winapi::WM_MOUSEWHEEL => {
-            use events::WindowEvent::MouseWheel;
-            use events::MouseScrollDelta::LineDelta;
-            use events::TouchPhase;
-
-            let value = (wparam >> 16) as i16;
-            let value = value as i32;
-            let value = value as f32 / winapi::WHEEL_DELTA as f32;
-
-            send_event(window, MouseWheel(LineDelta(0.0, value), TouchPhase::Moved));
-
-            0
-        },
-
-        winapi::WM_KEYDOWN | winapi::WM_SYSKEYDOWN => {
-            use events::WindowEvent::KeyboardInput;
-            use events::ElementState::Pressed;
-            if msg == winapi::WM_SYSKEYDOWN && wparam as i32 == winapi::VK_F4 {
-                user32::DefWindowProcW(window, msg, wparam, lparam)
-            } else {
-                let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
-                send_event(window, KeyboardInput(Pressed, scancode, vkey, event::get_key_mods()));
-                0
-            }
-        },
-
-        winapi::WM_KEYUP | winapi::WM_SYSKEYUP => {
-            use events::WindowEvent::KeyboardInput;
-            use events::ElementState::Released;
-            let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
-            send_event(window, KeyboardInput(Released, scancode, vkey, event::get_key_mods()));
-            0
-        },
-
-        winapi::WM_LBUTTONDOWN => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Left;
-            use events::ElementState::Pressed;
-            send_event(window, MouseInput(Pressed, Left));
-            0
-        },
-
-        winapi::WM_LBUTTONUP => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Left;
-            use events::ElementState::Released;
-            send_event(window, MouseInput(Released, Left));
-            0
-        },
-
-        winapi::WM_RBUTTONDOWN => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Right;
-            use events::ElementState::Pressed;
-            send_event(window, MouseInput(Pressed, Right));
-            0
-        },
-
-        winapi::WM_RBUTTONUP => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Right;
-            use events::ElementState::Released;
-            send_event(window, MouseInput(Released, Right));
-            0
-        },
-
-        winapi::WM_MBUTTONDOWN => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Middle;
-            use events::ElementState::Pressed;
-            send_event(window, MouseInput(Pressed, Middle));
-            0
-        },
-
-        winapi::WM_MBUTTONUP => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Middle;
-            use events::ElementState::Released;
-            send_event(window, MouseInput(Released, Middle));
-            0
-        },
-
-        winapi::WM_XBUTTONDOWN => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Other;
-            use events::ElementState::Pressed;
-            let xbutton = winapi::HIWORD(wparam as winapi::DWORD) as winapi::c_int; // waiting on PR for winapi to add GET_XBUTTON_WPARAM
-            send_event(window, MouseInput(Pressed, Other(xbutton as u8)));
-            0
-        },
-
-        winapi::WM_XBUTTONUP => {
-            use events::WindowEvent::MouseInput;
-            use events::MouseButton::Other;
-            use events::ElementState::Released;
-            let xbutton = winapi::HIWORD(wparam as winapi::DWORD) as winapi::c_int; 
-            send_event(window, MouseInput(Released, Other(xbutton as u8)));
-            0
-        },
-
-        winapi::WM_INPUT => {
-            let mut data: winapi::RAWINPUT = mem::uninitialized();
-            let mut data_size = mem::size_of::<winapi::RAWINPUT>() as winapi::UINT;
-            user32::GetRawInputData(mem::transmute(lparam), winapi::RID_INPUT,
-                                    mem::transmute(&mut data), &mut data_size,
-                                    mem::size_of::<winapi::RAWINPUTHEADER>() as winapi::UINT);
-
-            if data.header.dwType == winapi::RIM_TYPEMOUSE {
-                let _x = data.mouse.lLastX;  // FIXME: this is not always the relative movement
-                let _y = data.mouse.lLastY;
-                // TODO:
-                //send_event(window, Event::MouseRawMovement { x: x, y: y });
-
-                0
-
-            } else {
-                user32::DefWindowProcW(window, msg, wparam, lparam)
-            }
-        },
-
-        winapi::WM_SETFOCUS => {
-            use events::WindowEvent::Focused;
-            send_event(window, Focused(true));
-            0
-        },
-
-        winapi::WM_KILLFOCUS => {
-            use events::WindowEvent::Focused;
-            send_event(window, Focused(false));
-            0
-        },
-
-        winapi::WM_SETCURSOR => {
-            let call_def_window_proc = CONTEXT_STASH.with(|context_stash| {
-                let cstash = context_stash.borrow();
-                let mut call_def_window_proc = false;
-                if let Some(cstash) = cstash.as_ref() {
-                    if let Ok(window_state) = cstash.window_state.lock() {
-                        if cstash.mouse_in_window {
-                            match window_state.cursor_state {
-                                CursorState::Normal => {
-                                    user32::SetCursor(user32::LoadCursorW(
-                                            ptr::null_mut(),
-                                            window_state.cursor));
-                                },
-                                CursorState::Grab | CursorState::Hide => {
-                                    user32::SetCursor(ptr::null_mut());
-                                }
-                            }
-                        } else {
-                            call_def_window_proc = true;
-                        }
-                    }
-                }
-
-                call_def_window_proc
-            });
-
-            if call_def_window_proc {
-                user32::DefWindowProcW(window, msg, wparam, lparam)
-            } else {    
-                0
-            }
-        },
-
-        winapi::WM_DROPFILES => {
-            use events::WindowEvent::DroppedFile;
-
-            let hdrop = wparam as winapi::HDROP;
-            let mut pathbuf: [u16; winapi::MAX_PATH] = mem::uninitialized();
-            let num_drops = shell32::DragQueryFileW(hdrop, 0xFFFFFFFF, ptr::null_mut(), 0);
-
-            for i in 0..num_drops {
-                let nch = shell32::DragQueryFileW(hdrop, i, pathbuf.as_mut_ptr(),
-                                                  winapi::MAX_PATH as u32) as usize;
-                if nch > 0 {
-                    send_event(window, DroppedFile(OsString::from_wide(&pathbuf[0..nch]).into()));
-                }
-            }
-
-            shell32::DragFinish(hdrop);
-            0
-        },
-
-        winapi::WM_GETMINMAXINFO => {
-            let mmi = lparam as *mut MinMaxInfo;
-            //(*mmi).max_position = winapi::POINT { x: -8, y: -8 }; // The upper left corner of the window if it were maximized on the primary monitor.
-            //(*mmi).max_size = winapi::POINT { x: .., y: .. }; // The dimensions of the primary monitor.
-
-            CONTEXT_STASH.with(|context_stash| {
-                match context_stash.borrow().as_ref() {
-                    Some(cstash) => {
-                        let window_state = cstash.window_state.lock().unwrap();
-
-                        match window_state.attributes.min_dimensions {
-                            Some((width, height)) => {
-                                (*mmi).min_track = winapi::POINT { x: width as i32, y: height as i32 };
-                            },
-                            None => { }
-                        }
-
-                        match window_state.attributes.max_dimensions {
-                            Some((width, height)) => {
-                                (*mmi).max_track = winapi::POINT { x: width as i32, y: height as i32 };
-                            },
-                            None => { }
-                        }
-                    },
-                    None => { }
-                }
-            });
-            0
-        },
-
-        x if x == *super::WAKEUP_MSG_ID => {
-            use events::WindowEvent::Awakened;
-            send_event(window, Awakened);
-            0
-        },
-
-        _ => {
-            user32::DefWindowProcW(window, msg, wparam, lparam)
-        }
-    }
-}

src/platform/windows/dpi.rs

@@ -0,0 +1,189 @@
+#![allow(non_snake_case, unused_unsafe)]
+
+use std::mem;
+use std::os::raw::c_void;
+use std::sync::{Once, ONCE_INIT};
+
+use winapi::shared::minwindef::{BOOL, UINT, FALSE};
+use winapi::shared::windef::{
+    DPI_AWARENESS_CONTEXT,
+    DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE,
+    HMONITOR,
+    HWND,
+};
+use winapi::shared::winerror::S_OK;
+use winapi::um::libloaderapi::{GetProcAddress, LoadLibraryA};
+use winapi::um::shellscalingapi::{
+    MDT_EFFECTIVE_DPI,
+    MONITOR_DPI_TYPE,
+    PROCESS_DPI_AWARENESS,
+    PROCESS_PER_MONITOR_DPI_AWARE,
+};
+use winapi::um::wingdi::{GetDeviceCaps, LOGPIXELSX};
+use winapi::um::winnt::{HRESULT, LPCSTR};
+use winapi::um::winuser::{self, MONITOR_DEFAULTTONEAREST};
+
+const DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: DPI_AWARENESS_CONTEXT = -4isize as _;
+
+type SetProcessDPIAware = unsafe extern "system" fn () -> BOOL;
+type SetProcessDpiAwareness = unsafe extern "system" fn (
+    value: PROCESS_DPI_AWARENESS,
+) -> HRESULT;
+type SetProcessDpiAwarenessContext = unsafe extern "system" fn (
+    value: DPI_AWARENESS_CONTEXT,
+) -> BOOL;
+type GetDpiForWindow = unsafe extern "system" fn (hwnd: HWND) -> UINT;
+type GetDpiForMonitor = unsafe extern "system" fn (
+    hmonitor: HMONITOR,
+    dpi_type: MONITOR_DPI_TYPE,
+    dpi_x: *mut UINT,
+    dpi_y: *mut UINT,
+) -> HRESULT;
+type EnableNonClientDpiScaling = unsafe extern "system" fn (hwnd: HWND) -> BOOL;
+
+// Helper function to dynamically load function pointer.
+// `library` and `function` must be zero-terminated.
+fn get_function_impl(library: &str, function: &str) -> Option<*const c_void> {
+    assert_eq!(library.chars().last(), Some('\0'));
+    assert_eq!(function.chars().last(), Some('\0'));
+
+    // Library names we will use are ASCII so we can use the A version to avoid string conversion.
+    let module = unsafe { LoadLibraryA(library.as_ptr() as LPCSTR) };
+    if module.is_null() {
+        return None;
+    }
+
+    let function_ptr = unsafe { GetProcAddress(module, function.as_ptr() as LPCSTR) };
+    if function_ptr.is_null() {
+        return None;
+    }
+
+    Some(function_ptr as _)
+}
+
+macro_rules! get_function {
+    ($lib:expr, $func:ident) => {
+        get_function_impl(concat!($lib, '\0'), concat!(stringify!($func), '\0'))
+            .map(|f| unsafe { mem::transmute::<*const _, $func>(f) })
+    }
+}
+
+lazy_static! {
+    static ref GET_DPI_FOR_WINDOW: Option<GetDpiForWindow> = get_function!(
+        "user32.dll",
+        GetDpiForWindow
+    );
+    static ref GET_DPI_FOR_MONITOR: Option<GetDpiForMonitor> = get_function!(
+        "shcore.dll",
+        GetDpiForMonitor
+    );
+    static ref ENABLE_NON_CLIENT_DPI_SCALING: Option<EnableNonClientDpiScaling> = get_function!(
+        "user32.dll",
+        EnableNonClientDpiScaling
+    );
+}
+
+pub fn become_dpi_aware(enable: bool) {
+    if !enable { return; }
+    static ENABLE_DPI_AWARENESS: Once = ONCE_INIT;
+    ENABLE_DPI_AWARENESS.call_once(|| { unsafe {
+        if let Some(SetProcessDpiAwarenessContext) = get_function!(
+            "user32.dll",
+            SetProcessDpiAwarenessContext
+        ) {
+            // We are on Windows 10 Anniversary Update (1607) or later.
+            if SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)
+            == FALSE {
+                // V2 only works with Windows 10 Creators Update (1703). Try using the older
+                // V1 if we can't set V2.
+                SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE);
+            }
+        } else if let Some(SetProcessDpiAwareness) = get_function!(
+            "shcore.dll",
+            SetProcessDpiAwareness
+        ) {
+            // We are on Windows 8.1 or later.
+            SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
+        } else if let Some(SetProcessDPIAware) = get_function!(
+            "user32.dll",
+            SetProcessDPIAware
+        ) {
+            // We are on Vista or later.
+            SetProcessDPIAware();
+        }
+    } });
+}
+
+pub fn enable_non_client_dpi_scaling(hwnd: HWND) {
+    unsafe {
+        if let Some(EnableNonClientDpiScaling) = *ENABLE_NON_CLIENT_DPI_SCALING {
+            EnableNonClientDpiScaling(hwnd);
+        }
+    }
+}
+
+pub fn get_monitor_dpi(hmonitor: HMONITOR) -> Option<u32> {
+    unsafe {
+        if let Some(GetDpiForMonitor) = *GET_DPI_FOR_MONITOR {
+            // We are on Windows 8.1 or later.
+            let mut dpi_x = 0;
+            let mut dpi_y = 0;
+            if GetDpiForMonitor(hmonitor, MDT_EFFECTIVE_DPI, &mut dpi_x, &mut dpi_y) == S_OK {
+                // MSDN says that "the values of *dpiX and *dpiY are identical. You only need to
+                // record one of the values to determine the DPI and respond appropriately".
+                // https://msdn.microsoft.com/en-us/library/windows/desktop/dn280510(v=vs.85).aspx
+                return Some(dpi_x as u32)
+            }
+        }
+    }
+    None
+}
+
+pub const BASE_DPI: u32 = 96;
+pub fn dpi_to_scale_factor(dpi: u32) -> f64 {
+    dpi as f64 / BASE_DPI as f64
+}
+
+pub unsafe fn get_hwnd_dpi(hwnd: HWND) -> u32 {
+    let hdc = winuser::GetDC(hwnd);
+    if hdc.is_null() {
+        panic!("[winit] `GetDC` returned null!");
+    }
+    if let Some(GetDpiForWindow) = *GET_DPI_FOR_WINDOW {
+        // We are on Windows 10 Anniversary Update (1607) or later.
+        match GetDpiForWindow(hwnd) {
+            0 => BASE_DPI, // 0 is returned if hwnd is invalid
+            dpi => dpi as u32,
+        }
+    } else if let Some(GetDpiForMonitor) = *GET_DPI_FOR_MONITOR {
+        // We are on Windows 8.1 or later.
+        let monitor = winuser::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+        if monitor.is_null() {
+            return BASE_DPI;
+        }
+
+        let mut dpi_x = 0;
+        let mut dpi_y = 0;
+        if GetDpiForMonitor(monitor, MDT_EFFECTIVE_DPI, &mut dpi_x, &mut dpi_y) == S_OK {
+            dpi_x as u32
+        } else {
+            BASE_DPI
+        }
+    } else {
+        // We are on Vista or later.
+        if winuser::IsProcessDPIAware() != FALSE {
+            // If the process is DPI aware, then scaling must be handled by the application using
+            // this DPI value.
+            GetDeviceCaps(hdc, LOGPIXELSX) as u32
+        } else {
+            // If the process is DPI unaware, then scaling is performed by the OS; we thus return
+            // 96 (scale factor 1.0) to prevent the window from being re-scaled by both the
+            // application and the WM.
+            BASE_DPI
+        }
+    }
+}
+
+pub fn get_hwnd_scale_factor(hwnd: HWND) -> f64 {
+    dpi_to_scale_factor(unsafe { get_hwnd_dpi(hwnd) })
+}

src/platform/windows/event.rs

@@ -1,86 +1,82 @@
+use std::char;
+use std::os::raw::c_int;
+
 use events::VirtualKeyCode;
 use events::ModifiersState;
-use winapi;
-use user32;
-use ScanCode;
 
-const MAPVK_VSC_TO_VK_EX: u32 = 3;
+use winapi::shared::minwindef::{WPARAM, LPARAM, UINT};
+use winapi::um::winuser;
+
+use ScanCode;
 
 pub fn get_key_mods() -> ModifiersState {
     let mut mods = ModifiersState::default();
     unsafe {
-        if user32::GetKeyState(winapi::VK_SHIFT) & (1 << 15) == (1 << 15) {
+        if winuser::GetKeyState(winuser::VK_SHIFT) & (1 << 15) == (1 << 15) {
             mods.shift = true;
         }
-        if user32::GetKeyState(winapi::VK_CONTROL) & (1 << 15) == (1 << 15) {
+        if winuser::GetKeyState(winuser::VK_CONTROL) & (1 << 15) == (1 << 15) {
             mods.ctrl = true;
         }
-        if user32::GetKeyState(winapi::VK_MENU) & (1 << 15) == (1 << 15) {
+        if winuser::GetKeyState(winuser::VK_MENU) & (1 << 15) == (1 << 15) {
             mods.alt = true;
         }
-        if (user32::GetKeyState(winapi::VK_LWIN) | user32::GetKeyState(winapi::VK_RWIN)) & (1 << 15) == (1 << 15) {
+        if (winuser::GetKeyState(winuser::VK_LWIN) | winuser::GetKeyState(winuser::VK_RWIN)) & (1 << 15) == (1 << 15) {
             mods.logo = true;
         }
     }
     mods
 }
 
-pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (ScanCode, Option<VirtualKeyCode>) {
-    let scancode = ((lparam >> 16) & 0xff) as u8;
-    let extended = (lparam & 0x01000000) != 0;
-    let vk = match wparam as i32 {
-        winapi::VK_SHIFT => unsafe { user32::MapVirtualKeyA(scancode as u32, MAPVK_VSC_TO_VK_EX) as i32 },
-        winapi::VK_CONTROL => if extended { winapi::VK_RCONTROL } else { winapi::VK_LCONTROL },
-        winapi::VK_MENU => if extended { winapi::VK_RMENU } else { winapi::VK_LMENU },
-        other => other
-    };
-    (scancode, match vk {
-        //winapi::VK_LBUTTON => Some(VirtualKeyCode::Lbutton),
-        //winapi::VK_RBUTTON => Some(VirtualKeyCode::Rbutton),
-        //winapi::VK_CANCEL => Some(VirtualKeyCode::Cancel),
-        //winapi::VK_MBUTTON => Some(VirtualKeyCode::Mbutton),
-        //winapi::VK_XBUTTON1 => Some(VirtualKeyCode::Xbutton1),
-        //winapi::VK_XBUTTON2 => Some(VirtualKeyCode::Xbutton2),
-        winapi::VK_BACK => Some(VirtualKeyCode::Back),
-        winapi::VK_TAB => Some(VirtualKeyCode::Tab),
-        //winapi::VK_CLEAR => Some(VirtualKeyCode::Clear),
-        winapi::VK_RETURN => Some(VirtualKeyCode::Return),
-        winapi::VK_LSHIFT => Some(VirtualKeyCode::LShift),
-        winapi::VK_RSHIFT => Some(VirtualKeyCode::RShift),
-        winapi::VK_LCONTROL => Some(VirtualKeyCode::LControl),
-        winapi::VK_RCONTROL => Some(VirtualKeyCode::RControl),
-        winapi::VK_LMENU => Some(VirtualKeyCode::LMenu),
-        winapi::VK_RMENU => Some(VirtualKeyCode::RMenu),
-        winapi::VK_PAUSE => Some(VirtualKeyCode::Pause),
-        winapi::VK_CAPITAL => Some(VirtualKeyCode::Capital),
-        winapi::VK_KANA => Some(VirtualKeyCode::Kana),
-        //winapi::VK_HANGUEL => Some(VirtualKeyCode::Hanguel),
-        //winapi::VK_HANGUL => Some(VirtualKeyCode::Hangul),
-        //winapi::VK_JUNJA => Some(VirtualKeyCode::Junja),
-        //winapi::VK_FINAL => Some(VirtualKeyCode::Final),
-        //winapi::VK_HANJA => Some(VirtualKeyCode::Hanja),
-        winapi::VK_KANJI => Some(VirtualKeyCode::Kanji),
-        winapi::VK_ESCAPE => Some(VirtualKeyCode::Escape),
-        winapi::VK_CONVERT => Some(VirtualKeyCode::Convert),
-        winapi::VK_NONCONVERT => Some(VirtualKeyCode::NoConvert),
-        //winapi::VK_ACCEPT => Some(VirtualKeyCode::Accept),
-        //winapi::VK_MODECHANGE => Some(VirtualKeyCode::Modechange),
-        winapi::VK_SPACE => Some(VirtualKeyCode::Space),
-        winapi::VK_PRIOR => Some(VirtualKeyCode::PageUp),
-        winapi::VK_NEXT => Some(VirtualKeyCode::PageDown),
-        winapi::VK_END => Some(VirtualKeyCode::End),
-        winapi::VK_HOME => Some(VirtualKeyCode::Home),
-        winapi::VK_LEFT => Some(VirtualKeyCode::Left),
-        winapi::VK_UP => Some(VirtualKeyCode::Up),
-        winapi::VK_RIGHT => Some(VirtualKeyCode::Right),
-        winapi::VK_DOWN => Some(VirtualKeyCode::Down),
-        //winapi::VK_SELECT => Some(VirtualKeyCode::Select),
-        //winapi::VK_PRINT => Some(VirtualKeyCode::Print),
-        //winapi::VK_EXECUTE => Some(VirtualKeyCode::Execute),
-        winapi::VK_SNAPSHOT => Some(VirtualKeyCode::Snapshot),
-        winapi::VK_INSERT => Some(VirtualKeyCode::Insert),
-        winapi::VK_DELETE => Some(VirtualKeyCode::Delete),
-        //winapi::VK_HELP => Some(VirtualKeyCode::Help),
+pub fn vkey_to_winit_vkey(vkey: c_int) -> Option<VirtualKeyCode> {
+    // VK_* codes are documented here https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
+    match vkey {
+        //winuser::VK_LBUTTON => Some(VirtualKeyCode::Lbutton),
+        //winuser::VK_RBUTTON => Some(VirtualKeyCode::Rbutton),
+        //winuser::VK_CANCEL => Some(VirtualKeyCode::Cancel),
+        //winuser::VK_MBUTTON => Some(VirtualKeyCode::Mbutton),
+        //winuser::VK_XBUTTON1 => Some(VirtualKeyCode::Xbutton1),
+        //winuser::VK_XBUTTON2 => Some(VirtualKeyCode::Xbutton2),
+        winuser::VK_BACK => Some(VirtualKeyCode::Back),
+        winuser::VK_TAB => Some(VirtualKeyCode::Tab),
+        //winuser::VK_CLEAR => Some(VirtualKeyCode::Clear),
+        winuser::VK_RETURN => Some(VirtualKeyCode::Return),
+        winuser::VK_LSHIFT => Some(VirtualKeyCode::LShift),
+        winuser::VK_RSHIFT => Some(VirtualKeyCode::RShift),
+        winuser::VK_LCONTROL => Some(VirtualKeyCode::LControl),
+        winuser::VK_RCONTROL => Some(VirtualKeyCode::RControl),
+        winuser::VK_LMENU => Some(VirtualKeyCode::LAlt),
+        winuser::VK_RMENU => Some(VirtualKeyCode::RAlt),
+        winuser::VK_PAUSE => Some(VirtualKeyCode::Pause),
+        winuser::VK_CAPITAL => Some(VirtualKeyCode::Capital),
+        winuser::VK_KANA => Some(VirtualKeyCode::Kana),
+        //winuser::VK_HANGUEL => Some(VirtualKeyCode::Hanguel),
+        //winuser::VK_HANGUL => Some(VirtualKeyCode::Hangul),
+        //winuser::VK_JUNJA => Some(VirtualKeyCode::Junja),
+        //winuser::VK_FINAL => Some(VirtualKeyCode::Final),
+        //winuser::VK_HANJA => Some(VirtualKeyCode::Hanja),
+        winuser::VK_KANJI => Some(VirtualKeyCode::Kanji),
+        winuser::VK_ESCAPE => Some(VirtualKeyCode::Escape),
+        winuser::VK_CONVERT => Some(VirtualKeyCode::Convert),
+        winuser::VK_NONCONVERT => Some(VirtualKeyCode::NoConvert),
+        //winuser::VK_ACCEPT => Some(VirtualKeyCode::Accept),
+        //winuser::VK_MODECHANGE => Some(VirtualKeyCode::Modechange),
+        winuser::VK_SPACE => Some(VirtualKeyCode::Space),
+        winuser::VK_PRIOR => Some(VirtualKeyCode::PageUp),
+        winuser::VK_NEXT => Some(VirtualKeyCode::PageDown),
+        winuser::VK_END => Some(VirtualKeyCode::End),
+        winuser::VK_HOME => Some(VirtualKeyCode::Home),
+        winuser::VK_LEFT => Some(VirtualKeyCode::Left),
+        winuser::VK_UP => Some(VirtualKeyCode::Up),
+        winuser::VK_RIGHT => Some(VirtualKeyCode::Right),
+        winuser::VK_DOWN => Some(VirtualKeyCode::Down),
+        //winuser::VK_SELECT => Some(VirtualKeyCode::Select),
+        //winuser::VK_PRINT => Some(VirtualKeyCode::Print),
+        //winuser::VK_EXECUTE => Some(VirtualKeyCode::Execute),
+        winuser::VK_SNAPSHOT => Some(VirtualKeyCode::Snapshot),
+        winuser::VK_INSERT => Some(VirtualKeyCode::Insert),
+        winuser::VK_DELETE => Some(VirtualKeyCode::Delete),
+        //winuser::VK_HELP => Some(VirtualKeyCode::Help),
         0x30 => Some(VirtualKeyCode::Key0),
         0x31 => Some(VirtualKeyCode::Key1),
         0x32 => Some(VirtualKeyCode::Key2),
@@ -117,94 +113,155 @@ pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (S
         0x58 => Some(VirtualKeyCode::X),
         0x59 => Some(VirtualKeyCode::Y),
         0x5A => Some(VirtualKeyCode::Z),
-        //winapi::VK_LWIN => Some(VirtualKeyCode::Lwin),
-        //winapi::VK_RWIN => Some(VirtualKeyCode::Rwin),
-        winapi::VK_APPS => Some(VirtualKeyCode::Apps),
-        winapi::VK_SLEEP => Some(VirtualKeyCode::Sleep),
-        winapi::VK_NUMPAD0 => Some(VirtualKeyCode::Numpad0),
-        winapi::VK_NUMPAD1 => Some(VirtualKeyCode::Numpad1),
-        winapi::VK_NUMPAD2 => Some(VirtualKeyCode::Numpad2),
-        winapi::VK_NUMPAD3 => Some(VirtualKeyCode::Numpad3),
-        winapi::VK_NUMPAD4 => Some(VirtualKeyCode::Numpad4),
-        winapi::VK_NUMPAD5 => Some(VirtualKeyCode::Numpad5),
-        winapi::VK_NUMPAD6 => Some(VirtualKeyCode::Numpad6),
-        winapi::VK_NUMPAD7 => Some(VirtualKeyCode::Numpad7),
-        winapi::VK_NUMPAD8 => Some(VirtualKeyCode::Numpad8),
-        winapi::VK_NUMPAD9 => Some(VirtualKeyCode::Numpad9),
-        winapi::VK_MULTIPLY => Some(VirtualKeyCode::Multiply),
-        winapi::VK_ADD => Some(VirtualKeyCode::Add),
-        //winapi::VK_SEPARATOR => Some(VirtualKeyCode::Separator),
-        winapi::VK_SUBTRACT => Some(VirtualKeyCode::Subtract),
-        winapi::VK_DECIMAL => Some(VirtualKeyCode::Decimal),
-        winapi::VK_DIVIDE => Some(VirtualKeyCode::Divide),
-        winapi::VK_F1 => Some(VirtualKeyCode::F1),
-        winapi::VK_F2 => Some(VirtualKeyCode::F2),
-        winapi::VK_F3 => Some(VirtualKeyCode::F3),
-        winapi::VK_F4 => Some(VirtualKeyCode::F4),
-        winapi::VK_F5 => Some(VirtualKeyCode::F5),
-        winapi::VK_F6 => Some(VirtualKeyCode::F6),
-        winapi::VK_F7 => Some(VirtualKeyCode::F7),
-        winapi::VK_F8 => Some(VirtualKeyCode::F8),
-        winapi::VK_F9 => Some(VirtualKeyCode::F9),
-        winapi::VK_F10 => Some(VirtualKeyCode::F10),
-        winapi::VK_F11 => Some(VirtualKeyCode::F11),
-        winapi::VK_F12 => Some(VirtualKeyCode::F12),
-        winapi::VK_F13 => Some(VirtualKeyCode::F13),
-        winapi::VK_F14 => Some(VirtualKeyCode::F14),
-        winapi::VK_F15 => Some(VirtualKeyCode::F15),
-        /*winapi::VK_F16 => Some(VirtualKeyCode::F16),
-        winapi::VK_F17 => Some(VirtualKeyCode::F17),
-        winapi::VK_F18 => Some(VirtualKeyCode::F18),
-        winapi::VK_F19 => Some(VirtualKeyCode::F19),
-        winapi::VK_F20 => Some(VirtualKeyCode::F20),
-        winapi::VK_F21 => Some(VirtualKeyCode::F21),
-        winapi::VK_F22 => Some(VirtualKeyCode::F22),
-        winapi::VK_F23 => Some(VirtualKeyCode::F23),
-        winapi::VK_F24 => Some(VirtualKeyCode::F24),*/
-        winapi::VK_NUMLOCK => Some(VirtualKeyCode::Numlock),
-        winapi::VK_SCROLL => Some(VirtualKeyCode::Scroll),
-        winapi::VK_BROWSER_BACK => Some(VirtualKeyCode::NavigateBackward),
-        winapi::VK_BROWSER_FORWARD => Some(VirtualKeyCode::NavigateForward),
-        winapi::VK_BROWSER_REFRESH => Some(VirtualKeyCode::WebRefresh),
-        winapi::VK_BROWSER_STOP => Some(VirtualKeyCode::WebStop),
-        winapi::VK_BROWSER_SEARCH => Some(VirtualKeyCode::WebSearch),
-        winapi::VK_BROWSER_FAVORITES => Some(VirtualKeyCode::WebFavorites),
-        winapi::VK_BROWSER_HOME => Some(VirtualKeyCode::WebHome),
-        winapi::VK_VOLUME_MUTE => Some(VirtualKeyCode::Mute),
-        winapi::VK_VOLUME_DOWN => Some(VirtualKeyCode::VolumeDown),
-        winapi::VK_VOLUME_UP => Some(VirtualKeyCode::VolumeUp),
-        winapi::VK_MEDIA_NEXT_TRACK => Some(VirtualKeyCode::NextTrack),
-        winapi::VK_MEDIA_PREV_TRACK => Some(VirtualKeyCode::PrevTrack),
-        winapi::VK_MEDIA_STOP => Some(VirtualKeyCode::MediaStop),
-        winapi::VK_MEDIA_PLAY_PAUSE => Some(VirtualKeyCode::PlayPause),
-        winapi::VK_LAUNCH_MAIL => Some(VirtualKeyCode::Mail),
-        winapi::VK_LAUNCH_MEDIA_SELECT => Some(VirtualKeyCode::MediaSelect),
-        /*winapi::VK_LAUNCH_APP1 => Some(VirtualKeyCode::Launch_app1),
-        winapi::VK_LAUNCH_APP2 => Some(VirtualKeyCode::Launch_app2),*/
-	winapi::VK_OEM_PLUS => Some(VirtualKeyCode::Equals),
-        winapi::VK_OEM_COMMA => Some(VirtualKeyCode::Comma),
-        winapi::VK_OEM_MINUS => Some(VirtualKeyCode::Minus),
-        winapi::VK_OEM_PERIOD => Some(VirtualKeyCode::Period),
-        /*winapi::VK_OEM_1 => Some(VirtualKeyCode::Oem_1),
-        winapi::VK_OEM_2 => Some(VirtualKeyCode::Oem_2), 
-        winapi::VK_OEM_3 => Some(VirtualKeyCode::Oem_3), 
-        winapi::VK_OEM_4 => Some(VirtualKeyCode::Oem_4), 
-        winapi::VK_OEM_5 => Some(VirtualKeyCode::Oem_5), 
-        winapi::VK_OEM_6 => Some(VirtualKeyCode::Oem_6), 
-        winapi::VK_OEM_7 => Some(VirtualKeyCode::Oem_7), 
-        winapi::VK_OEM_8 => Some(VirtualKeyCode::Oem_8), */
-        winapi::VK_OEM_102 => Some(VirtualKeyCode::OEM102),
-        /*winapi::VK_PROCESSKEY => Some(VirtualKeyCode::Processkey),
-        winapi::VK_PACKET => Some(VirtualKeyCode::Packet),
-        winapi::VK_ATTN => Some(VirtualKeyCode::Attn),
-        winapi::VK_CRSEL => Some(VirtualKeyCode::Crsel),
-        winapi::VK_EXSEL => Some(VirtualKeyCode::Exsel),
-        winapi::VK_EREOF => Some(VirtualKeyCode::Ereof),
-        winapi::VK_PLAY => Some(VirtualKeyCode::Play),
-        winapi::VK_ZOOM => Some(VirtualKeyCode::Zoom),
-        winapi::VK_NONAME => Some(VirtualKeyCode::Noname),
-        winapi::VK_PA1 => Some(VirtualKeyCode::Pa1),
-        winapi::VK_OEM_CLEAR => Some(VirtualKeyCode::Oem_clear),*/
+        //winuser::VK_LWIN => Some(VirtualKeyCode::Lwin),
+        //winuser::VK_RWIN => Some(VirtualKeyCode::Rwin),
+        winuser::VK_APPS => Some(VirtualKeyCode::Apps),
+        winuser::VK_SLEEP => Some(VirtualKeyCode::Sleep),
+        winuser::VK_NUMPAD0 => Some(VirtualKeyCode::Numpad0),
+        winuser::VK_NUMPAD1 => Some(VirtualKeyCode::Numpad1),
+        winuser::VK_NUMPAD2 => Some(VirtualKeyCode::Numpad2),
+        winuser::VK_NUMPAD3 => Some(VirtualKeyCode::Numpad3),
+        winuser::VK_NUMPAD4 => Some(VirtualKeyCode::Numpad4),
+        winuser::VK_NUMPAD5 => Some(VirtualKeyCode::Numpad5),
+        winuser::VK_NUMPAD6 => Some(VirtualKeyCode::Numpad6),
+        winuser::VK_NUMPAD7 => Some(VirtualKeyCode::Numpad7),
+        winuser::VK_NUMPAD8 => Some(VirtualKeyCode::Numpad8),
+        winuser::VK_NUMPAD9 => Some(VirtualKeyCode::Numpad9),
+        winuser::VK_MULTIPLY => Some(VirtualKeyCode::Multiply),
+        winuser::VK_ADD => Some(VirtualKeyCode::Add),
+        //winuser::VK_SEPARATOR => Some(VirtualKeyCode::Separator),
+        winuser::VK_SUBTRACT => Some(VirtualKeyCode::Subtract),
+        winuser::VK_DECIMAL => Some(VirtualKeyCode::Decimal),
+        winuser::VK_DIVIDE => Some(VirtualKeyCode::Divide),
+        winuser::VK_F1 => Some(VirtualKeyCode::F1),
+        winuser::VK_F2 => Some(VirtualKeyCode::F2),
+        winuser::VK_F3 => Some(VirtualKeyCode::F3),
+        winuser::VK_F4 => Some(VirtualKeyCode::F4),
+        winuser::VK_F5 => Some(VirtualKeyCode::F5),
+        winuser::VK_F6 => Some(VirtualKeyCode::F6),
+        winuser::VK_F7 => Some(VirtualKeyCode::F7),
+        winuser::VK_F8 => Some(VirtualKeyCode::F8),
+        winuser::VK_F9 => Some(VirtualKeyCode::F9),
+        winuser::VK_F10 => Some(VirtualKeyCode::F10),
+        winuser::VK_F11 => Some(VirtualKeyCode::F11),
+        winuser::VK_F12 => Some(VirtualKeyCode::F12),
+        winuser::VK_F13 => Some(VirtualKeyCode::F13),
+        winuser::VK_F14 => Some(VirtualKeyCode::F14),
+        winuser::VK_F15 => Some(VirtualKeyCode::F15),
+        /*winuser::VK_F16 => Some(VirtualKeyCode::F16),
+        winuser::VK_F17 => Some(VirtualKeyCode::F17),
+        winuser::VK_F18 => Some(VirtualKeyCode::F18),
+        winuser::VK_F19 => Some(VirtualKeyCode::F19),
+        winuser::VK_F20 => Some(VirtualKeyCode::F20),
+        winuser::VK_F21 => Some(VirtualKeyCode::F21),
+        winuser::VK_F22 => Some(VirtualKeyCode::F22),
+        winuser::VK_F23 => Some(VirtualKeyCode::F23),
+        winuser::VK_F24 => Some(VirtualKeyCode::F24),*/
+        winuser::VK_NUMLOCK => Some(VirtualKeyCode::Numlock),
+        winuser::VK_SCROLL => Some(VirtualKeyCode::Scroll),
+        winuser::VK_BROWSER_BACK => Some(VirtualKeyCode::NavigateBackward),
+        winuser::VK_BROWSER_FORWARD => Some(VirtualKeyCode::NavigateForward),
+        winuser::VK_BROWSER_REFRESH => Some(VirtualKeyCode::WebRefresh),
+        winuser::VK_BROWSER_STOP => Some(VirtualKeyCode::WebStop),
+        winuser::VK_BROWSER_SEARCH => Some(VirtualKeyCode::WebSearch),
+        winuser::VK_BROWSER_FAVORITES => Some(VirtualKeyCode::WebFavorites),
+        winuser::VK_BROWSER_HOME => Some(VirtualKeyCode::WebHome),
+        winuser::VK_VOLUME_MUTE => Some(VirtualKeyCode::Mute),
+        winuser::VK_VOLUME_DOWN => Some(VirtualKeyCode::VolumeDown),
+        winuser::VK_VOLUME_UP => Some(VirtualKeyCode::VolumeUp),
+        winuser::VK_MEDIA_NEXT_TRACK => Some(VirtualKeyCode::NextTrack),
+        winuser::VK_MEDIA_PREV_TRACK => Some(VirtualKeyCode::PrevTrack),
+        winuser::VK_MEDIA_STOP => Some(VirtualKeyCode::MediaStop),
+        winuser::VK_MEDIA_PLAY_PAUSE => Some(VirtualKeyCode::PlayPause),
+        winuser::VK_LAUNCH_MAIL => Some(VirtualKeyCode::Mail),
+        winuser::VK_LAUNCH_MEDIA_SELECT => Some(VirtualKeyCode::MediaSelect),
+        /*winuser::VK_LAUNCH_APP1 => Some(VirtualKeyCode::Launch_app1),
+        winuser::VK_LAUNCH_APP2 => Some(VirtualKeyCode::Launch_app2),*/
+        winuser::VK_OEM_PLUS => Some(VirtualKeyCode::Equals),
+        winuser::VK_OEM_COMMA => Some(VirtualKeyCode::Comma),
+        winuser::VK_OEM_MINUS => Some(VirtualKeyCode::Minus),
+        winuser::VK_OEM_PERIOD => Some(VirtualKeyCode::Period),
+        winuser::VK_OEM_1 => map_text_keys(vkey),
+        winuser::VK_OEM_2 => map_text_keys(vkey),
+        winuser::VK_OEM_3 => map_text_keys(vkey),
+        winuser::VK_OEM_4 => map_text_keys(vkey),
+        winuser::VK_OEM_5 => map_text_keys(vkey),
+        winuser::VK_OEM_6 => map_text_keys(vkey),
+        winuser::VK_OEM_7 => map_text_keys(vkey),
+        /*winuser::VK_OEM_8 => Some(VirtualKeyCode::Oem_8), */
+        winuser::VK_OEM_102 => Some(VirtualKeyCode::OEM102),
+        /*winuser::VK_PROCESSKEY => Some(VirtualKeyCode::Processkey),
+        winuser::VK_PACKET => Some(VirtualKeyCode::Packet),
+        winuser::VK_ATTN => Some(VirtualKeyCode::Attn),
+        winuser::VK_CRSEL => Some(VirtualKeyCode::Crsel),
+        winuser::VK_EXSEL => Some(VirtualKeyCode::Exsel),
+        winuser::VK_EREOF => Some(VirtualKeyCode::Ereof),
+        winuser::VK_PLAY => Some(VirtualKeyCode::Play),
+        winuser::VK_ZOOM => Some(VirtualKeyCode::Zoom),
+        winuser::VK_NONAME => Some(VirtualKeyCode::Noname),
+        winuser::VK_PA1 => Some(VirtualKeyCode::Pa1),
+        winuser::VK_OEM_CLEAR => Some(VirtualKeyCode::Oem_clear),*/
         _ => None
-    })
+    }
+}
+
+pub fn handle_extended_keys(vkey: c_int, mut scancode: UINT, extended: bool) -> Option<(c_int, UINT)> {
+    // Welcome to hell https://blog.molecular-matters.com/2011/09/05/properly-handling-keyboard-input/
+    let vkey = match vkey {
+        winuser::VK_SHIFT => unsafe { winuser::MapVirtualKeyA(
+            scancode,
+            winuser::MAPVK_VSC_TO_VK_EX,
+        ) as _ },
+        winuser::VK_CONTROL => if extended {
+            winuser::VK_RCONTROL
+        } else {
+            winuser::VK_LCONTROL
+        },
+        winuser::VK_MENU => if extended {
+            winuser::VK_RMENU
+        } else {
+            winuser::VK_LMENU
+        },
+        _ => match scancode {
+            // This is only triggered when using raw input. Without this check, we get two events whenever VK_PAUSE is
+            // pressed, the first one having scancode 0x1D but vkey VK_PAUSE...
+            0x1D if vkey == winuser::VK_PAUSE => return None,
+            // ...and the second having scancode 0x45 but an unmatched vkey!
+            0x45 => winuser::VK_PAUSE,
+            // VK_PAUSE and VK_SCROLL have the same scancode when using modifiers, alongside incorrect vkey values.
+            0x46 => {
+                if extended {
+                    scancode = 0x45;
+                    winuser::VK_PAUSE
+                } else {
+                    winuser::VK_SCROLL
+                }
+            },
+            _ => vkey,
+        },
+    };
+    Some((vkey, scancode))
+}
+
+pub fn process_key_params(wparam: WPARAM, lparam: LPARAM) -> Option<(ScanCode, Option<VirtualKeyCode>)> {
+    let scancode = ((lparam >> 16) & 0xff) as UINT;
+    let extended = (lparam & 0x01000000) != 0;
+    handle_extended_keys(wparam as _, scancode, extended)
+        .map(|(vkey, scancode)| (scancode, vkey_to_winit_vkey(vkey)))
+}
+
+// This is needed as windows doesn't properly distinguish
+// some virtual key codes for different keyboard layouts
+fn map_text_keys(win_virtual_key: i32) -> Option<VirtualKeyCode> {
+    let char_key = unsafe { winuser::MapVirtualKeyA(win_virtual_key as u32, winuser::MAPVK_VK_TO_CHAR) } & 0x7FFF;
+    match char::from_u32(char_key) {
+        Some(';') => Some(VirtualKeyCode::Semicolon),
+        Some('/') => Some(VirtualKeyCode::Slash),
+        Some('`') => Some(VirtualKeyCode::Grave),
+        Some('[') => Some(VirtualKeyCode::LBracket),
+        Some(']') => Some(VirtualKeyCode::RBracket),
+        Some('\'') => Some(VirtualKeyCode::Apostrophe),
+        Some('\\') => Some(VirtualKeyCode::Backslash),
+        _ => None
+    }
 }

src/platform/windows/icon.rs

@@ -0,0 +1,114 @@
+use std::{self, mem, ptr};
+use std::os::windows::ffi::OsStrExt;
+use std::path::Path;
+
+use winapi::ctypes::{c_int, wchar_t};
+use winapi::shared::minwindef::{BYTE, LPARAM, WPARAM};
+use winapi::shared::windef::{HICON, HWND};
+use winapi::um::winuser;
+
+use {Pixel, PIXEL_SIZE, Icon};
+use platform::platform::util;
+
+impl Pixel {
+    fn to_bgra(&mut self) {
+        mem::swap(&mut self.r, &mut self.b);
+    }
+}
+
+#[derive(Debug)]
+pub enum IconType {
+    Small = winuser::ICON_SMALL as isize,
+    Big = winuser::ICON_BIG as isize,
+}
+
+#[derive(Clone, Debug)]
+pub struct WinIcon {
+    pub handle: HICON,
+}
+
+unsafe impl Send for WinIcon {}
+
+impl WinIcon {
+    #[allow(dead_code)]
+    pub fn from_path<P: AsRef<Path>>(path: P) -> Result<Self, util::WinError> {
+        let wide_path: Vec<u16> = path.as_ref().as_os_str().encode_wide().collect();
+        let handle = unsafe {
+            winuser::LoadImageW(
+                ptr::null_mut(),
+                wide_path.as_ptr() as *const wchar_t,
+                winuser::IMAGE_ICON,
+                0, // 0 indicates that we want to use the actual width
+                0, // and height
+                winuser::LR_LOADFROMFILE,
+            ) as HICON
+        };
+        if !handle.is_null() {
+            Ok(WinIcon { handle })
+        } else {
+            Err(util::WinError::from_last_error())
+        }
+    }
+
+    pub fn from_icon(icon: Icon) -> Result<Self, util::WinError> {
+        Self::from_rgba(icon.rgba, icon.width, icon.height)
+    }
+
+    pub fn from_rgba(mut rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, util::WinError> {
+        assert_eq!(rgba.len() % PIXEL_SIZE, 0);
+        let pixel_count = rgba.len() / PIXEL_SIZE;
+        assert_eq!(pixel_count, (width * height) as usize);
+        let mut and_mask = Vec::with_capacity(pixel_count);
+        let pixels = rgba.as_mut_ptr() as *mut Pixel; // how not to write idiomatic Rust
+        for pixel_index in 0..pixel_count {
+            let pixel = unsafe { &mut *pixels.offset(pixel_index as isize) };
+            and_mask.push(pixel.a.wrapping_sub(std::u8::MAX)); // invert alpha channel
+            pixel.to_bgra();
+        }
+        assert_eq!(and_mask.len(), pixel_count);
+        let handle = unsafe {
+            winuser::CreateIcon(
+                ptr::null_mut(),
+                width as c_int,
+                height as c_int,
+                1,
+                (PIXEL_SIZE * 8) as BYTE,
+                and_mask.as_ptr() as *const BYTE,
+                rgba.as_ptr() as *const BYTE,
+            ) as HICON
+        };
+        if !handle.is_null() {
+            Ok(WinIcon { handle })
+        } else {
+            Err(util::WinError::from_last_error())
+        }
+    }
+
+    pub fn set_for_window(&self, hwnd: HWND, icon_type: IconType) {
+        unsafe {
+            winuser::SendMessageW(
+                hwnd,
+                winuser::WM_SETICON,
+                icon_type as WPARAM,
+                self.handle as LPARAM,
+            );
+        }
+    }
+}
+
+impl Drop for WinIcon {
+    fn drop(&mut self) {
+        unsafe { winuser::DestroyIcon(self.handle) };
+    }
+}
+
+pub fn unset_for_window(hwnd: HWND, icon_type: IconType) {
+    unsafe {
+        winuser::SendMessageW(
+            hwnd,
+            winuser::WM_SETICON,
+            icon_type as WPARAM,
+            0 as LPARAM,
+        );
+    }
+}

src/platform/windows/init.rs

@@ -1,259 +0,0 @@
-use std::sync::{Arc, Mutex};
-use std::io;
-use std::ptr;
-use std::mem;
-use std::thread;
-
-use super::callback;
-use super::WindowState;
-use super::Window;
-use super::MonitorId;
-use super::WindowWrapper;
-use super::PlatformSpecificWindowBuilderAttributes;
-
-use CreationError;
-use CreationError::OsError;
-use CursorState;
-use WindowAttributes;
-
-use std::ffi::{OsStr};
-use std::os::windows::ffi::OsStrExt;
-use std::sync::mpsc::channel;
-
-use winapi;
-use kernel32;
-use dwmapi;
-use user32;
-
-pub fn new_window(window: &WindowAttributes, pl_attribs: &PlatformSpecificWindowBuilderAttributes) -> Result<Window, CreationError> {
-    let window = window.clone();
-    let attribs = pl_attribs.clone();
-    // initializing variables to be sent to the task
-
-    let title = OsStr::new(&window.title).encode_wide().chain(Some(0).into_iter())
-                                          .collect::<Vec<_>>();
-
-    let (tx, rx) = channel();
-
-    // `GetMessage` must be called in the same thread as CreateWindow, so we create a new thread
-    // dedicated to this window.
-    thread::spawn(move || {
-        unsafe {
-            // creating and sending the `Window`
-            match init(title, &window, attribs) {
-                Ok(w) => tx.send(Ok(w)).ok(),
-                Err(e) => {
-                    tx.send(Err(e)).ok();
-                    return;
-                }
-            };
-
-            // now that the `Window` struct is initialized, the main `Window::new()` function will
-            //  return and this events loop will run in parallel
-            loop {
-                let mut msg = mem::uninitialized();
-
-                if user32::GetMessageW(&mut msg, ptr::null_mut(), 0, 0) == 0 {
-                    break;
-                }
-
-                user32::TranslateMessage(&msg);
-                user32::DispatchMessageW(&msg);   // calls `callback` (see the callback module)
-            }
-        }
-    });
-
-    rx.recv().unwrap()
-}
-
-unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pl_attribs: PlatformSpecificWindowBuilderAttributes) -> Result<Window, CreationError> {
-    // registering the window class
-    let class_name = register_window_class();
-
-    // building a RECT object with coordinates
-    let mut rect = winapi::RECT {
-        left: 0, right: window.dimensions.unwrap_or((1024, 768)).0 as winapi::LONG,
-        top: 0, bottom: window.dimensions.unwrap_or((1024, 768)).1 as winapi::LONG,
-    };
-
-    // switching to fullscreen if necessary
-    // this means adjusting the window's position so that it overlaps the right monitor,
-    //  and change the monitor's resolution if necessary
-    if window.monitor.is_some() {
-        let monitor = window.monitor.as_ref().unwrap();
-        try!(switch_to_fullscreen(&mut rect, monitor));
-    }
-
-    // computing the style and extended style of the window
-    let (ex_style, style) = if window.monitor.is_some() || !window.decorations {
-        (winapi::WS_EX_APPWINDOW,
-            //winapi::WS_POPUP is incompatible with winapi::WS_CHILD
-            if pl_attribs.parent.is_some() {
-                winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN
-            }
-            else {
-                winapi::WS_POPUP | winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN
-            }
-        )
-    } else {
-        (winapi::WS_EX_APPWINDOW | winapi::WS_EX_WINDOWEDGE,
-            winapi::WS_OVERLAPPEDWINDOW | winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN)
-    };
-
-    // adjusting the window coordinates using the style
-    user32::AdjustWindowRectEx(&mut rect, style, 0, ex_style);
-
-    // creating the real window this time, by using the functions in `extra_functions`
-    let real_window = {
-        let (width, height) = if window.monitor.is_some() || window.dimensions.is_some() {
-            (Some(rect.right - rect.left), Some(rect.bottom - rect.top))
-        } else {
-            (None, None)
-        };
-
-        let (x, y) = if window.monitor.is_some() {
-            (Some(rect.left), Some(rect.top))
-        } else {
-            (None, None)
-        };
-
-        let mut style = if !window.visible {
-            style
-        } else {
-            style | winapi::WS_VISIBLE
-        };
-
-        if pl_attribs.parent.is_some() {
-            style |= winapi::WS_CHILD;
-        }
-
-        let handle = user32::CreateWindowExW(ex_style | winapi::WS_EX_ACCEPTFILES,
-            class_name.as_ptr(),
-            title.as_ptr() as winapi::LPCWSTR,
-            style | winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN,
-            x.unwrap_or(winapi::CW_USEDEFAULT), y.unwrap_or(winapi::CW_USEDEFAULT),
-            width.unwrap_or(winapi::CW_USEDEFAULT), height.unwrap_or(winapi::CW_USEDEFAULT),
-            pl_attribs.parent.unwrap_or(ptr::null_mut()),
-            ptr::null_mut(), kernel32::GetModuleHandleW(ptr::null()),
-            ptr::null_mut());
-
-        if handle.is_null() {
-            return Err(OsError(format!("CreateWindowEx function failed: {}",
-                                       format!("{}", io::Error::last_os_error()))));
-        }
-
-        let hdc = user32::GetDC(handle);
-        if hdc.is_null() {
-            return Err(OsError(format!("GetDC function failed: {}",
-                                       format!("{}", io::Error::last_os_error()))));
-        }
-
-        WindowWrapper(handle, hdc)
-    };
-
-    // making the window transparent
-    if window.transparent {
-        let bb = winapi::DWM_BLURBEHIND {
-            dwFlags: 0x1, // FIXME: DWM_BB_ENABLE;
-            fEnable: 1,
-            hRgnBlur: ptr::null_mut(),
-            fTransitionOnMaximized: 0,
-        };
-
-        dwmapi::DwmEnableBlurBehindWindow(real_window.0, &bb);
-    }
-
-    // calling SetForegroundWindow if fullscreen
-    if window.monitor.is_some() {
-        user32::SetForegroundWindow(real_window.0);
-    }
-
-    // Creating a mutex to track the current window state
-    let window_state = Arc::new(Mutex::new(WindowState {
-        cursor: winapi::IDC_ARROW, // use arrow by default
-        cursor_state: CursorState::Normal,
-        attributes: window.clone()
-    }));
-
-    // filling the CONTEXT_STASH task-local storage so that we can start receiving events
-    let events_receiver = {
-        let (tx, rx) = channel();
-        let mut tx = Some(tx);
-        callback::CONTEXT_STASH.with(|context_stash| {
-            let data = callback::ThreadLocalData {
-                win: real_window.0,
-                sender: tx.take().unwrap(),
-                window_state: window_state.clone(),
-                mouse_in_window: false
-            };
-            (*context_stash.borrow_mut()) = Some(data);
-        });
-        rx
-    };
-
-    // building the struct
-    Ok(Window {
-        window: real_window,
-        events_receiver: events_receiver,
-        window_state: window_state,
-    })
-}
-
-unsafe fn register_window_class() -> Vec<u16> {
-    let class_name = OsStr::new("Window Class").encode_wide().chain(Some(0).into_iter())
-                                               .collect::<Vec<_>>();
-
-    let class = winapi::WNDCLASSEXW {
-        cbSize: mem::size_of::<winapi::WNDCLASSEXW>() as winapi::UINT,
-        style: winapi::CS_HREDRAW | winapi::CS_VREDRAW | winapi::CS_OWNDC,
-        lpfnWndProc: Some(callback::callback),
-        cbClsExtra: 0,
-        cbWndExtra: 0,
-        hInstance: kernel32::GetModuleHandleW(ptr::null()),
-        hIcon: ptr::null_mut(),
-        hCursor: ptr::null_mut(),       // must be null in order for cursor state to work properly
-        hbrBackground: ptr::null_mut(),
-        lpszMenuName: ptr::null(),
-        lpszClassName: class_name.as_ptr(),
-        hIconSm: ptr::null_mut(),
-    };
-
-    // We ignore errors because registering the same window class twice would trigger
-    //  an error, and because errors here are detected during CreateWindowEx anyway.
-    // Also since there is no weird element in the struct, there is no reason for this
-    //  call to fail.
-    user32::RegisterClassExW(&class);
-
-    class_name
-}
-
-unsafe fn switch_to_fullscreen(rect: &mut winapi::RECT, monitor: &MonitorId)
-                               -> Result<(), CreationError>
-{
-    // adjusting the rect
-    {
-        let pos = monitor.get_position();
-        rect.left += pos.0 as winapi::LONG;
-        rect.right += pos.0 as winapi::LONG;
-        rect.top += pos.1 as winapi::LONG;
-        rect.bottom += pos.1 as winapi::LONG;
-    }
-
-    // changing device settings
-    let mut screen_settings: winapi::DEVMODEW = mem::zeroed();
-    screen_settings.dmSize = mem::size_of::<winapi::DEVMODEW>() as winapi::WORD;
-    screen_settings.dmPelsWidth = (rect.right - rect.left) as winapi::DWORD;
-    screen_settings.dmPelsHeight = (rect.bottom - rect.top) as winapi::DWORD;
-    screen_settings.dmBitsPerPel = 32;      // TODO: ?
-    screen_settings.dmFields = winapi::DM_BITSPERPEL | winapi::DM_PELSWIDTH | winapi::DM_PELSHEIGHT;
-
-    let result = user32::ChangeDisplaySettingsExW(monitor.get_adapter_name().as_ptr(),
-                                                  &mut screen_settings, ptr::null_mut(),
-                                                  winapi::CDS_FULLSCREEN, ptr::null_mut());
-
-    if result != winapi::DISP_CHANGE_SUCCESSFUL {
-        return Err(OsError(format!("ChangeDisplaySettings failed: {}", result)));
-    }
-
-    Ok(())
-}

src/platform/windows/mod.rs

@@ -1,385 +1,58 @@
 #![cfg(target_os = "windows")]
 
-use std::mem;
-use std::ptr;
-use std::ffi::OsStr;
-use std::os::windows::ffi::OsStrExt;
-use std::os::raw::c_int;
-use std::sync::{
-    Arc,
-    Mutex
-};
-use std::sync::mpsc::Receiver;
-use {CreationError, WindowEvent as Event, MouseCursor};
-use CursorState;
+use winapi;
+use winapi::shared::windef::HWND;
 
-use WindowAttributes;
-
-gen_api_transition!();
+pub use self::events_loop::{EventsLoop, EventsLoopProxy};
+pub use self::monitor::MonitorId;
+pub use self::window::Window;
 
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes {
-    pub parent: Option<winapi::HWND>,
+    pub parent: Option<HWND>,
+    pub taskbar_icon: Option<::Icon>,
+    pub no_redirection_bitmap: bool,
 }
 
 unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
 unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
 
-#[derive(Clone, Default)]
-pub struct PlatformSpecificHeadlessBuilderAttributes;
+// Cursor name in UTF-16. Used to set cursor in `WM_SETCURSOR`.
+#[derive(Debug, Clone)]
+pub struct Cursor(pub *const winapi::ctypes::wchar_t);
+unsafe impl Send for Cursor {}
+unsafe impl Sync for Cursor {}
 
-pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(u32);
 
-use winapi;
-use user32;
-use kernel32;
+impl DeviceId {
+    pub fn get_persistent_identifier(&self) -> Option<String> {
+        if self.0 != 0 {
+            raw_input::get_raw_input_device_name(self.0 as _)
+        } else {
+            None
+        }
+    }
+}
 
-mod callback;
+// Constant device ID, to be removed when this backend is updated to report real device IDs.
+const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId(0));
+
+fn wrap_device_id(id: u32) -> ::DeviceId {
+    ::DeviceId(DeviceId(id))
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(HWND);
+unsafe impl Send for WindowId {}
+unsafe impl Sync for WindowId {}
+
+mod dpi;
 mod event;
-mod init;
+mod events_loop;
+mod icon;
 mod monitor;
-
-lazy_static! {
-    static ref WAKEUP_MSG_ID: u32 = unsafe { user32::RegisterWindowMessageA("Glutin::EventID".as_ptr() as *const i8) };
-}
-
-/// Cursor
-pub type Cursor = *const winapi::wchar_t;
-
-/// Contains information about states and the window for the callback.
-#[derive(Clone)]
-pub struct WindowState {
-    pub cursor: Cursor,
-    pub cursor_state: CursorState,
-    pub attributes: WindowAttributes
-}
-
-/// The Win32 implementation of the main `Window` object.
-pub struct Window {
-    /// Main handle for the window.
-    window: WindowWrapper,
-
-    /// Receiver for the events dispatched by the window callback.
-    events_receiver: Receiver<Event>,
-
-    /// The current window state.
-    window_state: Arc<Mutex<WindowState>>,
-}
-
-unsafe impl Send for Window {}
-unsafe impl Sync for Window {}
-
-/// A simple wrapper that destroys the window when it is destroyed.
-#[doc(hidden)]
-pub struct WindowWrapper(winapi::HWND, winapi::HDC);
-
-impl Drop for WindowWrapper {
-    #[inline]
-    fn drop(&mut self) {
-        unsafe {
-            user32::DestroyWindow(self.0);
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct WindowProxy {
-    hwnd: winapi::HWND,
-}
-
-unsafe impl Send for WindowProxy {}
-unsafe impl Sync for WindowProxy {}
-
-impl WindowProxy {
-    #[inline]
-    pub fn wakeup_event_loop(&self) {
-        unsafe {
-            user32::PostMessageA(self.hwnd, *WAKEUP_MSG_ID, 0, 0);
-        }
-    }
-}
-
-impl Window {
-    /// See the docs in the crate root file.
-    pub fn new(window: &WindowAttributes, pl_attribs: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window, CreationError>
-    {
-        init::new_window(window, pl_attribs)
-    }
-
-    /// See the docs in the crate root file.
-    ///
-    /// Calls SetWindowText on the HWND.
-    pub fn set_title(&self, text: &str) {
-        let text = OsStr::new(text).encode_wide().chain(Some(0).into_iter())
-                                   .collect::<Vec<_>>();
-
-        unsafe {
-            user32::SetWindowTextW(self.window.0, text.as_ptr() as winapi::LPCWSTR);
-        }
-    }
-
-    #[inline]
-    pub fn show(&self) {
-        unsafe {
-            user32::ShowWindow(self.window.0, winapi::SW_SHOW);
-        }
-    }
-
-    #[inline]
-    pub fn hide(&self) {
-        unsafe {
-            user32::ShowWindow(self.window.0, winapi::SW_HIDE);
-        }
-    }
-
-    /// See the docs in the crate root file.
-    pub fn get_position(&self) -> Option<(i32, i32)> {
-        use std::mem;
-
-        let mut placement: winapi::WINDOWPLACEMENT = unsafe { mem::zeroed() };
-        placement.length = mem::size_of::<winapi::WINDOWPLACEMENT>() as winapi::UINT;
-
-        if unsafe { user32::GetWindowPlacement(self.window.0, &mut placement) } == 0 {
-            return None
-        }
-
-        let ref rect = placement.rcNormalPosition;
-        Some((rect.left as i32, rect.top as i32))
-    }
-
-    /// See the docs in the crate root file.
-    pub fn set_position(&self, x: i32, y: i32) {
-        unsafe {
-            user32::SetWindowPos(self.window.0, ptr::null_mut(), x as c_int, y as c_int,
-                                 0, 0, winapi::SWP_NOZORDER | winapi::SWP_NOSIZE);
-            user32::UpdateWindow(self.window.0);
-        }
-    }
-
-    /// See the docs in the crate root file.
-    #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        let mut rect: winapi::RECT = unsafe { mem::uninitialized() };
-
-        if unsafe { user32::GetClientRect(self.window.0, &mut rect) } == 0 {
-            return None
-        }
-
-        Some((
-            (rect.right - rect.left) as u32,
-            (rect.bottom - rect.top) as u32
-        ))
-    }
-
-    /// See the docs in the crate root file.
-    #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
-        let mut rect: winapi::RECT = unsafe { mem::uninitialized() };
-
-        if unsafe { user32::GetWindowRect(self.window.0, &mut rect) } == 0 {
-            return None
-        }
-
-        Some((
-            (rect.right - rect.left) as u32,
-            (rect.bottom - rect.top) as u32
-        ))
-    }
-
-    /// See the docs in the crate root file.
-    pub fn set_inner_size(&self, x: u32, y: u32) {
-        unsafe {
-            // Calculate the outer size based upon the specified inner size
-            let mut rect = winapi::RECT { top: 0, left: 0, bottom: y as winapi::LONG, right: x as winapi::LONG };
-            let dw_style = user32::GetWindowLongA(self.window.0, winapi::GWL_STYLE) as winapi::DWORD;
-            let b_menu = !user32::GetMenu(self.window.0).is_null() as winapi::BOOL;
-            let dw_style_ex = user32::GetWindowLongA(self.window.0, winapi::GWL_EXSTYLE) as winapi::DWORD;
-            user32::AdjustWindowRectEx(&mut rect, dw_style, b_menu, dw_style_ex);
-            let outer_x = (rect.right - rect.left).abs() as c_int;
-            let outer_y = (rect.top - rect.bottom).abs() as c_int;
-
-            user32::SetWindowPos(self.window.0, ptr::null_mut(), 0, 0, outer_x, outer_y,
-                winapi::SWP_NOZORDER | winapi::SWP_NOREPOSITION | winapi::SWP_NOMOVE);
-            user32::UpdateWindow(self.window.0);
-        }
-    }
-
-    #[inline]
-    pub fn create_window_proxy(&self) -> WindowProxy {
-        WindowProxy { hwnd: self.window.0 }
-    }
-
-    /// See the docs in the crate root file.
-    #[inline]
-    pub fn poll_events(&self) -> PollEventsIterator {
-        PollEventsIterator {
-            window: self,
-        }
-    }
-
-    /// See the docs in the crate root file.
-    #[inline]
-    pub fn wait_events(&self) -> WaitEventsIterator {
-        WaitEventsIterator {
-            window: self,
-        }
-    }
-
-    #[inline]
-    pub fn platform_display(&self) -> *mut ::libc::c_void {
-        // What should this return on win32?
-        // It could be GetDC(NULL), but that requires a ReleaseDC()
-        // to avoid leaking the DC.
-        ptr::null_mut()
-    }
-
-    #[inline]
-    pub fn platform_window(&self) -> *mut ::libc::c_void {
-        self.window.0 as *mut ::libc::c_void
-    }
-
-    #[inline]
-    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
-    }
-
-    #[inline]
-    pub fn set_cursor(&self, _cursor: MouseCursor) {
-        let cursor_id = match _cursor {
-            MouseCursor::Arrow | MouseCursor::Default => winapi::IDC_ARROW,
-            MouseCursor::Hand => winapi::IDC_HAND,
-            MouseCursor::Crosshair => winapi::IDC_CROSS,
-            MouseCursor::Text | MouseCursor::VerticalText => winapi::IDC_IBEAM,
-            MouseCursor::NotAllowed | MouseCursor::NoDrop => winapi::IDC_NO,
-            MouseCursor::EResize => winapi::IDC_SIZEWE,
-            MouseCursor::NResize => winapi::IDC_SIZENS,
-            MouseCursor::WResize => winapi::IDC_SIZEWE,
-            MouseCursor::SResize => winapi::IDC_SIZENS,
-            MouseCursor::EwResize | MouseCursor::ColResize => winapi::IDC_SIZEWE,
-            MouseCursor::NsResize | MouseCursor::RowResize => winapi::IDC_SIZENS,
-            MouseCursor::Wait | MouseCursor::Progress => winapi::IDC_WAIT,
-            MouseCursor::Help => winapi::IDC_HELP,
-            _ => winapi::IDC_ARROW, // use arrow for the missing cases.
-        };
-
-        let mut cur = self.window_state.lock().unwrap();
-        cur.cursor = cursor_id;
-    }
-
-
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
-        let mut current_state = self.window_state.lock().unwrap();
-
-        let foreground_thread_id = unsafe { user32::GetWindowThreadProcessId(self.window.0, ptr::null_mut()) };
-        let current_thread_id = unsafe { kernel32::GetCurrentThreadId() };
-
-        unsafe { user32::AttachThreadInput(foreground_thread_id, current_thread_id, 1) };
-
-        let res = match (state, current_state.cursor_state) {
-            (CursorState::Normal, CursorState::Normal) => Ok(()),
-            (CursorState::Hide, CursorState::Hide) => Ok(()),
-            (CursorState::Grab, CursorState::Grab) => Ok(()),
-
-            (CursorState::Hide, CursorState::Normal) => {
-                current_state.cursor_state = CursorState::Hide;
-                Ok(())
-            },
-
-            (CursorState::Normal, CursorState::Hide) => {
-                current_state.cursor_state = CursorState::Normal;
-                Ok(())
-            },
-
-            (CursorState::Grab, CursorState::Normal) | (CursorState::Grab, CursorState::Hide) => {
-                unsafe {
-                    let mut rect = mem::uninitialized();
-                    if user32::GetClientRect(self.window.0, &mut rect) == 0 {
-                        return Err(format!("GetWindowRect failed"));
-                    }
-                    user32::ClientToScreen(self.window.0, mem::transmute(&mut rect.left));
-                    user32::ClientToScreen(self.window.0, mem::transmute(&mut rect.right));
-                    if user32::ClipCursor(&rect) == 0 {
-                        return Err(format!("ClipCursor failed"));
-                    }
-                    current_state.cursor_state = CursorState::Grab;
-                    Ok(())
-                }
-            },
-
-            (CursorState::Normal, CursorState::Grab) => {
-                unsafe {
-                    if user32::ClipCursor(ptr::null()) == 0 {
-                        return Err(format!("ClipCursor failed"));
-                    }
-                    current_state.cursor_state = CursorState::Normal;
-                    Ok(())
-                }
-            },
-
-            _ => unimplemented!(),
-        };
-
-        unsafe { user32::AttachThreadInput(foreground_thread_id, current_thread_id, 0) };
-
-        res
-    }
-
-    #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        1.0
-    }
-
-    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
-        let mut point = winapi::POINT {
-            x: x,
-            y: y,
-        };
-
-        unsafe {
-            if user32::ClientToScreen(self.window.0, &mut point) == 0 {
-                return Err(());
-            }
-
-            if user32::SetCursorPos(point.x, point.y) == 0 {
-                return Err(());
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl Drop for Window {
-    #[inline]
-    fn drop(&mut self) {
-        unsafe {
-            user32::PostMessageW(self.window.0, winapi::WM_DESTROY, 0, 0);
-        }
-    }
-}
-
-pub struct PollEventsIterator<'a> {
-    window: &'a Window,
-}
-
-impl<'a> Iterator for PollEventsIterator<'a> {
-    type Item = Event;
-
-    #[inline]
-    fn next(&mut self) -> Option<Event> {
-        self.window.events_receiver.try_recv().ok()
-    }
-}
-
-pub struct WaitEventsIterator<'a> {
-    window: &'a Window,
-}
-
-impl<'a> Iterator for WaitEventsIterator<'a> {
-    type Item = Event;
-
-    #[inline]
-    fn next(&mut self) -> Option<Event> {
-        self.window.events_receiver.recv().ok()
-    }
-}
+mod raw_input;
+mod util;
+mod window;

src/platform/windows/monitor.rs

@@ -1,186 +1,173 @@
-use winapi;
-use user32;
+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 std::mem;
 
-use native_monitor::NativeMonitorId;
+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(Clone)]
+#[derive(Debug, Clone)]
 pub struct MonitorId {
-    /// The system name of the adapter.
-    adapter_name: [winapi::WCHAR; 32],
-
+    /// Monitor handle.
+    hmonitor: HMonitor,
     /// The system name of the monitor.
     monitor_name: String,
-
-    /// Name to give to the user.
-    readable_name: String,
-
-    /// See the `StateFlags` element here:
-    /// http://msdn.microsoft.com/en-us/library/dd183569(v=vs.85).aspx
-    flags: winapi::DWORD,
-
     /// True if this is the primary monitor.
     primary: bool,
-
     /// The position of the monitor in pixels on the desktop.
     ///
-    /// A window that is positionned at these coordinates will overlap the monitor.
-    position: (u32, u32),
-
+    /// 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,
 }
 
-struct DeviceEnumerator {
-    parent_device: *const winapi::WCHAR,
-    current_index: u32,
+// 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
 }
 
-impl DeviceEnumerator {
-    fn adapters() -> DeviceEnumerator {
-        use std::ptr;
-        DeviceEnumerator {
-            parent_device: ptr::null(),
-            current_index: 0
-        }
-    }
-
-    fn monitors(adapter_name: *const winapi::WCHAR) -> DeviceEnumerator {
-        DeviceEnumerator {
-            parent_device: adapter_name,
-            current_index: 0
-        }
-    }
-}
-
-impl Iterator for DeviceEnumerator {
-    type Item = winapi::DISPLAY_DEVICEW;
-    fn next(&mut self) -> Option<winapi::DISPLAY_DEVICEW> {
-        use std::mem;
-        loop {
-            let mut output: winapi::DISPLAY_DEVICEW = unsafe { mem::zeroed() };
-            output.cb = mem::size_of::<winapi::DISPLAY_DEVICEW>() as winapi::DWORD;
-
-            if unsafe { user32::EnumDisplayDevicesW(self.parent_device,
-                self.current_index as winapi::DWORD, &mut output, 0) } == 0
-            {
-                // the device doesn't exist, which means we have finished enumerating
-                break;
-            }
-            self.current_index += 1;
-
-            if  (output.StateFlags & winapi::DISPLAY_DEVICE_ACTIVE) == 0 ||
-                (output.StateFlags & winapi::DISPLAY_DEVICE_MIRRORING_DRIVER) != 0
-            {
-                // the device is not active
-                // the Win32 api usually returns a lot of inactive devices
-                continue;
-            }
-
-            return Some(output);
-        }
-        None
-    }
-}
-
-fn wchar_as_string(wchar: &[winapi::WCHAR]) -> String {
-    String::from_utf16_lossy(wchar)
-        .trim_right_matches(0 as char)
-        .to_string()
-}
-
-/// Win32 implementation of the main `get_available_monitors` function.
 pub fn get_available_monitors() -> VecDeque<MonitorId> {
-    // return value
-    let mut result = VecDeque::new();
-
-    for adapter in DeviceEnumerator::adapters() {
-        // getting the position
-        let (position, dimensions) = unsafe {
-            let mut dev: winapi::DEVMODEW = mem::zeroed();
-            dev.dmSize = mem::size_of::<winapi::DEVMODEW>() as winapi::WORD;
-
-            if user32::EnumDisplaySettingsExW(adapter.DeviceName.as_ptr(), 
-                winapi::ENUM_CURRENT_SETTINGS,
-                &mut dev, 0) == 0
-            {
-                continue;
-            }
-
-            let point: &winapi::POINTL = mem::transmute(&dev.union1);
-            let position = (point.x as u32, point.y as u32);
-
-            let dimensions = (dev.dmPelsWidth as u32, dev.dmPelsHeight as u32);
-
-            (position, dimensions)
-        };
-
-        for (num, monitor) in DeviceEnumerator::monitors(adapter.DeviceName.as_ptr()).enumerate() {
-            // adding to the resulting list
-            result.push_back(MonitorId {
-                adapter_name: adapter.DeviceName,
-                monitor_name: wchar_as_string(&monitor.DeviceName),
-                readable_name: wchar_as_string(&monitor.DeviceString),
-                flags: monitor.StateFlags,
-                primary: (adapter.StateFlags & winapi::DISPLAY_DEVICE_PRIMARY_DEVICE) != 0 &&
-                         num == 0,
-                position: position,
-                dimensions: dimensions,
-            });
-        }
+    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,
+        );
     }
-    result
+    monitors
 }
 
-/// Win32 implementation of the main `get_primary_monitor` function.
 pub fn get_primary_monitor() -> MonitorId {
-    // we simply get all available monitors and return the one with the `PRIMARY_DEVICE` flag
-    // TODO: it is possible to query the win32 API for the primary monitor, this should be done
-    //  instead
-    for monitor in get_available_monitors().into_iter() {
-        if monitor.primary {
-            return monitor;
-        }
+    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()
     }
 
-    panic!("Failed to find the primary monitor")
+    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 {
-    /// See the docs if the crate root file.
+    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.readable_name.clone())
+        Some(self.monitor_name.clone())
     }
 
-    /// See the docs of the crate root file.
     #[inline]
-    pub fn get_native_identifier(&self) -> NativeMonitorId {
-        NativeMonitorId::Name(self.monitor_name.clone())
+    pub fn get_native_identifier(&self) -> String {
+        self.monitor_name.clone()
     }
 
-    /// See the docs if the crate root file.
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        // TODO: retreive the dimensions every time this is called
-        self.dimensions
+    pub fn get_hmonitor(&self) -> HMONITOR {
+        self.hmonitor.0
     }
 
-    /// This is a Win32-only function for `MonitorId` that returns the system name of the adapter
-    /// device.
     #[inline]
-    pub fn get_adapter_name(&self) -> &[winapi::WCHAR] {
-        &self.adapter_name
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.dimensions.into()
     }
 
-    /// This is a Win32-only function for `MonitorId` that returns the position of the
-    ///  monitor on the desktop.
-    /// A window that is positionned at these coordinates will overlap the monitor.
     #[inline]
-    pub fn get_position(&self) -> (u32, u32) {
-        self.position
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.position.into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.hidpi_factor
     }
 }

src/platform/windows/raw_input.rs

@@ -0,0 +1,235 @@
+use std::mem::{self, size_of};
+use std::ptr;
+
+use winapi::ctypes::wchar_t;
+use winapi::shared::minwindef::{UINT, USHORT, TRUE};
+use winapi::shared::hidusage::{
+    HID_USAGE_PAGE_GENERIC,
+    HID_USAGE_GENERIC_MOUSE,
+    HID_USAGE_GENERIC_KEYBOARD,
+};
+use winapi::shared::windef::HWND;
+use winapi::um::winnt::HANDLE;
+use winapi::um::winuser::{
+    self,
+    RAWINPUTDEVICELIST,
+    RID_DEVICE_INFO,
+    RID_DEVICE_INFO_MOUSE,
+    RID_DEVICE_INFO_KEYBOARD,
+    RID_DEVICE_INFO_HID,
+    RIM_TYPEMOUSE,
+    RIM_TYPEKEYBOARD,
+    RIM_TYPEHID,
+    RIDI_DEVICEINFO,
+    RIDI_DEVICENAME,
+    RAWINPUTDEVICE,
+    RIDEV_DEVNOTIFY,
+    RIDEV_INPUTSINK,
+    HRAWINPUT,
+    RAWINPUT,
+    RAWINPUTHEADER,
+    RID_INPUT,
+};
+
+use platform::platform::util;
+use events::ElementState;
+
+#[allow(dead_code)]
+pub fn get_raw_input_device_list() -> Option<Vec<RAWINPUTDEVICELIST>> {
+    let list_size = size_of::<RAWINPUTDEVICELIST>() as UINT;
+
+    let mut num_devices = 0;
+    let status = unsafe { winuser::GetRawInputDeviceList(
+        ptr::null_mut(),
+        &mut num_devices,
+        list_size,
+    ) };
+
+    if status == UINT::max_value() {
+        return None;
+    }
+
+    let mut buffer = Vec::with_capacity(num_devices as _);
+
+    let num_stored = unsafe { winuser::GetRawInputDeviceList(
+        buffer.as_ptr() as _,
+        &mut num_devices,
+        list_size,
+    ) };
+
+    if num_stored == UINT::max_value() {
+        return None;
+    }
+
+    debug_assert_eq!(num_devices, num_stored);
+
+    unsafe { buffer.set_len(num_devices as _) };
+
+    Some(buffer)
+}
+
+#[allow(dead_code)]
+pub enum RawDeviceInfo {
+    Mouse(RID_DEVICE_INFO_MOUSE),
+    Keyboard(RID_DEVICE_INFO_KEYBOARD),
+    Hid(RID_DEVICE_INFO_HID),
+}
+
+impl From<RID_DEVICE_INFO> for RawDeviceInfo {
+    fn from(info: RID_DEVICE_INFO) -> Self {
+        unsafe {
+            match info.dwType {
+                RIM_TYPEMOUSE => RawDeviceInfo::Mouse(*info.u.mouse()),
+                RIM_TYPEKEYBOARD => RawDeviceInfo::Keyboard(*info.u.keyboard()),
+                RIM_TYPEHID => RawDeviceInfo::Hid(*info.u.hid()),
+                _ => unreachable!(),
+            }
+        }
+    }
+}
+
+#[allow(dead_code)]
+pub fn get_raw_input_device_info(handle: HANDLE) -> Option<RawDeviceInfo> {
+    let mut info: RID_DEVICE_INFO = unsafe { mem::uninitialized() };
+    let info_size = size_of::<RID_DEVICE_INFO>() as UINT;
+
+    info.cbSize = info_size;
+
+    let mut minimum_size = 0;
+    let status = unsafe { winuser::GetRawInputDeviceInfoW(
+        handle,
+        RIDI_DEVICEINFO,
+        &mut info as *mut _ as _,
+        &mut minimum_size,
+    ) };
+
+    if status == UINT::max_value() || status == 0 {
+        return None;
+    }
+
+    debug_assert_eq!(info_size, status);
+
+    Some(info.into())
+}
+
+pub fn get_raw_input_device_name(handle: HANDLE) -> Option<String> {
+    let mut minimum_size = 0;
+    let status = unsafe { winuser::GetRawInputDeviceInfoW(
+        handle,
+        RIDI_DEVICENAME,
+        ptr::null_mut(),
+        &mut minimum_size,
+    ) };
+
+    if status != 0 {
+        return None;
+    }
+
+    let mut name: Vec<wchar_t> = Vec::with_capacity(minimum_size as _);
+
+    let status = unsafe { winuser::GetRawInputDeviceInfoW(
+        handle,
+        RIDI_DEVICENAME,
+        name.as_ptr() as _,
+        &mut minimum_size,
+    ) };
+
+    if status == UINT::max_value() || status == 0 {
+        return None;
+    }
+
+    debug_assert_eq!(minimum_size, status);
+
+    unsafe { name.set_len(minimum_size as _) };
+
+    Some(util::wchar_to_string(&name))
+}
+
+pub fn register_raw_input_devices(devices: &[RAWINPUTDEVICE]) -> bool {
+    let device_size = size_of::<RAWINPUTDEVICE>() as UINT;
+
+    let success = unsafe { winuser::RegisterRawInputDevices(
+        devices.as_ptr() as _,
+        devices.len() as _,
+        device_size,
+    ) };
+
+    success == TRUE
+}
+
+pub fn register_all_mice_and_keyboards_for_raw_input(window_handle: HWND) -> bool {
+    // RIDEV_DEVNOTIFY: receive hotplug events
+    // RIDEV_INPUTSINK: receive events even if we're not in the foreground
+    let flags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK;
+
+    let devices: [RAWINPUTDEVICE; 2] = [
+        RAWINPUTDEVICE {
+            usUsagePage: HID_USAGE_PAGE_GENERIC,
+            usUsage: HID_USAGE_GENERIC_MOUSE,
+            dwFlags: flags,
+            hwndTarget: window_handle,
+        },
+        RAWINPUTDEVICE {
+            usUsagePage: HID_USAGE_PAGE_GENERIC,
+            usUsage: HID_USAGE_GENERIC_KEYBOARD,
+            dwFlags: flags,
+            hwndTarget: window_handle,
+        },
+    ];
+
+    register_raw_input_devices(&devices)
+}
+
+pub fn get_raw_input_data(handle: HRAWINPUT) -> Option<RAWINPUT> {
+    let mut data: RAWINPUT = unsafe { mem::uninitialized() };
+    let mut data_size = size_of::<RAWINPUT>() as UINT;
+    let header_size = size_of::<RAWINPUTHEADER>() as UINT;
+
+    let status = unsafe { winuser::GetRawInputData(
+        handle,
+        RID_INPUT,
+        &mut data as *mut _  as _,
+        &mut data_size,
+        header_size,
+    ) };
+
+    if status == UINT::max_value() || status == 0 {
+        return None;
+    }
+
+    Some(data)
+}
+
+
+fn button_flags_to_element_state(button_flags: USHORT, down_flag: USHORT, up_flag: USHORT)
+    -> Option<ElementState>
+{
+    // We assume the same button won't be simultaneously pressed and released.
+    if util::has_flag(button_flags, down_flag) {
+        Some(ElementState::Pressed)
+    } else if util::has_flag(button_flags, up_flag) {
+        Some(ElementState::Released)
+    } else {
+        None
+    }
+}
+
+pub fn get_raw_mouse_button_state(button_flags: USHORT) -> [Option<ElementState>; 3] {
+    [
+        button_flags_to_element_state(
+            button_flags,
+            winuser::RI_MOUSE_LEFT_BUTTON_DOWN,
+            winuser::RI_MOUSE_LEFT_BUTTON_UP,
+        ),
+        button_flags_to_element_state(
+            button_flags,
+            winuser::RI_MOUSE_MIDDLE_BUTTON_DOWN,
+            winuser::RI_MOUSE_MIDDLE_BUTTON_UP,
+        ),
+        button_flags_to_element_state(
+            button_flags,
+            winuser::RI_MOUSE_RIGHT_BUTTON_DOWN,
+            winuser::RI_MOUSE_RIGHT_BUTTON_UP,
+        ),
+    ]
+}

src/platform/windows/util.rs

@@ -0,0 +1,104 @@
+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/window.rs

@@ -1,16 +1,19 @@
 use std::collections::vec_deque::IntoIter as VecDequeIter;
 
-use CreationError;
-use CursorState;
-use EventsLoop;
-use MouseCursor;
-use Window;
-use WindowBuilder;
-use WindowId;
-use native_monitor::NativeMonitorId;
-
-use libc;
-use platform;
+use {
+    CreationError,
+    EventsLoop,
+    Icon,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    platform,
+    Window,
+    WindowBuilder,
+    WindowId,
+};
 
 impl WindowBuilder {
     /// Initializes a new `WindowBuilder` with default values.
@@ -23,29 +26,39 @@ impl WindowBuilder {
     }
 
     /// Requests the window to be of specific dimensions.
-    ///
-    /// Width and height are in pixels.
     #[inline]
-    pub fn with_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
-        self.window.dimensions = Some((width, height));
+    pub fn with_dimensions(mut self, size: LogicalSize) -> WindowBuilder {
+        self.window.dimensions = Some(size);
         self
     }
-    
+
     /// Sets a minimum dimension size for the window
-    ///
-    /// Width and height are in pixels.
     #[inline]
-    pub fn with_min_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
-        self.window.min_dimensions = Some((width, height));
+    pub fn with_min_dimensions(mut self, min_size: LogicalSize) -> WindowBuilder {
+        self.window.min_dimensions = Some(min_size);
         self
     }
 
     /// Sets a maximum dimension size for the window
-    ///
-    /// Width and height are in pixels.
     #[inline]
-    pub fn with_max_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
-        self.window.max_dimensions = Some((width, height));
+    pub fn with_max_dimensions(mut self, max_size: LogicalSize) -> WindowBuilder {
+        self.window.max_dimensions = Some(max_size);
+        self
+    }
+
+    /// Sets whether the window is resizable or not
+    ///
+    /// Note that making the window unresizable doesn't exempt you from handling `Resized`, as that event can still be
+    /// triggered by DPI scaling, entering fullscreen mode, etc.
+    ///
+    /// ## Platform-specific
+    ///
+    /// This only has an effect on desktop platforms.
+    ///
+    /// Due to a bug in XFCE, this has no effect on Xfwm.
+    #[inline]
+    pub fn with_resizable(mut self, resizable: bool) -> WindowBuilder {
+        self.window.resizable = resizable;
         self
     }
 
@@ -56,13 +69,18 @@ impl WindowBuilder {
         self
     }
 
-    /// Requests fullscreen mode.
-    ///
-    /// If you don't specify dimensions for the window, it will match the monitor's.
+    /// Sets the window fullscreen state. None means a normal window, Some(MonitorId)
+    /// means a fullscreen window on that specific monitor
     #[inline]
-    pub fn with_fullscreen(mut self, monitor: MonitorId) -> WindowBuilder {
-        let MonitorId(monitor) = monitor;
-        self.window.monitor = Some(monitor);
+    pub fn with_fullscreen(mut self, monitor: Option<MonitorId>) -> WindowBuilder {
+        self.window.fullscreen = monitor;
+        self
+    }
+
+    /// Requests maximized mode.
+    #[inline]
+    pub fn with_maximized(mut self, maximized: bool) -> WindowBuilder {
+        self.window.maximized = maximized;
         self
     }
 
@@ -87,7 +105,32 @@ impl WindowBuilder {
         self
     }
 
-    /// Enables multitouch
+    /// Sets whether or not the window will always be on top of other windows.
+    #[inline]
+    pub fn with_always_on_top(mut self, always_on_top: bool) -> WindowBuilder {
+        self.window.always_on_top = always_on_top;
+        self
+    }
+
+    /// Sets the window icon. On Windows and X11, this is typically the small icon in the top-left
+    /// corner of the titlebar.
+    ///
+    /// ## Platform-specific
+    ///
+    /// This only has an effect on Windows and X11.
+    ///
+    /// On Windows, this sets `ICON_SMALL`. The base size for a window icon is 16x16, but it's
+    /// recommended to account for screen scaling and pick a multiple of that, i.e. 32x32.
+    ///
+    /// X11 has no universal guidelines for icon sizes, so you're at the whims of the WM. That
+    /// said, it's usually in the same ballpark as on Windows.
+    #[inline]
+    pub fn with_window_icon(mut self, window_icon: Option<Icon>) -> WindowBuilder {
+        self.window.window_icon = window_icon;
+        self
+    }
+
+    /// Enables multitouch.
     #[inline]
     pub fn with_multitouch(mut self) -> WindowBuilder {
         self.window.multitouch = true;
@@ -98,26 +141,29 @@ impl WindowBuilder {
     ///
     /// Error should be very rare and only occur in case of permission denied, incompatible system,
     /// out of memory, etc.
+    #[inline]
     pub fn build(mut self, events_loop: &EventsLoop) -> Result<Window, CreationError> {
-        // resizing the window to the dimensions of the monitor when fullscreen
-        if self.window.dimensions.is_none() && self.window.monitor.is_some() {
-            self.window.dimensions = Some(self.window.monitor.as_ref().unwrap().get_dimensions())
-        }
-
-        // default dimensions
-        if self.window.dimensions.is_none() {
-            self.window.dimensions = Some((1024, 768));
-        }
+        self.window.dimensions = Some(self.window.dimensions.unwrap_or_else(|| {
+            if let Some(ref monitor) = self.window.fullscreen {
+                // resizing the window to the dimensions of the monitor when fullscreen
+                LogicalSize::from_physical(monitor.get_dimensions(), 1.0)
+            } else {
+                // default dimensions
+                (1024, 768).into()
+            }
+        }));
 
         // building
-        let w = try!(platform::Window2::new(events_loop.events_loop.clone(), &self.window, &self.platform_specific));
-
-        Ok(Window { window: w })
+        platform::Window::new(
+            &events_loop.events_loop,
+            self.window,
+            self.platform_specific,
+        ).map(|window| Window { window })
     }
 }
 
 impl Window {
-    /// Creates a new OpenGL context, and a Window for platforms where this is appropriate.
+    /// Creates a new Window for platforms where this is appropriate.
     ///
     /// This function is equivalent to `WindowBuilder::new().build(events_loop)`.
     ///
@@ -171,125 +217,210 @@ impl Window {
     ///
     /// Returns `None` if the window no longer exists.
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
         self.window.get_position()
     }
 
+    /// Returns the position of the top-left hand corner of the window's client area relative to the
+    /// top-left hand corner of the desktop.
+    ///
+    /// The same conditions that apply to `get_position` apply to this method.
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        self.window.get_inner_position()
+    }
+
     /// Modifies the position of the window.
     ///
-    /// See `get_position` for more informations about the coordinates.
+    /// See `get_position` for more information about the coordinates.
     ///
     /// This is a no-op if the window has already been closed.
     #[inline]
-    pub fn set_position(&self, x: i32, y: i32) {
-        self.window.set_position(x, y)
+    pub fn set_position(&self, position: LogicalPosition) {
+        self.window.set_position(position)
     }
 
-    /// Returns the size in points of the client area of the window.
+    /// Returns the logical size of the window's client area.
     ///
     /// The client area is the content of the window, excluding the title bar and borders.
-    /// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
     ///
-    /// Returns `None` if the window no longer exists.
-    ///
-    /// DEPRECATED
-    #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        self.window.get_inner_size()
-    }
-    
-    /// Returns the size in points of the client area of the window.
-    ///
-    /// The client area is the content of the window, excluding the title bar and borders.
-    /// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
+    /// Converting the returned `LogicalSize` to `PhysicalSize` produces the size your framebuffer should be.
     ///
     /// Returns `None` if the window no longer exists.
     #[inline]
-    pub fn get_inner_size_points(&self) -> Option<(u32, u32)> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         self.window.get_inner_size()
     }
 
-
-    /// Returns the size in pixels of the client area of the window.
+    /// Returns the logical size of the entire window.
     ///
-    /// The client area is the content of the window, excluding the title bar and borders.
-    /// These are the dimensions of the frame buffer, and the dimensions that you should use
-    ///  when you call `glViewport`.
+    /// These dimensions include the title bar and borders. If you don't want that (and you usually don't),
+    /// use `get_inner_size` instead.
     ///
     /// Returns `None` if the window no longer exists.
     #[inline]
-    pub fn get_inner_size_pixels(&self) -> Option<(u32, u32)> {
-        self.window.get_inner_size().map(|(x, y)| {
-            let hidpi = self.hidpi_factor();
-            ((x as f32 * hidpi) as u32, (y as f32 * hidpi) as u32)
-        })
-    }
-
-    /// Returns the size in pixels of the window.
-    ///
-    /// These dimensions include title bar and borders. If you don't want these, you should use
-    ///  use `get_inner_size` instead.
-    ///
-    /// Returns `None` if the window no longer exists.
-    #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
         self.window.get_outer_size()
     }
 
     /// Modifies the inner size of the window.
     ///
-    /// See `get_inner_size` for more informations about the values.
+    /// See `get_inner_size` for more information about the values.
     ///
     /// This is a no-op if the window has already been closed.
     #[inline]
-    pub fn set_inner_size(&self, x: u32, y: u32) {
-        self.window.set_inner_size(x, y)
+    pub fn set_inner_size(&self, size: LogicalSize) {
+        self.window.set_inner_size(size)
     }
 
-    /// DEPRECATED. Gets the native platform specific display for this window.
-    /// This is typically only required when integrating with
-    /// other libraries that need this information.
-    #[deprecated]
+    /// Sets a minimum dimension size for the window.
     #[inline]
-    pub unsafe fn platform_display(&self) -> *mut libc::c_void {
-        self.window.platform_display()
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.window.set_min_dimensions(dimensions)
     }
 
-    /// DEPRECATED. Gets the native platform specific window handle. This is
-    /// typically only required when integrating with other libraries
-    /// that need this information.
-    #[deprecated]
+    /// Sets a maximum dimension size for the window.
     #[inline]
-    pub unsafe fn platform_window(&self) -> *mut libc::c_void {
-        self.window.platform_window()
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.window.set_max_dimensions(dimensions)
+    }
+
+    /// Sets whether the window is resizable or not.
+    ///
+    /// Note that making the window unresizable doesn't exempt you from handling `Resized`, as that event can still be
+    /// triggered by DPI scaling, entering fullscreen mode, etc.
+    ///
+    /// ## Platform-specific
+    ///
+    /// This only has an effect on desktop platforms.
+    ///
+    /// Due to a bug in XFCE, this has no effect on Xfwm.
+    #[inline]
+    pub fn set_resizable(&self, resizable: bool) {
+        self.window.set_resizable(resizable)
+    }
+
+    /// 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.
+    ///
+    /// Note that this value can change depending on user action (for example if the window is
+    /// moved to another screen); as such, tracking `WindowEvent::HiDpiFactorChanged` events is
+    /// the most robust way to track the DPI you need to use to draw.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **X11:** Can be overridden using the `WINIT_HIDPI_FACTOR` environment variable.
+    /// - **Android:** Always returns 1.0.
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.window.get_hidpi_factor()
     }
 
     /// Modifies the mouse cursor of the window.
     /// Has no effect on Android.
+    #[inline]
     pub fn set_cursor(&self, cursor: MouseCursor) {
         self.window.set_cursor(cursor);
     }
 
-    /// Returns the ratio between the backing framebuffer resolution and the
-    /// window size in screen pixels. This is typically one for a normal display
-    /// and two for a retina display.
-    #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        self.window.hidpi_factor()
-    }
-
     /// Changes the position of the cursor in window coordinates.
     #[inline]
-    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
-        self.window.set_cursor_position(x, y)
+    pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), String> {
+        self.window.set_cursor_position(position)
     }
 
-    /// Sets how glutin handles the cursor. See the documentation of `CursorState` for details.
+    /// Grabs the cursor, preventing it from leaving the window.
     ///
-    /// Has no effect on Android.
+    /// ## Platform-specific
+    ///
+    /// On macOS, this presently merely locks the cursor in a fixed location, which looks visually awkward.
+    ///
+    /// This has no effect on Android or iOS.
     #[inline]
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
-        self.window.set_cursor_state(state)
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
+        self.window.grab_cursor(grab)
+    }
+
+    /// Hides the cursor, making it invisible but still usable.
+    ///
+    /// ## Platform-specific
+    ///
+    /// On Windows and X11, the cursor is only hidden within the confines of the window.
+    ///
+    /// On macOS, the cursor is hidden as long as the window has input focus, even if the cursor is outside of the
+    /// window.
+    ///
+    /// This has no effect on Android or iOS.
+    #[inline]
+    pub fn hide_cursor(&self, hide: bool) {
+        self.window.hide_cursor(hide)
+    }
+
+    /// Sets the window to maximized or back
+    #[inline]
+    pub fn set_maximized(&self, maximized: bool) {
+        self.window.set_maximized(maximized)
+    }
+
+    /// Sets the window to fullscreen or back
+    #[inline]
+    pub fn set_fullscreen(&self, monitor: Option<MonitorId>) {
+        self.window.set_fullscreen(monitor)
+    }
+
+    /// Turn window decorations on or off.
+    #[inline]
+    pub fn set_decorations(&self, decorations: bool) {
+        self.window.set_decorations(decorations)
+    }
+
+    /// Change whether or not the window will always be on top of other windows.
+    #[inline]
+    pub fn set_always_on_top(&self, always_on_top: bool) {
+        self.window.set_always_on_top(always_on_top)
+    }
+
+    /// Sets the window icon. On Windows and X11, this is typically the small icon in the top-left
+    /// corner of the titlebar.
+    ///
+    /// For more usage notes, see `WindowBuilder::with_window_icon`.
+    ///
+    /// ## Platform-specific
+    ///
+    /// This only has an effect on Windows and X11.
+    #[inline]
+    pub fn set_window_icon(&self, window_icon: Option<Icon>) {
+        self.window.set_window_icon(window_icon)
+    }
+
+    /// Sets location of IME candidate box in client area coordinates relative to the top left.
+    #[inline]
+    pub fn set_ime_spot(&self, position: LogicalPosition) {
+        self.window.set_ime_spot(position)
+    }
+
+    /// Returns the monitor on which the window currently resides
+    #[inline]
+    pub fn get_current_monitor(&self) -> MonitorId {
+        self.window.get_current_monitor()
+    }
+
+    /// Returns the list of all the monitors available on the system.
+    ///
+    /// This is the same as `EventsLoop::get_available_monitors`, and is provided for convenience.
+    #[inline]
+    pub fn get_available_monitors(&self) -> AvailableMonitorsIter {
+        let data = self.window.get_available_monitors();
+        AvailableMonitorsIter { data: data.into_iter() }
+    }
+
+    /// Returns the primary monitor of the system.
+    ///
+    /// This is the same as `EventsLoop::get_primary_monitor`, and is provided for convenience.
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId { inner: self.window.get_primary_monitor() }
     }
 
     #[inline]
@@ -299,10 +430,11 @@ impl Window {
 }
 
 /// An iterator for the list of available monitors.
-// Implementation note: we retreive the list once, then serve each element by one by one.
+// 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 {
-    data: VecDequeIter<platform::MonitorId>,
+    pub(crate) data: VecDequeIter<platform::MonitorId>,
 }
 
 impl Iterator for AvailableMonitorsIter {
@@ -310,7 +442,7 @@ impl Iterator for AvailableMonitorsIter {
 
     #[inline]
     fn next(&mut self) -> Option<MonitorId> {
-        self.data.next().map(|id| MonitorId(id))
+        self.data.next().map(|id| MonitorId { inner: id })
     }
 
     #[inline]
@@ -319,41 +451,44 @@ impl Iterator for AvailableMonitorsIter {
     }
 }
 
-/// Returns the list of all available monitors.
-#[inline]
-pub fn get_available_monitors() -> AvailableMonitorsIter {
-    let data = platform::get_available_monitors();
-    AvailableMonitorsIter{ data: data.into_iter() }
-}
-
-/// Returns the primary monitor of the system.
-#[inline]
-pub fn get_primary_monitor() -> MonitorId {
-    MonitorId(platform::get_primary_monitor())
-}
-
 /// Identifier for a monitor.
-pub struct MonitorId(platform::MonitorId);
+#[derive(Debug, Clone)]
+pub struct MonitorId {
+    pub(crate) inner: platform::MonitorId
+}
 
 impl MonitorId {
     /// Returns a human-readable name of the monitor.
+    ///
+    /// Returns `None` if the monitor doesn't exist anymore.
     #[inline]
     pub fn get_name(&self) -> Option<String> {
-        let &MonitorId(ref id) = self;
-        id.get_name()
+        self.inner.get_name()
     }
 
-    /// Returns the native platform identifier for this monitor.
+    /// Returns the monitor's resolution.
     #[inline]
-    pub fn get_native_identifier(&self) -> NativeMonitorId {
-        let &MonitorId(ref id) = self;
-        id.get_native_identifier()
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.inner.get_dimensions()
     }
 
-    /// Returns the number of pixels currently displayed on the monitor.
+    /// Returns the top-left corner position of the monitor relative to the larger full
+    /// screen area.
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        let &MonitorId(ref id) = self;
-        id.get_dimensions()
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.inner.get_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 get_hidpi_factor(&self) -> f64 {
+        self.inner.get_hidpi_factor()
     }
 }

tests/events_loop.rs

@@ -1,10 +0,0 @@
-extern crate winit;
-
-// A part of the API requirement for `EventsLoop` is that it is `Send` + `Sync`.
-//
-// This short test will only compile if the `EventsLoop` is `Send` + `Sync`. 
-#[test]
-fn send_sync() {
-    fn check_send_sync<T: Send + Sync>() {}
-    check_send_sync::<winit::EventsLoop>();
-}

tests/send_objects.rs

@@ -0,0 +1,23 @@
+extern crate winit;
+
+fn needs_send<T:Send>() {}
+
+#[test]
+fn events_loop_proxy_send() {
+    // ensures that `winit::EventsLoopProxy` implements `Send`
+    needs_send::<winit::EventsLoopProxy>();
+}
+
+#[test]
+fn window_send() {
+    // ensures that `winit::Window` implements `Send`
+    needs_send::<winit::Window>();
+}
+
+#[test]
+fn ids_send() {
+    // ensures that the various `..Id` types implement `Send`
+    needs_send::<winit::WindowId>();
+    needs_send::<winit::DeviceId>();
+    needs_send::<winit::MonitorId>();
+}

tests/sync_object.rs

@@ -0,0 +1,9 @@
+extern crate winit;
+
+fn needs_sync<T:Sync>() {}
+
+#[test]
+fn window_sync() {
+    // ensures that `winit::Window` implements `Sync`
+    needs_sync::<winit::Window>();
+}

tests/window_proxy_send.rs

@@ -1,9 +0,0 @@
-extern crate winit;
-
-#[cfg(feature = "window")]
-#[test]
-fn window_proxy_send() {
-    // ensures that `winit::WindowProxy` implements `Send`
-    fn needs_send<T:Send>() {}
-    needs_send::<winit::WindowProxy>();
-}