Update parking_lot and bump version (#593)

* Disabled maximize button

When creating a non resizable window in win32.
Also added example code to test.

* Added to changelog

* Added to documentation

* Removed non_resizable test

* Other suggested PR changes

* Documentation changes

* CHANGELOG nits

.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

@@ -19,6 +19,12 @@ matrix:
       addons:
         apt:
           packages: *i686_packages
+    - env: TARGET=i686-unknown-linux-gnu
+      os: linux
+      rust: 1.24.1
+      addons:
+        apt:
+          packages: *i686_packages
 
     # Linux 64bit
     - env: TARGET=x86_64-unknown-linux-gnu
@@ -27,6 +33,9 @@ matrix:
     - env: TARGET=x86_64-unknown-linux-gnu
       os: linux
       rust: stable
+    - env: TARGET=x86_64-unknown-linux-gnu
+      os: linux
+      rust: 1.24.1
 
     # macOS
     - env: TARGET=x86_64-apple-darwin
@@ -35,6 +44,9 @@ matrix:
     - env: TARGET=x86_64-apple-darwin
       os: osx
       rust: stable
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: 1.24.1
 
     # iOS
     - env: TARGET=x86_64-apple-ios
@@ -43,6 +55,9 @@ matrix:
     - env: TARGET=x86_64-apple-ios
       os: osx
       rust: stable
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: 1.24.1
 
 install:
   - rustup self update

CHANGELOG.md

@@ -1,5 +1,107 @@
 # Unreleased
 
+# 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.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "winit"
-version = "0.13.0"
+version = "0.16.2"
 authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
 keywords = ["windowing"]
@@ -10,9 +10,17 @@ 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 = "1"
 libc = "0.2"
+log = "0.4"
+image = { version = "0.19", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.2"
@@ -22,31 +30,32 @@ objc = "0.2"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
-cocoa = "0.14"
-core-foundation = "0.5"
-core-graphics = "0.13"
+cocoa = "0.15"
+core-foundation = "0.6"
+core-graphics = "0.14"
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
-version = "0.3"
+version = "0.3.5"
 features = [
+    "combaseapi",
+    "dwmapi",
+    "hidusage",
+    "libloaderapi",
+    "objbase",
+    "processthreadsapi",
+    "shellapi",
+    "shellscalingapi",
+    "shobjidl_core",
+    "unknwnbase",
+    "windowsx",
+    "wingdi",
     "winnt",
     "winuser",
-    "wingdi",
-    "shellapi",
-    "dwmapi",
-    "processthreadsapi",
-    "libloaderapi",
-    "windowsx",
-    "hidusage",
-    "combaseapi",
-    "objbase",
-    "unknwnbase",
 ]
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
-wayland-client = { version = "0.12.0", features = ["dlopen"] }
-wayland-protocols = { version = "0.12.0", features = ["unstable_protocols"] }
-wayland-kbd = "0.13.0"
-wayland-window = "0.13.0"
-x11-dl = "2.17"
+wayland-client = { version = "0.20.6", features = [ "dlopen", "egl", "cursor"] }
+smithay-client-toolkit = "0.2.2"
+x11-dl = "2.17.5"
+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.13"
+winit = "0.16"
 ```
 
 ## [Documentation](https://docs.rs/winit)

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

@@ -8,7 +8,7 @@ fn main() {
     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| {

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/grabbing.rs

@@ -1,45 +0,0 @@
-extern crate winit;
-
-use winit::{ControlFlow, WindowEvent, ElementState, KeyboardInput};
-
-fn main() {
-    let mut 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 { input: KeyboardInput { state: 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::CloseRequested => return ControlFlow::Break,
-
-                    a @ WindowEvent::CursorMoved { .. } => {
-                        println!("{:?}", a);
-                    },
-
-                    _ => (),
-                }
-            }
-            _ => {}
-        }
-
-        ControlFlow::Continue
-    });
-}

examples/min_max_size.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+use winit::dpi::LogicalSize;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
@@ -7,8 +9,8 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
-    window.set_min_dimensions(Some((400, 200)));
-    window.set_max_dimensions(Some((800, 400)));
+    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);

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/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/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/dpi.rs

@@ -0,0 +1,307 @@
+
+//! 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: either by calling
+//! [`MonitorId::get_hidpi_factor`](../struct.MonitorId.html#method.get_hidpi_factor), or
+//! [`Window::get_hidpi_factor`](../struct.Window.html#method.get_hidpi_factor). You'll almost always use the latter,
+//! which is basically equivalent to `window.get_current_monitor().get_hidpi_factor()` anyway.
+//!
+//! 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,5 +1,6 @@
 use std::path::PathBuf;
-use {WindowId, DeviceId};
+
+use {DeviceId, LogicalPosition, LogicalSize, WindowId};
 
 /// Describes a generic event.
 #[derive(Clone, Debug)]
@@ -23,12 +24,11 @@ pub enum Event {
 /// 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 size of the window has changed.
-    Resized(u32, u32),
-
-    /// The position of the window has changed.
-    Moved(i32, i32),
+    /// The position of the window has changed. Contains the window's new position.
+    Moved(LogicalPosition),
 
     /// The window has been requested to close.
     CloseRequested,
@@ -63,7 +63,7 @@ pub enum WindowEvent {
         /// (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: (f64, f64),
+        position: LogicalPosition,
         modifiers: ModifiersState
     },
 
@@ -96,14 +96,16 @@ pub enum WindowEvent {
     /// Touch event has been received
     Touch(Touch),
 
-    /// DPI scaling factor of the window has changed.
+    /// The DPI factor of the window has changed.
     ///
-    /// The following actions cause DPI changes:
+    /// The following user actions can cause DPI changes:
     ///
-    /// * A user changes the resolution.
-    /// * A user changes the desktop scaling value (e.g. in Control Panel on Windows).
-    /// * A user moves the application window to a display with a different DPI.
-    HiDPIFactorChanged(f32),
+    /// * 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.
@@ -197,7 +199,7 @@ pub enum TouchPhase {
 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
 }
@@ -242,7 +244,7 @@ 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.
@@ -383,7 +385,6 @@ pub enum VirtualKeyCode {
     LAlt,
     LBracket,
     LControl,
-    LMenu,
     LShift,
     LWin,
     Mail,
@@ -408,7 +409,6 @@ pub enum VirtualKeyCode {
     RAlt,
     RBracket,
     RControl,
-    RMenu,
     RShift,
     RWin,
     Semicolon,
@@ -431,6 +431,9 @@ pub enum VirtualKeyCode {
     WebSearch,
     WebStop,
     Yen,
+    Copy,
+    Paste,
+    Cut,
 }
 
 /// Represents the current state of the keyboard modifiers

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

@@ -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.
@@ -35,14 +35,18 @@
 //!
 //! ```no_run
 //! use winit::{Event, WindowEvent};
+//! use winit::dpi::LogicalSize;
 //! # use winit::EventsLoop;
 //! # 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);
 //!             },
 //!             _ => ()
 //!         }
@@ -80,14 +84,16 @@
 //! to create an OpenGL/Vulkan/DirectX/Metal/etc. context that will draw on the window.
 //!
 
-#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "windows"))]
+#[allow(unused_imports)]
 #[macro_use]
 extern crate lazy_static;
-
 extern crate libc;
+#[macro_use]
+extern crate log;
+#[cfg(feature = "icon_loading")]
+extern crate image;
 
 #[cfg(target_os = "windows")]
-#[macro_use]
 extern crate winapi;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
@@ -101,16 +107,21 @@ extern crate core_graphics;
 #[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
 extern crate x11_dl;
 #[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+extern crate parking_lot;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
 extern crate percent_encoding;
 #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd"))]
-#[macro_use]
-extern crate wayland_client;
+extern crate smithay_client_toolkit as sctk;
 
+pub(crate) use dpi::*; // TODO: Actually change the imports throughout the codebase.
 pub use events::*;
 pub use window::{AvailableMonitorsIter, MonitorId};
+pub use icon::*;
 
-mod platform;
+pub mod dpi;
 mod events;
+mod icon;
+mod platform;
 mod window;
 
 pub mod os;
@@ -225,6 +236,11 @@ impl EventsLoop {
     /// Calls `callback` every time an event is received. If no event is available, sleeps the
     /// current thread and waits for an event. If the callback returns `ControlFlow::Break` then
     /// `run_forever` will immediately return.
+    ///
+    /// # Danger!
+    ///
+    /// The callback is run after *every* event, so if its execution time is non-trivial the event queue may not empty
+    /// at a sufficient rate. Rendering in the callback with vsync enabled **will** cause significant lag.
     #[inline]
     pub fn run_forever<F>(&mut self, callback: F)
         where F: FnMut(Event) -> ControlFlow
@@ -341,7 +357,6 @@ pub enum MouseCursor {
     /// Cursor showing that something cannot be done.
     NotAllowed,
     ContextMenu,
-    NoneCursor,
     Cell,
     VerticalText,
     Alias,
@@ -371,41 +386,35 @@ pub enum MouseCursor {
     RowResize,
 }
 
-/// Describes how winit 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>,
+
+    /// Whether the window is resizable or not.
+    ///
+    /// The default is `true`.
+    pub resizable: bool,
 
     /// Whether the window should be set as fullscreen upon creation.
     ///
@@ -438,6 +447,16 @@ pub struct WindowAttributes {
     /// The default is `true`.
     pub decorations: bool,
 
+    /// Whether the window should always be on top of other windows.
+    ///
+    /// The default is `false`.
+    pub always_on_top: bool,
+
+    /// The window icon.
+    ///
+    /// The default is `None`.
+    pub window_icon: Option<Icon>,
+
     /// [iOS only] Enable multitouch,
     /// see [multipleTouchEnabled](https://developer.apple.com/documentation/uikit/uiview/1622519-multipletouchenabled)
     pub multitouch: bool,
@@ -450,12 +469,15 @@ impl Default for WindowAttributes {
             dimensions: None,
             min_dimensions: None,
             max_dimensions: None,
+            resizable: true,
             title: "winit window".to_owned(),
             maximized: false,
             fullscreen: None,
             visible: true,
             transparent: false,
             decorations: true,
+            always_on_top: false,
+            window_icon: None,
             multitouch: false,
         }
     }

src/os/ios.rs

@@ -0,0 +1,43 @@
+#![cfg(target_os = "ios")]
+
+use std::os::raw::c_void;
+
+use {MonitorId, Window};
+
+/// 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 `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 {MonitorId, Window, WindowBuilder};
+use {LogicalSize, MonitorId, Window, WindowBuilder};
 
 /// Additional methods on `Window` that are specific to MacOS.
 pub trait WindowExt {
@@ -71,64 +71,72 @@ impl From<ActivationPolicy> for NSApplicationActivationPolicy {
 ///  - `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
     }
 
-    /// Enables click-and-drag behavior for the entire window, not just the titlebar
     #[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
     }
 
-    /// Makes the titlebar transparent and allows the content to appear behind it
     #[inline]
     fn with_titlebar_transparent(mut self, titlebar_transparent: bool) -> WindowBuilder {
         self.platform_specific.titlebar_transparent = titlebar_transparent;
         self
     }
 
-    /// Hides the window titlebar
     #[inline]
     fn with_titlebar_hidden(mut self, titlebar_hidden: bool) -> WindowBuilder {
         self.platform_specific.titlebar_hidden = titlebar_hidden;
         self
     }
 
-    /// Hides the window titlebar buttons
     #[inline]
     fn with_titlebar_buttons_hidden(mut self, titlebar_buttons_hidden: bool) -> WindowBuilder {
         self.platform_specific.titlebar_buttons_hidden = titlebar_buttons_hidden;
         self
     }
 
-    /// Hides the window title
     #[inline]
     fn with_title_hidden(mut self, title_hidden: bool) -> WindowBuilder {
         self.platform_specific.title_hidden = title_hidden;
         self
     }
 
-    /// Makes the window content appear behind the titlebar
     #[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.

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,14 +1,20 @@
 #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
 
 use std::os::raw;
-use std::sync::Arc;
 use std::ptr;
-use EventsLoop;
-use MonitorId;
-use Window;
-use platform::EventsLoop as LinuxEventsLoop;
-use platform::Window as LinuxWindow;
-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;
 
@@ -17,6 +23,7 @@ use platform::x11::ffi::XVisualInfo;
 pub use platform::x11;
 
 pub use platform::XNotSupported;
+pub use platform::x11::util::WindowType as XWindowType;
 
 /// Additional methods on `EventsLoop` that are specific to Linux.
 pub trait EventsLoopExt {
@@ -71,6 +78,7 @@ impl EventsLoopExt for EventsLoop {
     }
 
     #[inline]
+    #[doc(hidden)]
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
         self.events_loop.x_connection().cloned()
     }
@@ -92,9 +100,11 @@ pub trait WindowExt {
 
     fn get_xlib_screen_id(&self) -> Option<raw::c_int>;
 
+    #[doc(hidden)]
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
 
-    fn send_xim_spot(&self, x: i16, y: i16);
+    /// 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`.
     ///
@@ -144,6 +154,7 @@ impl WindowExt for Window {
         }
     }
 
+    #[inline]
     fn get_xlib_screen_id(&self) -> Option<raw::c_int> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
@@ -151,6 +162,8 @@ impl WindowExt for Window {
         }
     }
 
+    #[inline]
+    #[doc(hidden)]
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
@@ -158,6 +171,7 @@ impl WindowExt for Window {
         }
     }
 
+    #[inline]
     fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
@@ -165,26 +179,25 @@ impl WindowExt for Window {
         }
     }
 
-    fn send_xim_spot(&self, x: i16, y: i16) {
+    #[inline]
+    fn set_urgent(&self, is_urgent: bool) {
         if let LinuxWindow::X(ref w) = self.window {
-            w.send_xim_spot(x, y);
+            w.set_urgent(is_urgent);
         }
     }
 
     #[inline]
     fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
-        use wayland_client::Proxy;
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_surface().ptr() as *mut _),
+            LinuxWindow::Wayland(ref w) => Some(w.get_surface().c_ptr() as *mut _),
             _ => None
         }
     }
 
     #[inline]
     fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
-        use wayland_client::Proxy;
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_display().ptr() as *mut _),
+            LinuxWindow::Wayland(ref w) => Some(w.get_display().c_ptr() as *mut _),
             _ => None
         }
     }
@@ -199,6 +212,17 @@ impl WindowExt for Window {
 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 {
@@ -215,6 +239,36 @@ 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.

src/os/windows.rs

@@ -1,18 +1,39 @@
 #![cfg(target_os = "windows")]
 
 use std::os::raw::c_void;
+
 use libc;
-use MonitorId;
-use Window;
-use WindowBuilder;
 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 the native handle that is used by this window.
     ///
     /// The pointer will become invalid when the native window was destroyed.
     fn get_hwnd(&self) -> *mut libc::c_void;
+
+    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
+    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
 }
 
 impl WindowExt for Window {
@@ -20,20 +41,43 @@ impl WindowExt for Window {
     fn get_hwnd(&self) -> *mut libc::c_void {
         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 {
+    /// 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: 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.
@@ -56,3 +100,18 @@ impl MonitorIdExt for MonitorId {
         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,24 +2,33 @@
 
 extern crate android_glue;
 
-use libc;
-use std::sync::mpsc::{Receiver, channel};
+mod ffi;
+
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::fmt;
 use std::os::raw::c_void;
-use {CreationError, Event, WindowEvent, MouseCursor};
+use std::sync::mpsc::{Receiver, channel};
+
+use {
+    CreationError,
+    Event,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    WindowAttributes,
+    WindowEvent,
+    WindowId as RootWindowId,
+};
 use CreationError::OsError;
-use WindowId as RootWindowId;
 use events::{Touch, TouchPhase};
 use window::MonitorId as RootMonitorId;
 
-use std::collections::VecDeque;
-use std::cell::RefCell;
-
-use CursorState;
-use WindowAttributes;
-
 pub struct EventsLoop {
     event_rx: Receiver<android_glue::Event>,
-    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>
+    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>,
 }
 
 #[derive(Clone)]
@@ -31,13 +40,13 @@ impl EventsLoop {
         android_glue::add_sender(tx);
         EventsLoop {
             event_rx: rx,
-            suspend_callback: RefCell::new(None),
+            suspend_callback: Default::default(),
         }
     }
 
     #[inline]
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut rb = VecDeque::new();
+        let mut rb = VecDeque::with_capacity(1);
         rb.push_back(MonitorId);
         rb
     }
@@ -47,14 +56,17 @@ impl EventsLoop {
         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 {
@@ -64,7 +76,7 @@ impl EventsLoop {
                                 android_glue::MotionAction::Up => TouchPhase::Ended,
                                 android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
                             },
-                            location: (motion.x as f64, motion.y as f64),
+                            location,
                             id: motion.pointer_id as u64,
                             device_id: DEVICE_ID,
                         }),
@@ -91,11 +103,12 @@ impl EventsLoop {
                     if native_window.is_null() {
                         None
                     } else {
-                        let w = unsafe { ffi::ANativeWindow_getWidth(native_window as *const _) } as u32;
-                        let h = unsafe { ffi::ANativeWindow_getHeight(native_window as *const _) } as u32;
+                        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(w, h),
+                            event: WindowEvent::Resized(size),
                         })
                     }
                 },
@@ -167,7 +180,26 @@ pub struct Window {
 #[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,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
 
 impl MonitorId {
     #[inline]
@@ -176,21 +208,24 @@ impl MonitorId {
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         unsafe {
             let window = android_glue::get_native_window();
-            (ffi::ANativeWindow_getWidth(window) as u32, ffi::ANativeWindow_getHeight(window) as u32)
+            (
+                ffi::ANativeWindow_getWidth(window) as f64,
+                ffi::ANativeWindow_getHeight(window) as f64,
+            ).into()
         }
     }
 
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
+    pub fn get_position(&self) -> PhysicalPosition {
         // Android assumes single screen
-        (0, 0)
+        (0, 0).into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
+    pub fn get_hidpi_factor(&self) -> f64 {
         1.0
     }
 }
@@ -201,14 +236,10 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
 impl Window {
-    pub fn new(_: &EventsLoop, win_attribs: &WindowAttributes,
-               _: &PlatformSpecificWindowBuilderAttributes)
+    pub fn new(_: &EventsLoop, win_attribs: WindowAttributes,
+               _: PlatformSpecificWindowBuilderAttributes)
                -> Result<Window, CreationError>
     {
-        // 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")));
@@ -228,93 +259,106 @@ impl Window {
 
     #[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 get_inner_position(&self) -> Option<(i32, i32)> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // N/A
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _x: i32, _y: i32) {
+    pub fn set_position(&self, _position: LogicalPosition) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_min_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
+    }
 
     #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
+    }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+    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(self.native_window as *const _) } as u32,
-                unsafe { ffi::ANativeWindow_getHeight(self.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 platform_display(&self) -> *mut libc::c_void {
-        unimplemented!();
-    }
-
-    #[inline]
-    pub fn platform_window(&self) -> *mut libc::c_void {
-        unimplemented!()
+    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<(), ()> {
-        Ok(())
+    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
     }
 
@@ -324,10 +368,38 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId{inner: MonitorId}
+    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
     }

src/platform/emscripten/ffi.rs

@@ -1,6 +1,4 @@
-#![allow(dead_code)]
-#![allow(non_snake_case)]
-#![allow(non_camel_case_types)]
+#![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)]

src/platform/emscripten/mod.rs

@@ -2,16 +2,22 @@
 
 mod ffi;
 
-use std::mem;
-use std::os::raw::{c_char, c_void, c_double, c_ulong, c_int};
-use std::ptr;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Mutex, Arc};
+use std::{mem, ptr, str};
 use std::cell::RefCell;
 use std::collections::VecDeque;
+use std::os::raw::{c_char, c_void, c_double, c_ulong, c_int};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Mutex, Arc};
+
+use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
+use window::MonitorId as RootMonitorId;
 
 const DOCUMENT_NAME: &'static str = "#document\0";
 
+fn get_hidpi_factor() -> f64 {
+    unsafe { ffi::emscripten_get_device_pixel_ratio() as f64 }
+}
+
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes;
 
@@ -24,7 +30,7 @@ pub struct DeviceId;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct MonitorId;
 
 impl MonitorId {
@@ -34,18 +40,18 @@ impl MonitorId {
     }
 
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
+    pub fn get_position(&self) -> PhysicalPosition {
         unimplemented!()
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        (0, 0)
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        (0, 0).into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        1.0
+    pub fn get_hidpi_factor(&self) -> f64 {
+        get_hidpi_factor()
     }
 }
 
@@ -90,17 +96,19 @@ impl EventsLoop {
         }
     }
 
+    #[inline]
     pub fn interrupt(&self) {
         self.interrupted.store(true, Ordering::Relaxed);
     }
 
+    #[inline]
     pub fn create_proxy(&self) -> EventsLoopProxy {
         unimplemented!()
     }
 
     #[inline]
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut list = VecDeque::new();
+        let mut list = VecDeque::with_capacity(1);
         list.push_back(MonitorId);
         list
     }
@@ -115,7 +123,7 @@ impl EventsLoop {
     {
         let ref mut window = *self.window.lock().unwrap();
         if let &mut Some(ref mut window) = window {
-            while let Some(event) = window.events.borrow_mut().pop_front() {
+            while let Some(event) = window.events.lock().unwrap().pop_front() {
                 callback(event)
             }
         }
@@ -142,9 +150,10 @@ impl EventsLoop {
 pub struct WindowId(usize);
 
 pub struct Window2 {
-    cursor_state: Mutex<::CursorState>,
+    cursor_grabbed: Mutex<bool>,
+    cursor_hidden: Mutex<bool>,
     is_fullscreen: bool,
-    events: Box<RefCell<VecDeque<::Event>>>,
+    events: Box<Mutex<VecDeque<::Event>>>,
 }
 
 pub struct Window {
@@ -176,7 +185,7 @@ extern "C" fn mouse_callback(
     event_queue: *mut c_void) -> ffi::EM_BOOL
 {
     unsafe {
-        let queue: &RefCell<VecDeque<::Event>> = mem::transmute(event_queue);
+        let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
         let modifiers = ::ModifiersState {
             shift: (*event).shiftKey == ffi::EM_TRUE,
@@ -187,15 +196,20 @@ extern "C" fn mouse_callback(
 
         match event_type {
             ffi::EMSCRIPTEN_EVENT_MOUSEMOVE => {
-                queue.borrow_mut().push_back(::Event::WindowEvent {
+                let dpi_factor = get_hidpi_factor();
+                let position = LogicalPosition::from_physical(
+                    ((*event).canvasX as f64, (*event).canvasY as f64),
+                    dpi_factor,
+                );
+                queue.lock().unwrap().push_back(::Event::WindowEvent {
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::CursorMoved {
                         device_id: ::DeviceId(DeviceId),
-                        position: ((*event).canvasX as f64, (*event).canvasY as f64),
+                        position,
                         modifiers: modifiers,
                     }
                 });
-                queue.borrow_mut().push_back(::Event::DeviceEvent {
+                queue.lock().unwrap().push_back(::Event::DeviceEvent {
                     device_id: ::DeviceId(DeviceId),
                     event: ::DeviceEvent::MouseMotion {
                         delta: ((*event).movementX as f64, (*event).movementY as f64),
@@ -215,7 +229,7 @@ extern "C" fn mouse_callback(
                     ffi::EMSCRIPTEN_EVENT_MOUSEUP => ::ElementState::Released,
                     _ => unreachable!(),
                 };
-                queue.borrow_mut().push_back(::Event::WindowEvent {
+                queue.lock().unwrap().push_back(::Event::WindowEvent {
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::MouseInput {
                         device_id: ::DeviceId(DeviceId),
@@ -238,7 +252,7 @@ extern "C" fn keyboard_callback(
     event_queue: *mut c_void) -> ffi::EM_BOOL
 {
     unsafe {
-        let queue: &RefCell<VecDeque<::Event>> = mem::transmute(event_queue);
+        let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
         let modifiers = ::ModifiersState {
             shift: (*event).shiftKey == ffi::EM_TRUE,
@@ -249,7 +263,7 @@ extern "C" fn keyboard_callback(
 
         match event_type {
             ffi::EMSCRIPTEN_EVENT_KEYDOWN => {
-                queue.borrow_mut().push_back(::Event::WindowEvent {
+                queue.lock().unwrap().push_back(::Event::WindowEvent {
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::KeyboardInput {
                         device_id: ::DeviceId(DeviceId),
@@ -263,7 +277,7 @@ extern "C" fn keyboard_callback(
                 });
             },
             ffi::EMSCRIPTEN_EVENT_KEYUP => {
-                queue.borrow_mut().push_back(::Event::WindowEvent {
+                queue.lock().unwrap().push_back(::Event::WindowEvent {
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::KeyboardInput {
                         device_id: ::DeviceId(DeviceId),
@@ -289,7 +303,7 @@ extern fn touch_callback(
     event_queue: *mut c_void) -> ffi::EM_BOOL
 {
     unsafe {
-        let queue: &RefCell<VecDeque<::Event>> = mem::transmute(event_queue);
+        let queue: &Mutex<VecDeque<::Event>> = mem::transmute(event_queue);
 
         let phase = match event_type {
             ffi::EMSCRIPTEN_EVENT_TOUCHSTART => ::TouchPhase::Started,
@@ -302,13 +316,18 @@ extern fn touch_callback(
         for touch in 0..(*event).numTouches as usize {
             let touch = (*event).touches[touch];
             if touch.isChanged == ffi::EM_TRUE {
-                queue.borrow_mut().push_back(::Event::WindowEvent {
+                let dpi_factor = get_hidpi_factor();
+                let location = LogicalPosition::from_physical(
+                    (touch.canvasX as f64, touch.canvasY as f64),
+                    dpi_factor,
+                );
+                queue.lock().unwrap().push_back(::Event::WindowEvent {
                     window_id: ::WindowId(WindowId(0)),
                     event: ::WindowEvent::Touch(::Touch {
                         device_id: ::DeviceId(DeviceId),
                         phase,
                         id: touch.identifier as u64,
-                        location: (touch.canvasX as f64, touch.canvasY as f64),
+                        location,
                     }),
                 });
             }
@@ -347,8 +366,8 @@ fn em_try(res: ffi::EMSCRIPTEN_RESULT) -> Result<(), String> {
 }
 
 impl Window {
-    pub fn new(events_loop: &EventsLoop, attribs: &::WindowAttributes,
-               _pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+    pub fn new(events_loop: &EventsLoop, attribs: ::WindowAttributes,
+               _pl_attribs: PlatformSpecificWindowBuilderAttributes)
         -> Result<Window, ::CreationError>
     {
         if events_loop.window.lock().unwrap().is_some() {
@@ -356,8 +375,9 @@ impl Window {
         }
 
         let w = Window2 {
-            cursor_state: Mutex::new(::CursorState::Normal),
-            events: Box::new(RefCell::new(VecDeque::new())),
+            cursor_grabbed: Default::default(),
+            cursor_hidden: Default::default(),
+            events: Default::default(),
             is_fullscreen: attribs.fullscreen.is_some(),
         };
 
@@ -395,8 +415,8 @@ impl Window {
                 em_try(ffi::emscripten_set_fullscreenchange_callback(ptr::null(), 0 as *mut c_void, ffi::EM_FALSE, Some(fullscreen_callback)))
                     .map_err(|e| ::CreationError::OsError(e))?;
             }
-        } else if let Some((w, h)) = attribs.dimensions {
-            window.set_inner_size(w, h);
+        } else if let Some(size) = attribs.dimensions {
+            window.set_inner_size(size);
         }
 
         *events_loop.window.lock().unwrap() = Some(window.window.clone());
@@ -413,22 +433,22 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
-        Some((0, 0))
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        Some((0, 0).into())
     }
 
     #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        Some((0, 0))
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        Some((0, 0).into())
     }
 
     #[inline]
-    pub fn set_position(&self, _: i32, _: i32) {
+    pub fn set_position(&self, _: LogicalPosition) {
     }
 
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         unsafe {
-            use std::{mem, ptr};
             let mut width = 0;
             let mut height = 0;
             let mut fullscreen = 0;
@@ -438,94 +458,109 @@ impl Window {
             {
                 None
             } else {
-                Some((width as u32, height as u32))
+                let dpi_factor = self.get_hidpi_factor();
+                let logical = LogicalSize::from_physical((width as u32, height as u32), dpi_factor);
+                Some(logical)
             }
         }
     }
 
     #[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, width: u32, height: u32) {
+    pub fn set_inner_size(&self, size: LogicalSize) {
         unsafe {
-            use std::ptr;
-            ffi::emscripten_set_element_css_size(ptr::null(), width as c_double, height
-                as c_double);
+            let dpi_factor = self.get_hidpi_factor();
+            let physical = PhysicalSize::from_logical(size, dpi_factor);
+            let (width, height): (u32, u32) = physical.into();
+            ffi::emscripten_set_element_css_size(
+                ptr::null(),
+                width as c_double,
+                height as c_double,
+            );
         }
     }
 
     #[inline]
-    pub fn set_min_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
-
-    #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
-
-    #[inline]
-    pub fn show(&self) {}
-    #[inline]
-    pub fn hide(&self) {}
-
-    #[inline]
-    pub fn platform_display(&self) -> *mut ::libc::c_void {
-        unimplemented!()
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
     }
 
     #[inline]
-    pub fn platform_window(&self) -> *mut ::libc::c_void {
-        unimplemented!()
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_cursor(&self, _cursor: ::MouseCursor) {}
+    pub fn set_resizable(&self, _resizable: bool) {
+        // N/A
+    }
 
     #[inline]
-    pub fn set_cursor_state(&self, state: ::CursorState) -> Result<(), String> {
+    pub fn show(&self) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _cursor: ::MouseCursor) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
+        let mut grabbed_lock = self.window.cursor_grabbed.lock().unwrap();
+        if grab == *grabbed_lock { return Ok(()); }
         unsafe {
-            use ::CursorState::*;
-
-            let mut old_state = self.window.cursor_state.lock().unwrap();
-            if state == *old_state {
-                return Ok(());
+            if grab {
+                em_try(ffi::emscripten_set_pointerlockchange_callback(
+                    ptr::null(),
+                    0 as *mut c_void,
+                    ffi::EM_FALSE,
+                    Some(pointerlockchange_callback),
+                ))?;
+                em_try(ffi::emscripten_request_pointerlock(ptr::null(), ffi::EM_TRUE))?;
+            } else {
+                em_try(ffi::emscripten_set_pointerlockchange_callback(
+                    ptr::null(),
+                    0 as *mut c_void,
+                    ffi::EM_FALSE,
+                    None,
+                ))?;
+                em_try(ffi::emscripten_exit_pointerlock())?;
             }
-
-            // Set or unset grab callback
-            match state {
-                Hide | Normal => em_try(ffi::emscripten_set_pointerlockchange_callback(ptr::null(), 0 as *mut c_void, ffi::EM_FALSE, None))?,
-                Grab => em_try(ffi::emscripten_set_pointerlockchange_callback(ptr::null(), 0 as *mut c_void, ffi::EM_FALSE, Some(pointerlockchange_callback)))?,
-            }
-
-            // Go back to normal cursor state
-            match *old_state {
-                Hide => show_mouse(),
-                Grab => em_try(ffi::emscripten_exit_pointerlock())?,
-                Normal => (),
-            }
-
-            // Set cursor from normal cursor state
-            match state {
-                Hide => ffi::emscripten_hide_mouse(),
-                Grab => em_try(ffi::emscripten_request_pointerlock(ptr::null(), ffi::EM_TRUE))?,
-                Normal => (),
-            }
-
-            // Update
-            *old_state = state;
-
-            Ok(())
         }
+        *grabbed_lock = grab;
+        Ok(())
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        unsafe { ffi::emscripten_get_device_pixel_ratio() as f32 }
+    pub fn hide_cursor(&self, hide: bool) {
+        let mut hidden_lock = self.window.cursor_hidden.lock().unwrap();
+        if hide == *hidden_lock { return; }
+        if hide {
+            unsafe { ffi::emscripten_hide_mouse() };
+        } else {
+            show_mouse();
+        }
+        *hidden_lock = hide;
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
-        Err(())
+    pub fn get_hidpi_factor(&self) -> f64 {
+        get_hidpi_factor()
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+        Err("Setting cursor position is not possible on Emscripten.".to_owned())
     }
 
     #[inline]
@@ -544,8 +579,35 @@ impl Window {
     }
 
     #[inline]
-    pub fn get_current_monitor(&self) -> ::MonitorId {
-        ::MonitorId{inner: MonitorId}
+    pub fn set_always_on_top(&self, _always_on_top: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_window_icon(&self, _icon: Option<::Icon>) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_ime_spot(&self, _logical_spot: LogicalPosition) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_current_monitor(&self) -> RootMonitorId {
+        RootMonitorId { inner: MonitorId }
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        let mut list = VecDeque::with_capacity(1);
+        list.push_back(MonitorId);
+        list
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorId {
+        MonitorId
     }
 }
 
@@ -559,7 +621,8 @@ impl Drop for Window {
 
         unsafe {
             // Return back to normal cursor state
-            let _ = self.set_cursor_state(::CursorState::Normal);
+            self.hide_cursor(false);
+            self.grab_cursor(false);
 
             // Exit fullscreen if on
             if self.window.is_fullscreen {
@@ -592,7 +655,6 @@ fn error_to_str(code: ffi::EMSCRIPTEN_RESULT) -> &'static str {
 }
 
 fn key_translate(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES]) -> u8 {
-    use std::str;
     let slice = &input[0..input.iter().take_while(|x| **x != 0).count()];
     let maybe_key = unsafe { str::from_utf8(mem::transmute::<_, &[u8]>(slice)) };
     let key = match maybe_key {
@@ -609,7 +671,6 @@ fn key_translate(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES]) ->
 fn key_translate_virt(input: [ffi::EM_UTF8; ffi::EM_HTML5_SHORT_STRING_LEN_BYTES],
                       location: c_ulong) -> Option<::VirtualKeyCode>
 {
-    use std::str;
     let slice = &input[0..input.iter().take_while(|x| **x != 0).count()];
     let maybe_key = unsafe { str::from_utf8(mem::transmute::<_, &[u8]>(slice)) };
     let key = match maybe_key {

src/platform/ios/ffi.rs

@@ -1,22 +1,23 @@
+#![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
+
 use std::ffi::CString;
+use std::mem;
+use std::os::raw::*;
 
-use libc;
-use objc::runtime::{ Object, Class };
+use objc::runtime::{Class, 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;
 
+pub const UIViewAutoresizingFlexibleWidth: NSUInteger = 1 << 1;
+pub const UIViewAutoresizingFlexibleHeight: NSUInteger = 1 << 4;
+
 #[cfg(target_pointer_width = "32")]
 pub type CGFloat = f32;
 #[cfg(target_pointer_width = "64")]
@@ -38,14 +39,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,15 +56,24 @@ 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: Sized {
@@ -71,17 +81,14 @@ pub trait NSString: Sized {
         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,7 +101,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]
     }
 }
@@ -102,6 +109,6 @@ impl NSString for id {
 #[inline]
 pub fn class(name: &str) -> *mut Class {
     unsafe {
-        ::std::mem::transmute(Class::get(name))
+        mem::transmute(Class::get(name))
     }
 }

src/platform/ios/mod.rs

@@ -19,7 +19,7 @@
 //!
 //! ```rust, ignore
 //! #[no_mangle]
-//! pub extern fn start_glutin_app() {
+//! pub extern fn start_winit_app() {
 //!     start_inner()
 //! }
 //!
@@ -29,13 +29,13 @@
 //!
 //! ```
 //!
-//! Compile project and then drag resulting .a into Xcode project. Add glutin.h to xcode.
+//! Compile project and then drag resulting .a into Xcode project. Add winit.h to xcode.
 //!
 //! ```ignore
-//! void start_glutin_app();
+//! void start_winit_app();
 //! ```
 //!
-//! Use start_glutin_app inside your xcode's main function.
+//! Use start_winit_app inside your xcode's main function.
 //!
 //!
 //! # App lifecycle and events
@@ -45,7 +45,7 @@
 //! [app lifecycle](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIApplicationDelegate_Protocol/).
 //!
 //!
-//! This is how those event are represented in glutin:
+//! This is how those event are represented in winit:
 //!
 //!  - applicationDidBecomeActive is Focused(true)
 //!  - applicationWillResignActive is Focused(false)
@@ -60,100 +60,146 @@
 
 #![cfg(target_os = "ios")]
 
+use std::{fmt, mem, ptr};
 use std::collections::VecDeque;
-use std::ptr;
-use std::mem;
-use std::os::raw::c_void;
+use std::os::raw::*;
 
-use libc;
-use libc::c_int;
-use objc::runtime::{Class, Object, Sel, BOOL, YES };
-use objc::declare::{ ClassDecl };
+use objc::declare::ClassDecl;
+use objc::runtime::{BOOL, Class, Object, Sel, YES};
 
-use { CreationError, CursorState, MouseCursor, WindowAttributes };
-use WindowId as RootEventId;
-use WindowEvent;
-use Event;
-use events::{ Touch, TouchPhase };
+use {
+    CreationError,
+    Event,
+    LogicalPosition,
+    LogicalSize,
+    MouseCursor,
+    PhysicalPosition,
+    PhysicalSize,
+    WindowAttributes,
+    WindowEvent,
+    WindowId as RootEventId,
+};
+use events::{Touch, TouchPhase};
 use window::MonitorId as RootMonitorId;
 
 mod ffi;
 use self::ffi::{
-    setjmp,
-    UIApplicationMain,
     CFTimeInterval,
     CFRunLoopRunInMode,
+    CGFloat,
+    CGPoint,
+    CGRect,
+    id,
     kCFRunLoopDefaultMode,
     kCFRunLoopRunHandledSource,
-    id,
+    longjmp,
     nil,
     NSString,
-    CGFloat,
-    longjmp,
-    CGRect,
-    CGPoint
+    setjmp,
+    UIApplicationMain,
+    UIViewAutoresizingFlexibleWidth,
+    UIViewAutoresizingFlexibleHeight,
  };
 
-static mut jmpbuf: [c_int;27] = [0;27];
-
-#[derive(Clone)]
-pub struct MonitorId;
+static mut JMPBUF: [c_int; 27] = [0; 27];
 
 pub struct Window {
-    delegate_state: *mut DelegateState
+    delegate_state: *mut DelegateState,
 }
 
-#[derive(Clone)]
-pub struct WindowProxy;
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
 
 #[derive(Debug)]
 struct DelegateState {
     events_queue: VecDeque<Event>,
     window: id,
     controller: id,
-    size: (u32,u32),
-    scale: f32
+    view: id,
+    size: LogicalSize,
+    scale: f64,
 }
 
-
 impl DelegateState {
-    #[inline]
-    fn new(window: id, controller:id, size: (u32,u32), scale: f32) -> DelegateState {
+    fn new(window: id, controller: id, view: id, size: LogicalSize, scale: f64) -> DelegateState {
         DelegateState {
             events_queue: VecDeque::new(),
-            window: window,
-            controller: controller,
-            size: size,
-            scale: scale
+            window,
+            controller,
+            view,
+            size,
+            scale,
         }
     }
 }
 
+impl Drop for DelegateState {
+    fn drop(&mut self) {
+        unsafe {
+            let _: () = msg_send![self.window, release];
+            let _: () = msg_send![self.controller, release];
+            let _: () = msg_send![self.view, release];
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct MonitorId;
+
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorId {
+            name: Option<String>,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: f64,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
 impl MonitorId {
+    #[inline]
+    pub fn get_uiscreen(&self) -> id {
+        let class = Class::get("UIScreen").expect("Failed to get class `UIScreen`");
+        unsafe { msg_send![class, mainScreen] }
+    }
+
     #[inline]
     pub fn get_name(&self) -> Option<String> {
         Some("Primary".to_string())
     }
 
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        unimplemented!()
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        let bounds: CGRect = unsafe { msg_send![self.get_uiscreen(), nativeBounds] };
+        (bounds.size.width as f64, bounds.size.height as f64).into()
     }
 
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
+    pub fn get_position(&self) -> PhysicalPosition {
         // iOS assumes single screen
-        (0, 0)
+        (0, 0).into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        1.0
+    pub fn get_hidpi_factor(&self) -> f64 {
+        let scale: CGFloat = unsafe { msg_send![self.get_uiscreen(), nativeScale] };
+        scale as f64
     }
 }
 
 pub struct EventsLoop {
-    delegate_state: *mut DelegateState
+    delegate_state: *mut DelegateState,
 }
 
 #[derive(Clone)]
@@ -162,30 +208,26 @@ pub struct EventsLoopProxy;
 impl EventsLoop {
     pub fn new() -> EventsLoop {
         unsafe {
-            if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
-                let app: id = msg_send![Class::get("UIApplication").unwrap(), sharedApplication];
+            if setjmp(mem::transmute(&mut JMPBUF)) != 0 {
+                let app_class = Class::get("UIApplication").expect("Failed to get class `UIApplication`");
+                let app: id = msg_send![app_class, sharedApplication];
                 let delegate: id = msg_send![app, delegate];
-                let state: *mut c_void = *(&*delegate).get_ivar("glutinState");
-                let state = state as *mut DelegateState;
-
-                let events_loop = EventsLoop {
-                    delegate_state: state
-                };
-
-                return events_loop;
+                let state: *mut c_void = *(&*delegate).get_ivar("winitState");
+                let delegate_state = state as *mut DelegateState;
+                return EventsLoop { delegate_state };
             }
         }
 
-        create_delegate_class();
         create_view_class();
+        create_delegate_class();
         start_app();
 
-        panic!("Couldn't create UIApplication")
+        panic!("Couldn't create `UIApplication`!")
     }
 
     #[inline]
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut rb = VecDeque::new();
+        let mut rb = VecDeque::with_capacity(1);
         rb.push_back(MonitorId);
         rb
     }
@@ -207,7 +249,7 @@ impl EventsLoop {
             }
 
             // jump hack, so we won't quit on willTerminate event before processing it
-            if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
+            if setjmp(mem::transmute(&mut JMPBUF)) != 0 {
                 if let Some(event) = state.events_queue.pop_front() {
                     callback(event);
                     return;
@@ -262,106 +304,123 @@ pub struct DeviceId;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes;
 
+// TODO: AFAIK transparency is enabled by default on iOS,
+// so to be consistent with other platforms we have to change that.
 impl Window {
-    pub fn new(ev: &EventsLoop, _: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window, CreationError>
-    {
-        Ok(Window {
-            delegate_state: ev.delegate_state,
-        })
+    pub fn new(
+        ev: &EventsLoop,
+        _attributes: WindowAttributes,
+        _pl_alltributes: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Window, CreationError> {
+        Ok(Window { delegate_state: ev.delegate_state })
     }
 
     #[inline]
-    pub fn set_title(&self, _: &str) {
+    pub fn get_uiwindow(&self) -> id {
+        unsafe { (*self.delegate_state).window }
+    }
+
+    #[inline]
+    pub fn get_uiview(&self) -> id {
+        unsafe { (*self.delegate_state).view }
+    }
+
+    #[inline]
+    pub fn set_title(&self, _title: &str) {
+        // N/A
     }
 
     #[inline]
     pub fn show(&self) {
+        // N/A
     }
 
     #[inline]
     pub fn hide(&self) {
+        // N/A
     }
 
     #[inline]
-    pub fn get_position(&self) -> Option<(i32, i32)> {
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        // N/A
         None
     }
 
     #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // N/A
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _x: i32, _y: i32) {
+    pub fn set_position(&self, _position: LogicalPosition) {
+        // N/A
     }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         unsafe { Some((&*self.delegate_state).size) }
     }
 
     #[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 set_min_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
-
-    #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
-
-    #[inline]
-    pub fn platform_display(&self) -> *mut libc::c_void {
-        unimplemented!();
+    pub fn set_min_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
     }
 
     #[inline]
-    pub fn platform_window(&self) -> *mut libc::c_void {
-        unimplemented!()
+    pub fn set_max_dimensions(&self, _dimensions: Option<LogicalSize>) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
+    pub fn set_resizable(&self, _resizable: bool) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_cursor(&self, _: MouseCursor) {
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // N/A
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, _: CursorState) -> Result<(), String> {
-        Ok(())
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not possible on iOS.".to_owned())
     }
 
     #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
+    pub fn hide_cursor(&self, _hide: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
         unsafe { (&*self.delegate_state) }.scale
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
-        unimplemented!();
-    }
-
-    #[inline]
-    pub fn create_window_proxy(&self) -> WindowProxy {
-        WindowProxy
+    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), String> {
+        Err("Setting cursor position is not possible on iOS.".to_owned())
     }
 
     #[inline]
     pub fn set_maximized(&self, _maximized: bool) {
+        // N/A
         // iOS has single screen maximized apps so nothing to do
     }
 
     #[inline]
     pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
+        // N/A
         // iOS has single screen maximized apps so nothing to do
     }
 
@@ -370,9 +429,36 @@ impl Window {
         // N/A
     }
 
+    #[inline]
+    pub fn set_always_on_top(&self, _always_on_top: bool) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_window_icon(&self, _icon: Option<::Icon>) {
+        // N/A
+    }
+
+    #[inline]
+    pub fn set_ime_spot(&self, _logical_spot: LogicalPosition) {
+        // N/A
+    }
+
     #[inline]
     pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId{inner: MonitorId}
+        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]
@@ -383,26 +469,32 @@ impl Window {
 
 fn create_delegate_class() {
     extern fn did_finish_launching(this: &mut Object, _: Sel, _: id, _: id) -> BOOL {
+        let screen_class = Class::get("UIScreen").expect("Failed to get class `UIScreen`");
+        let window_class = Class::get("UIWindow").expect("Failed to get class `UIWindow`");
+        let controller_class = Class::get("MainViewController").expect("Failed to get class `MainViewController`");
+        let view_class = Class::get("MainView").expect("Failed to get class `MainView`");
         unsafe {
-            let main_screen: id = msg_send![Class::get("UIScreen").unwrap(), mainScreen];
+            let main_screen: id = msg_send![screen_class, mainScreen];
             let bounds: CGRect = msg_send![main_screen, bounds];
             let scale: CGFloat = msg_send![main_screen, nativeScale];
 
-            let window: id = msg_send![Class::get("UIWindow").unwrap(), alloc];
+            let window: id = msg_send![window_class, alloc];
             let window: id = msg_send![window, initWithFrame:bounds.clone()];
 
-            let size = (bounds.size.width as u32, bounds.size.height as u32);
+            let size = (bounds.size.width as f64, bounds.size.height as f64).into();
 
-            let view_controller: id = msg_send![Class::get("MainViewController").unwrap(), alloc];
+            let view_controller: id = msg_send![controller_class, alloc];
             let view_controller: id = msg_send![view_controller, init];
 
+            let view: id = msg_send![view_class, alloc];
+            let view: id = msg_send![view, initForGl:&bounds];
+
             let _: () = msg_send![window, setRootViewController:view_controller];
             let _: () = msg_send![window, makeKeyAndVisible];
 
-            let state = Box::new(DelegateState::new(window, view_controller, size, scale as f32));
+            let state = Box::new(DelegateState::new(window, view_controller, view, size, scale as f64));
             let state_ptr: *mut DelegateState = mem::transmute(state);
-            this.set_ivar("glutinState", state_ptr as *mut c_void);
-
+            this.set_ivar("winitState", state_ptr as *mut c_void);
 
             let _: () = msg_send![this, performSelector:sel!(postLaunch:) withObject:nil afterDelay:0.0];
         }
@@ -410,12 +502,12 @@ fn create_delegate_class() {
     }
 
     extern fn post_launch(_: &Object, _: Sel, _: id) {
-        unsafe { longjmp(mem::transmute(&mut jmpbuf),1); }
+        unsafe { longjmp(mem::transmute(&mut JMPBUF),1); }
     }
 
     extern fn did_become_active(this: &Object, _: Sel, _: id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
             state.events_queue.push_back(Event::WindowEvent {
                 window_id: RootEventId(WindowId),
@@ -426,7 +518,7 @@ fn create_delegate_class() {
 
     extern fn will_resign_active(this: &Object, _: Sel, _: id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
             state.events_queue.push_back(Event::WindowEvent {
                 window_id: RootEventId(WindowId),
@@ -437,7 +529,7 @@ fn create_delegate_class() {
 
     extern fn will_enter_foreground(this: &Object, _: Sel, _: id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
             state.events_queue.push_back(Event::Suspended(false));
         }
@@ -445,7 +537,7 @@ fn create_delegate_class() {
 
     extern fn did_enter_background(this: &Object, _: Sel, _: id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
             state.events_queue.push_back(Event::Suspended(true));
         }
@@ -453,7 +545,7 @@ fn create_delegate_class() {
 
     extern fn will_terminate(this: &Object, _: Sel, _: id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
             // push event to the front to garantee that we'll process it
             // immidiatly after jump
@@ -461,13 +553,13 @@ fn create_delegate_class() {
                 window_id: RootEventId(WindowId),
                 event: WindowEvent::Destroyed,
             });
-            longjmp(mem::transmute(&mut jmpbuf),1);
+            longjmp(mem::transmute(&mut JMPBUF),1);
         }
     }
 
     extern fn handle_touches(this: &Object, _: Sel, touches: id, _:id) {
         unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
+            let state: *mut c_void = *this.get_ivar("winitState");
             let state = &mut *(state as *mut DelegateState);
 
             let touches_enum: id = msg_send![touches, objectEnumerator];
@@ -486,7 +578,7 @@ fn create_delegate_class() {
                     event: WindowEvent::Touch(Touch {
                         device_id: DEVICE_ID,
                         id: touch_id,
-                        location: (location.x as f64, location.y as f64),
+                        location: (location.x as f64, location.y as f64).into(),
                         phase: match phase {
                             0 => TouchPhase::Started,
                             1 => TouchPhase::Moved,
@@ -501,8 +593,8 @@ fn create_delegate_class() {
         }
     }
 
-    let ui_responder = Class::get("UIResponder").unwrap();
-    let mut decl = ClassDecl::new("AppDelegate", ui_responder).unwrap();
+    let ui_responder = Class::get("UIResponder").expect("Failed to get class `UIResponder`");
+    let mut decl = ClassDecl::new("AppDelegate", ui_responder).expect("Failed to declare class `AppDelegate`");
 
     unsafe {
         decl.add_method(sel!(application:didFinishLaunchingWithOptions:),
@@ -540,17 +632,45 @@ fn create_delegate_class() {
         decl.add_method(sel!(postLaunch:),
                         post_launch as extern fn(&Object, Sel, id));
 
-        decl.add_ivar::<*mut c_void>("glutinState");
+        decl.add_ivar::<*mut c_void>("winitState");
 
         decl.register();
     }
 }
 
-fn create_view_class() {
-    let ui_view_controller = Class::get("UIViewController").unwrap();
-    let decl = ClassDecl::new("MainViewController", ui_view_controller).unwrap();
-
+// TODO: winit shouldn't contain GL-specfiic code
+pub fn create_view_class() {
+    let superclass = Class::get("UIViewController").expect("Failed to get class `UIViewController`");
+    let decl = ClassDecl::new("MainViewController", superclass).expect("Failed to declare class `MainViewController`");
     decl.register();
+
+    extern fn init_for_gl(this: &Object, _: Sel, frame: *const c_void) -> id {
+        unsafe {
+            let bounds = frame as *const CGRect;
+            let view: id = msg_send![this, initWithFrame:(*bounds).clone()];
+
+            let mask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            let _: () = msg_send![view, setAutoresizingMask:mask];
+            let _: () = msg_send![view, setAutoresizesSubviews:YES];
+
+            let layer: id = msg_send![view, layer];
+            let _ : () = msg_send![layer, setOpaque:YES];
+
+            view
+        }
+    }
+
+    extern fn layer_class(_: &Class, _: Sel) -> *const Class {
+        unsafe { mem::transmute(Class::get("CAEAGLLayer").expect("Failed to get class `CAEAGLLayer`")) }
+    }
+
+    let superclass = Class::get("GLKView").expect("Failed to get class `GLKView`");
+    let mut decl = ClassDecl::new("MainView", superclass).expect("Failed to declare class `MainView`");
+    unsafe {
+        decl.add_method(sel!(initForGl:), init_for_gl as extern fn(&Object, Sel, *const c_void) -> id);
+        decl.add_class_method(sel!(layerClass), layer_class as extern fn(&Class, Sel) -> *const Class);
+        decl.register();
+    }
 }
 
 #[inline]

src/platform/linux/mod.rs

@@ -1,18 +1,27 @@
 #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
 
 use std::collections::VecDeque;
+use std::{env, mem};
+use std::ffi::CStr;
+use std::os::raw::*;
 use std::sync::Arc;
-use std::env;
 
-use {CreationError, CursorState, EventsLoopClosed, MouseCursor, ControlFlow};
-use libc;
+use parking_lot::Mutex;
+use sctk::reexports::client::ConnectError;
 
-use self::x11::XConnection;
-use self::x11::XError;
-use self::x11::ffi::XVisualInfo;
-
-pub 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;
@@ -31,32 +40,37 @@ const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
 pub struct PlatformSpecificWindowBuilderAttributes {
     pub visual_infos: Option<XVisualInfo>,
     pub screen_id: Option<i32>,
+    pub resize_increments: Option<(u32, u32)>,
+    pub base_size: Option<(u32, u32)>,
+    pub class: Option<(String, String)>,
+    pub override_redirect: bool,
+    pub x11_window_type: x11::util::WindowType,
 }
 
 lazy_static!(
-    pub static ref X11_BACKEND: Result<Arc<XConnection>, XNotSupported> = {
-        XConnection::new(Some(x_error_callback)).map(Arc::new)
+    pub static ref X11_BACKEND: Mutex<Result<Arc<XConnection>, XNotSupported>> = {
+        Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))
     };
 );
 
 pub enum Window {
     X(x11::Window),
-    Wayland(wayland::Window)
+    Wayland(wayland::Window),
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum WindowId {
     X(x11::WindowId),
-    Wayland(wayland::WindowId)
+    Wayland(wayland::WindowId),
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum DeviceId {
     X(x11::DeviceId),
-    Wayland(wayland::DeviceId)
+    Wayland(wayland::DeviceId),
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub enum MonitorId {
     X(x11::MonitorId),
     Wayland(wayland::MonitorId),
@@ -80,7 +94,7 @@ impl MonitorId {
     }
 
     #[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(),
@@ -88,7 +102,7 @@ impl MonitorId {
     }
 
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
+    pub fn get_position(&self) -> PhysicalPosition {
         match self {
             &MonitorId::X(ref m) => m.get_position(),
             &MonitorId::Wayland(ref m) => m.get_position(),
@@ -96,28 +110,27 @@ impl MonitorId {
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
+    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(),
+            &MonitorId::Wayland(ref m) => m.get_hidpi_factor() as f64,
         }
     }
 }
 
 impl Window {
     #[inline]
-    pub fn new(events_loop: &EventsLoop,
-               window: &::WindowAttributes,
-               pl_attribs: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Self, CreationError>
-    {
+    pub fn new(
+        events_loop: &EventsLoop,
+        attribs: WindowAttributes,
+        pl_attribs: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Self, CreationError> {
         match *events_loop {
-            EventsLoop::Wayland(ref evlp) => {
-                wayland::Window::new(evlp, window).map(Window::Wayland)
+            EventsLoop::Wayland(ref events_loop) => {
+                wayland::Window::new(events_loop, attribs).map(Window::Wayland)
             },
-
-            EventsLoop::X(ref el) => {
-                x11::Window::new(el, window, pl_attribs).map(Window::X)
+            EventsLoop::X(ref events_loop) => {
+                x11::Window::new(events_loop, attribs, pl_attribs).map(Window::X)
             },
         }
     }
@@ -126,7 +139,7 @@ impl Window {
     pub fn id(&self) -> WindowId {
         match self {
             &Window::X(ref w) => WindowId::X(w.id()),
-            &Window::Wayland(ref w) => WindowId::Wayland(w.id())
+            &Window::Wayland(ref w) => WindowId::Wayland(w.id()),
         }
     }
 
@@ -134,7 +147,7 @@ impl Window {
     pub fn set_title(&self, title: &str) {
         match self {
             &Window::X(ref w) => w.set_title(title),
-            &Window::Wayland(ref w) => w.set_title(title)
+            &Window::Wayland(ref w) => w.set_title(title),
         }
     }
 
@@ -142,7 +155,7 @@ impl Window {
     pub fn show(&self) {
         match self {
             &Window::X(ref w) => w.show(),
-            &Window::Wayland(ref w) => w.show()
+            &Window::Wayland(ref w) => w.show(),
         }
     }
 
@@ -150,20 +163,20 @@ impl Window {
     pub fn hide(&self) {
         match self {
             &Window::X(ref w) => w.hide(),
-            &Window::Wayland(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 {
             &Window::X(ref w) => w.get_position(),
-            &Window::Wayland(ref w) => w.get_position()
+            &Window::Wayland(ref w) => w.get_position(),
         }
     }
 
     #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         match self {
             &Window::X(ref m) => m.get_inner_position(),
             &Window::Wayland(ref m) => m.get_inner_position(),
@@ -171,50 +184,58 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_position(&self, x: i32, y: i32) {
+    pub fn set_position(&self, position: LogicalPosition) {
         match self {
-            &Window::X(ref w) => w.set_position(x, y),
-            &Window::Wayland(ref w) => w.set_position(x, y)
+            &Window::X(ref w) => w.set_position(position),
+            &Window::Wayland(ref w) => w.set_position(position),
         }
     }
 
     #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         match self {
             &Window::X(ref w) => w.get_inner_size(),
-            &Window::Wayland(ref w) => w.get_inner_size()
+            &Window::Wayland(ref w) => w.get_inner_size(),
         }
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
         match self {
             &Window::X(ref w) => w.get_outer_size(),
-            &Window::Wayland(ref w) => w.get_outer_size()
+            &Window::Wayland(ref w) => w.get_outer_size(),
         }
     }
 
     #[inline]
-    pub fn set_inner_size(&self, x: u32, y: u32) {
+    pub fn set_inner_size(&self, size: LogicalSize) {
         match self {
-            &Window::X(ref w) => w.set_inner_size(x, y),
-            &Window::Wayland(ref w) => w.set_inner_size(x, y)
+            &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<(u32, u32)>) {
+    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)
+            &Window::Wayland(ref w) => w.set_min_dimensions(dimensions),
         }
     }
 
     #[inline]
-    pub fn set_max_dimensions(&self, dimensions: Option<(u32, u32)>) {
+    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)
+            &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),
         }
     }
 
@@ -227,44 +248,34 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
         match self {
-            &Window::X(ref w) => w.set_cursor_state(state),
-            &Window::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 {
-            &Window::X(ref w) => w.hidpi_factor(),
-            &Window::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 {
-            &Window::X(ref w) => w.set_cursor_position(x, y),
-            &Window::Wayland(ref w) => w.set_cursor_position(x, y)
-        }
-    }
-
-    #[inline]
-    pub fn platform_display(&self) -> *mut libc::c_void {
-        use wayland_client::Proxy;
-        match self {
-            &Window::X(ref w) => w.platform_display(),
-            &Window::Wayland(ref w) => w.get_display().ptr() as *mut _
-        }
-    }
-
-    #[inline]
-    pub fn platform_window(&self) -> *mut libc::c_void {
-        use wayland_client::Proxy;
-        match self {
-            &Window::X(ref w) => w.platform_window(),
-            &Window::Wayland(ref w) => w.get_surface().ptr() as *mut _
+            &Window::X(ref w) => w.set_cursor_position(position),
+            &Window::Wayland(ref w) => w.set_cursor_position(position),
         }
     }
 
@@ -292,24 +303,75 @@ impl Window {
         }
     }
 
+    #[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 w) => RootMonitorId{inner: MonitorId::X(w.get_current_monitor())},
-            &Window::Wayland(ref w) => RootMonitorId{inner: MonitorId::Wayland(w.get_current_monitor())},
+            &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 Ok(ref x) = *X11_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(),
@@ -318,9 +380,11 @@ 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
 }
 
@@ -340,54 +404,70 @@ impl EventsLoop {
         if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
             match env_var.as_str() {
                 "x11" => {
-                    return EventsLoop::new_x11().unwrap();      // TODO: propagate
+                    // TODO: propagate
+                    return EventsLoop::new_x11().expect("Failed to initialize X11 backend");
                 },
                 "wayland" => {
-                    match EventsLoop::new_wayland() {
-                        Ok(e) => return e,
-                        Err(_) => panic!()      // TODO: propagate
-                    }
+                    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),
+                _ => panic!(
+                    "Unknown environment variable value for {}, try one of `x11`,`wayland`",
+                    BACKEND_PREFERENCE_ENV_VAR,
+                ),
             }
         }
 
-        if let Ok(el) = EventsLoop::new_wayland() {
-            return el;
-        }
+        let wayland_err = match EventsLoop::new_wayland() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
 
-        if let Ok(el) = EventsLoop::new_x11() {
-            return el;
-        }
+        let x11_err = match EventsLoop::new_x11() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
 
-        panic!("No backend is available")
+        let err_string = format!(
+r#"Failed to initialize any backend!
+    Wayland status: {:#?}
+    X11 status: {:#?}
+"#,
+            wayland_err,
+            x11_err,
+        );
+        panic!(err_string);
     }
 
-    pub fn new_wayland() -> Result<EventsLoop, ()> {
+    pub fn new_wayland() -> Result<EventsLoop, ConnectError> {
         wayland::EventsLoop::new()
             .map(EventsLoop::Wayland)
-            .ok_or(())
     }
 
     pub fn new_x11() -> Result<EventsLoop, XNotSupported> {
-        match *X11_BACKEND {
-            Ok(ref x) => Ok(EventsLoop::X(x11::EventsLoop::new(x.clone()))),
-            Err(ref err) => Err(err.clone()),
-        }
+        X11_BACKEND
+            .lock()
+            .as_ref()
+            .map(Arc::clone)
+            .map(x11::EventsLoop::new)
+            .map(EventsLoop::X)
+            .map_err(|err| err.clone())
     }
 
     #[inline]
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
         match *self {
-            EventsLoop::Wayland(ref evlp) => evlp.get_available_monitors()
-                                    .into_iter()
-                                    .map(MonitorId::Wayland)
-                                    .collect(),
-            EventsLoop::X(ref evlp) => x11::get_available_monitors(evlp.x_connection())
-                                        .into_iter()
-                                        .map(MonitorId::X)
-                                        .collect(),
+            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(),
         }
     }
 
@@ -395,7 +475,7 @@ impl EventsLoop {
     pub fn get_primary_monitor(&self) -> MonitorId {
         match *self {
             EventsLoop::Wayland(ref evlp) => MonitorId::Wayland(evlp.get_primary_monitor()),
-            EventsLoop::X(ref evlp) => MonitorId::X(x11::get_primary_monitor(evlp.x_connection())),
+            EventsLoop::X(ref evlp) => MonitorId::X(evlp.x_connection().get_primary_monitor()),
         }
     }
 

src/platform/linux/wayland/event_loop.rs

@@ -1,39 +1,38 @@
 use std::cell::RefCell;
 use std::collections::VecDeque;
+use std::fmt;
 use std::sync::{Arc, Mutex, Weak};
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use {EventsLoopClosed, ControlFlow};
+use {ControlFlow, EventsLoopClosed, PhysicalPosition, PhysicalSize};
 
 use super::WindowId;
 use super::window::WindowStore;
-use super::keyboard::init_keyboard;
 
-use wayland_client::{EnvHandler, EnvNotify, default_connect, EventQueue, EventQueueHandle, Proxy, StateToken};
-use wayland_client::protocol::{wl_compositor, wl_seat, wl_shell, wl_shm, wl_subcompositor,
-                               wl_display, wl_registry, wl_output, wl_surface,
-                               wl_pointer, wl_keyboard, wl_touch};
+use sctk::Environment;
+use sctk::output::OutputMgr;
+use sctk::reexports::client::{Display, EventQueue, GlobalEvent, Proxy, ConnectError};
+use sctk::reexports::client::commons::Implementation;
+use sctk::reexports::client::protocol::{wl_keyboard, wl_output, wl_pointer, wl_registry, wl_seat,
+                                        wl_touch};
 
-use super::wayland_window::{Frame, Shell, create_frame, FrameImplementation};
-use super::wayland_protocols::unstable::xdg_shell::v6::client::zxdg_shell_v6;
+use sctk::reexports::client::protocol::wl_display::RequestsTrait as DisplayRequests;
 
 pub struct EventsLoopSink {
-    buffer: VecDeque<::Event>
+    buffer: VecDeque<::Event>,
 }
 
-unsafe impl Send for EventsLoopSink { }
-
 impl EventsLoopSink {
-    pub fn new() -> EventsLoopSink{
+    pub fn new() -> EventsLoopSink {
         EventsLoopSink {
-            buffer: VecDeque::new()
+            buffer: VecDeque::new(),
         }
     }
 
     pub fn send_event(&mut self, evt: ::WindowEvent, wid: WindowId) {
         let evt = ::Event::WindowEvent {
             event: evt,
-            window_id: ::WindowId(::platform::WindowId::Wayland(wid))
+            window_id: ::WindowId(::platform::WindowId::Wayland(wid)),
         };
         self.buffer.push_back(evt);
     }
@@ -42,7 +41,10 @@ impl EventsLoopSink {
         self.buffer.push_back(evt);
     }
 
-    fn empty_with<F>(&mut self, callback: &mut F) where F: FnMut(::Event) {
+    fn empty_with<F>(&mut self, callback: &mut F)
+    where
+        F: FnMut(::Event),
+    {
         for evt in self.buffer.drain(..) {
             callback(evt)
         }
@@ -57,15 +59,15 @@ pub struct EventsLoop {
     // Whether or not there is a pending `Awakened` event to be emitted.
     pending_wakeup: Arc<AtomicBool>,
     // The window store
-    pub store: StateToken<WindowStore>,
+    pub store: Arc<Mutex<WindowStore>>,
     // the env
-    env_token: StateToken<EnvHandler<InnerEnv>>,
-    // the ctxt
-    pub ctxt_token: StateToken<StateContext>,
+    pub env: Environment,
     // a cleanup switch to prune dead windows
     pub cleanup_needed: Arc<Mutex<bool>>,
     // The wayland display
-    pub display: Arc<wl_display::WlDisplay>,
+    pub display: Arc<Display>,
+    // The list of seats
+    pub seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
 }
 
 // A handle that can be sent across threads and used to wake up the `EventsLoop`.
@@ -73,7 +75,7 @@ pub struct EventsLoop {
 // We should only try and wake up the `EventsLoop` if it still exists, so we hold Weak ptrs.
 #[derive(Clone)]
 pub struct EventsLoopProxy {
-    display: Weak<wl_display::WlDisplay>,
+    display: Weak<Display>,
     pending_wakeup: Weak<AtomicBool>,
 }
 
@@ -89,69 +91,43 @@ impl EventsLoopProxy {
                 // Update the `EventsLoop`'s `pending_wakeup` flag.
                 wakeup.store(true, Ordering::Relaxed);
                 // Cause the `EventsLoop` to break from `dispatch` if it is currently blocked.
-                display.sync();
+                let _ = display.sync();
                 display.flush().map_err(|_| EventsLoopClosed)?;
                 Ok(())
-            },
+            }
             _ => Err(EventsLoopClosed),
         }
     }
 }
 
 impl EventsLoop {
-    pub fn new() -> Option<EventsLoop> {
-        let (display, mut event_queue) = match default_connect() {
-            Ok(ret) => ret,
-            Err(_) => return None
-        };
-
-        let registry = display.get_registry();
-        let ctxt_token = event_queue.state().insert(
-            StateContext::new(registry.clone().unwrap())
-        );
-        let env_token = EnvHandler::init_with_notify(
-            &mut event_queue,
-            &registry,
-            env_notify(),
-            ctxt_token.clone()
-        );
-
-        // two round trips to fully initialize
-        event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost");
-        event_queue.sync_roundtrip().expect("Wayland connection unexpectedly lost");
-
-        event_queue.state().with_value(&ctxt_token, |proxy, ctxt| {
-            ctxt.ensure_shell(proxy.get_mut(&env_token))
-        });
+    pub fn new() -> Result<EventsLoop, ConnectError> {
+        let (display, mut event_queue) = Display::connect_to_env()?;
 
         let sink = Arc::new(Mutex::new(EventsLoopSink::new()));
+        let store = Arc::new(Mutex::new(WindowStore::new()));
+        let seats = Arc::new(Mutex::new(Vec::new()));
 
-        let store = event_queue.state().insert(WindowStore::new());
+        let env = Environment::from_registry_with_cb(
+            display.get_registry().unwrap(),
+            &mut event_queue,
+            SeatManager {
+                sink: sink.clone(),
+                store: store.clone(),
+                seats: seats.clone(),
+            },
+        ).unwrap();
 
-        let seat_idata = SeatIData {
-            sink: sink.clone(),
-            keyboard: None,
-            pointer: None,
-            touch: None,
-            windows_token: store.clone()
-        };
-
-        let mut me = EventsLoop {
+        Ok(EventsLoop {
             display: Arc::new(display),
             evq: RefCell::new(event_queue),
             sink: sink,
             pending_wakeup: Arc::new(AtomicBool::new(false)),
             store: store,
-            ctxt_token: ctxt_token,
-            env_token: env_token,
-            cleanup_needed: Arc::new(Mutex::new(false))
-        };
-
-        me.init_seat(|evqh, seat| {
-            evqh.register(seat, seat_implementation(), seat_idata);
-        });
-
-        Some(me)
+            env: env,
+            cleanup_needed: Arc::new(Mutex::new(false)),
+            seats: seats,
+        })
     }
 
     pub fn create_proxy(&self) -> EventsLoopProxy {
@@ -162,7 +138,8 @@ impl EventsLoop {
     }
 
     pub fn poll_events<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event)
+    where
+        F: FnMut(::Event),
     {
         // send pending events to the server
         self.display.flush().expect("Wayland connection lost.");
@@ -175,7 +152,10 @@ impl EventsLoop {
             h.read_events().expect("Wayland connection lost.");
         }
         // dispatch wayland events
-        self.evq.get_mut().dispatch_pending().expect("Wayland connection lost.");
+        self.evq
+            .get_mut()
+            .dispatch_pending()
+            .expect("Wayland connection lost.");
         self.post_dispatch_triggers();
 
         // dispatch buffered events to client
@@ -183,15 +163,18 @@ impl EventsLoop {
     }
 
     pub fn run_forever<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event) -> ControlFlow,
+    where
+        F: FnMut(::Event) -> ControlFlow,
     {
         // send pending events to the server
         self.display.flush().expect("Wayland connection lost.");
 
         // Check for control flow by wrapping the callback.
         let control_flow = ::std::cell::Cell::new(ControlFlow::Continue);
-        let mut callback = |event| if let ControlFlow::Break = callback(event) {
-            control_flow.set(ControlFlow::Break);
+        let mut callback = |event| {
+            if let ControlFlow::Break = callback(event) {
+                control_flow.set(ControlFlow::Break);
+            }
         };
 
         // dispatch any pre-buffered events
@@ -200,7 +183,10 @@ impl EventsLoop {
 
         loop {
             // dispatch events blocking if needed
-            self.evq.get_mut().dispatch().expect("Wayland connection lost.");
+            self.evq
+                .get_mut()
+                .dispatch()
+                .expect("Wayland connection lost.");
             self.post_dispatch_triggers();
 
             // empty buffer of events
@@ -213,25 +199,11 @@ impl EventsLoop {
     }
 
     pub fn get_primary_monitor(&self) -> MonitorId {
-        let mut guard = self.evq.borrow_mut();
-        let state = guard.state();
-        let state_ctxt = state.get(&self.ctxt_token);
-        if let Some(info) = state_ctxt.monitors.iter().next() {
-            MonitorId {
-                info: info.clone()
-            }
-        } else {
-            panic!("No monitor is available.")
-        }
+        get_primary_monitor(&self.env.outputs)
     }
 
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut guard = self.evq.borrow_mut();
-        let state = guard.state();
-        let state_ctxt = state.get(&self.ctxt_token);
-        state_ctxt.monitors.iter()
-        .map(|m| MonitorId { info: m.clone() })
-        .collect()
+        get_available_monitors(&self.env.outputs)
     }
 }
 
@@ -239,93 +211,9 @@ impl EventsLoop {
  * Private EventsLoop Internals
  */
 
-wayland_env!(InnerEnv,
-    compositor: wl_compositor::WlCompositor,
-    shm: wl_shm::WlShm,
-    subcompositor: wl_subcompositor::WlSubcompositor
-);
-
-pub struct StateContext {
-    registry: wl_registry::WlRegistry,
-    seat: Option<wl_seat::WlSeat>,
-    shell: Option<Shell>,
-    monitors: Vec<Arc<Mutex<OutputInfo>>>
-}
-
-impl StateContext {
-    fn new(registry: wl_registry::WlRegistry) -> StateContext {
-        StateContext {
-            registry: registry,
-            seat: None,
-            shell: None,
-            monitors: Vec::new()
-        }
-    }
-
-    /// Ensures a shell is available
-    ///
-    /// If a shell is already bound, do nothing. Otherwise,
-    /// try to bind wl_shell as a fallback. If this fails,
-    /// panic, as this is a bug from the compositor.
-    fn ensure_shell(&mut self, env: &mut EnvHandler<InnerEnv>) {
-        if self.shell.is_some() {
-            return;
-        }
-        // xdg_shell is not available, so initialize wl_shell
-        for &(name, ref interface, _) in env.globals() {
-            if interface == "wl_shell" {
-                self.shell = Some(Shell::Wl(self.registry.bind::<wl_shell::WlShell>(1, name)));
-                return;
-            }
-        }
-        // This is a compositor bug, it _must_ at least support wl_shell
-        panic!("Compositor didi not advertize xdg_shell not wl_shell.");
-    }
-
-    pub fn monitor_id_for(&self, output: &wl_output::WlOutput) -> MonitorId {
-        for info in &self.monitors {
-            let guard = info.lock().unwrap();
-            if guard.output.equals(output) {
-                return MonitorId {
-                    info: info.clone()
-                };
-            }
-        }
-        panic!("Received an inexistent wl_output?!");
-    }
-}
-
 impl EventsLoop {
-    pub fn init_seat<F>(&mut self, f: F)
-    where F: FnOnce(&mut EventQueueHandle, &wl_seat::WlSeat)
-    {
-        let mut guard = self.evq.borrow_mut();
-        if guard.state().get(&self.ctxt_token).seat.is_some() {
-            // seat has already been init
-            return;
-        }
-
-        // clone the token to make borrow checker happy
-        let ctxt_token = self.ctxt_token.clone();
-        let seat = guard.state().with_value(&self.env_token, |proxy, env| {
-            let ctxt = proxy.get(&ctxt_token);
-            for &(name, ref interface, _) in env.globals() {
-                if interface == wl_seat::WlSeat::interface_name() {
-                    return Some(ctxt.registry.bind::<wl_seat::WlSeat>(5, name));
-                }
-            }
-            None
-        });
-
-        if let Some(seat) = seat {
-            f(&mut *guard, &seat);
-            guard.state().get_mut(&self.ctxt_token).seat = Some(seat)
-        }
-    }
-
     fn post_dispatch_triggers(&mut self) {
         let mut sink = self.sink.lock().unwrap();
-        let evq = self.evq.get_mut();
         // process a possible pending wakeup call
         if self.pending_wakeup.load(Ordering::Relaxed) {
             sink.send_raw_event(::Event::Awakened);
@@ -335,7 +223,7 @@ impl EventsLoop {
         {
             let mut cleanup_needed = self.cleanup_needed.lock().unwrap();
             if *cleanup_needed {
-                let pruned = evq.state().get_mut(&self.store).cleanup();
+                let pruned = self.store.lock().unwrap().cleanup();
                 *cleanup_needed = false;
                 for wid in pruned {
                     sink.send_event(::WindowEvent::Destroyed, wid);
@@ -343,157 +231,169 @@ impl EventsLoop {
             }
         }
         // process pending resize/refresh
-        evq.state().get_mut(&self.store).for_each(
-            |newsize, refresh, frame_refresh, closed, wid, frame| {
+        self.store.lock().unwrap().for_each(
+            |newsize, size, new_dpi, refresh, frame_refresh, closed, wid, frame| {
                 if let Some(frame) = frame {
                     if let Some((w, h)) = newsize {
-                        frame.resize(w as i32, h as i32);
+                        frame.resize(w, h);
                         frame.refresh();
-                        sink.send_event(::WindowEvent::Resized(w as u32, h as u32), wid);
+                        let logical_size = ::LogicalSize::new(w as f64, h as f64);
+                        sink.send_event(::WindowEvent::Resized(logical_size), wid);
+                        *size = (w, h);
                     } else if frame_refresh {
                         frame.refresh();
                     }
                 }
+                if let Some(dpi) = new_dpi {
+                    sink.send_event(::WindowEvent::HiDpiFactorChanged(dpi as f64), wid);
+                }
                 if refresh {
                     sink.send_event(::WindowEvent::Refresh, wid);
                 }
                 if closed {
                     sink.send_event(::WindowEvent::CloseRequested, wid);
                 }
-            }
+            },
         )
     }
-
-    /// Create a new window with given dimensions
-    ///
-    /// Grabs a lock on the event queue in the process
-    pub fn create_window<ID: 'static, F>(&self, width: u32, height: u32, implem: FrameImplementation<ID>, idata: F)
-        -> (wl_surface::WlSurface, Frame)
-    where F: FnOnce(&wl_surface::WlSurface) -> ID
-    {
-        let (surface, frame) = {
-            let mut guard = self.evq.borrow_mut();
-            let env = guard.state().get(&self.env_token).clone_inner().unwrap();
-            let shell = match guard.state().get(&self.ctxt_token).shell {
-                Some(Shell::Wl(ref wl_shell)) => Shell::Wl(wl_shell.clone().unwrap()),
-                Some(Shell::Xdg(ref xdg_shell)) => Shell::Xdg(xdg_shell.clone().unwrap()),
-                None => unreachable!()
-            };
-            let seat = guard.state().get(&self.ctxt_token).seat.as_ref().and_then(|s| s.clone());
-            let surface = env.compositor.create_surface();
-            let frame = create_frame(
-                &mut guard,
-                implem,
-                idata(&surface),
-                &surface, width as i32, height as i32,
-                &env.compositor,
-                &env.subcompositor,
-                &env.shm,
-                &shell,
-                seat
-            ).expect("Failed to create a tmpfile buffer.");
-            (surface, frame)
-        };
-
-        (surface, frame)
-    }
 }
 
 /*
  * Wayland protocol implementations
  */
 
-fn env_notify() -> EnvNotify<StateToken<StateContext>> {
-    EnvNotify {
-        new_global: |evqh, token, registry, id, interface, version| {
-            use std::cmp::min;
-            if interface == wl_output::WlOutput::interface_name() {
-                // a new output is available
-                let output = registry.bind::<wl_output::WlOutput>(min(version, 3), id);
-                evqh.register(&output, output_impl(), token.clone());
-                evqh.state().get_mut(&token).monitors.push(
-                    Arc::new(Mutex::new(OutputInfo::new(output, id)))
-                );
-            } else if interface == zxdg_shell_v6::ZxdgShellV6::interface_name() {
-                // We have an xdg_shell, bind it
-                let xdg_shell = registry.bind::<zxdg_shell_v6::ZxdgShellV6>(1, id);
-                evqh.register(&xdg_shell, xdg_ping_implementation(), ());
-                evqh.state().get_mut(&token).shell = Some(Shell::Xdg(xdg_shell));
-            }
-        },
-        del_global: |evqh, token, _, id| {
-            // maybe this was a monitor, cleanup
-            evqh.state().get_mut(&token).monitors.retain(
-                |m| m.lock().unwrap().id != id
-            );
-        },
-        ready: |_, _, _| {}
-    }
+struct SeatManager {
+    sink: Arc<Mutex<EventsLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
 }
 
-fn xdg_ping_implementation() -> zxdg_shell_v6::Implementation<()> {
-    zxdg_shell_v6::Implementation {
-        ping: |_, _, shell, serial| {
-            shell.pong(serial);
+impl Implementation<Proxy<wl_registry::WlRegistry>, GlobalEvent> for SeatManager {
+    fn receive(&mut self, evt: GlobalEvent, registry: Proxy<wl_registry::WlRegistry>) {
+        use self::wl_registry::RequestsTrait as RegistryRequests;
+        use self::wl_seat::RequestsTrait as SeatRequests;
+        match evt {
+            GlobalEvent::New {
+                id,
+                ref interface,
+                version,
+            } if interface == "wl_seat" =>
+            {
+                use std::cmp::min;
+                let seat = registry
+                    .bind::<wl_seat::WlSeat>(min(version, 5), id)
+                    .unwrap()
+                    .implement(SeatData {
+                        sink: self.sink.clone(),
+                        store: self.store.clone(),
+                        pointer: None,
+                        keyboard: None,
+                        touch: None,
+                    });
+                self.store.lock().unwrap().new_seat(&seat);
+                self.seats.lock().unwrap().push((id, seat));
+            }
+            GlobalEvent::Removed { id, ref interface } if interface == "wl_seat" => {
+                let mut seats = self.seats.lock().unwrap();
+                if let Some(idx) = seats.iter().position(|&(i, _)| i == id) {
+                    let (_, seat) = seats.swap_remove(idx);
+                    if seat.version() >= 5 {
+                        seat.release();
+                    }
+                }
+            }
+            _ => (),
         }
     }
 }
 
-struct SeatIData {
+struct SeatData {
     sink: Arc<Mutex<EventsLoopSink>>,
-    pointer: Option<wl_pointer::WlPointer>,
-    keyboard: Option<wl_keyboard::WlKeyboard>,
-    touch: Option<wl_touch::WlTouch>,
-    windows_token: StateToken<WindowStore>
+    store: Arc<Mutex<WindowStore>>,
+    pointer: Option<Proxy<wl_pointer::WlPointer>>,
+    keyboard: Option<Proxy<wl_keyboard::WlKeyboard>>,
+    touch: Option<Proxy<wl_touch::WlTouch>>,
 }
 
-fn seat_implementation() -> wl_seat::Implementation<SeatIData> {
-    wl_seat::Implementation {
-        name: |_, _, _, _| {},
-        capabilities: |evqh, idata, seat, capabilities| {
-            // create pointer if applicable
-            if capabilities.contains(wl_seat::Capability::Pointer) && idata.pointer.is_none() {
-                let pointer = seat.get_pointer().expect("Seat is not dead");
-                let p_idata = super::pointer::PointerIData::new(
-                    &idata.sink,
-                    idata.windows_token.clone()
-                );
-                evqh.register(&pointer, super::pointer::pointer_implementation(), p_idata);
-                idata.pointer = Some(pointer);
-            }
-            // destroy pointer if applicable
-            if !capabilities.contains(wl_seat::Capability::Pointer) {
-                if let Some(pointer) = idata.pointer.take() {
-                    pointer.release();
+impl Implementation<Proxy<wl_seat::WlSeat>, wl_seat::Event> for SeatData {
+    fn receive(&mut self, evt: wl_seat::Event, seat: Proxy<wl_seat::WlSeat>) {
+        use self::wl_seat::RequestsTrait as SeatRequests;
+        match evt {
+            wl_seat::Event::Name { .. } => (),
+            wl_seat::Event::Capabilities { capabilities } => {
+                // create pointer if applicable
+                if capabilities.contains(wl_seat::Capability::Pointer) && self.pointer.is_none() {
+                    self.pointer = Some(super::pointer::implement_pointer(
+                        seat.get_pointer().unwrap(),
+                        self.sink.clone(),
+                        self.store.clone(),
+                    ))
+                }
+                // destroy pointer if applicable
+                if !capabilities.contains(wl_seat::Capability::Pointer) {
+                    if let Some(pointer) = self.pointer.take() {
+                        if pointer.version() >= 3 {
+                            use self::wl_pointer::RequestsTrait;
+                            pointer.release();
+                        }
+                    }
+                }
+                // create keyboard if applicable
+                if capabilities.contains(wl_seat::Capability::Keyboard) && self.keyboard.is_none() {
+                    self.keyboard = Some(super::keyboard::init_keyboard(
+                        seat.get_keyboard().unwrap(),
+                        self.sink.clone(),
+                    ))
+                }
+                // destroy keyboard if applicable
+                if !capabilities.contains(wl_seat::Capability::Keyboard) {
+                    if let Some(kbd) = self.keyboard.take() {
+                        if kbd.version() >= 3 {
+                            use self::wl_keyboard::RequestsTrait;
+                            kbd.release();
+                        }
+                    }
+                }
+                // create touch if applicable
+                if capabilities.contains(wl_seat::Capability::Touch) && self.touch.is_none() {
+                    self.touch = Some(super::touch::implement_touch(
+                        seat.get_touch().unwrap(),
+                        self.sink.clone(),
+                        self.store.clone(),
+                    ))
+                }
+                // destroy touch if applicable
+                if !capabilities.contains(wl_seat::Capability::Touch) {
+                    if let Some(touch) = self.touch.take() {
+                        if touch.version() >= 3 {
+                            use self::wl_touch::RequestsTrait;
+                            touch.release();
+                        }
+                    }
                 }
             }
-            // create keyboard if applicable
-            if capabilities.contains(wl_seat::Capability::Keyboard) && idata.keyboard.is_none() {
-                let kbd = seat.get_keyboard().expect("Seat is not dead");
-                init_keyboard(evqh, &kbd, &idata.sink);
-                idata.keyboard = Some(kbd);
+        }
+    }
+}
+
+impl Drop for SeatData {
+    fn drop(&mut self) {
+        if let Some(pointer) = self.pointer.take() {
+            if pointer.version() >= 3 {
+                use self::wl_pointer::RequestsTrait;
+                pointer.release();
             }
-            // destroy keyboard if applicable
-            if !capabilities.contains(wl_seat::Capability::Keyboard) {
-                if let Some(kbd) = idata.keyboard.take() {
-                    kbd.release();
-                }
+        }
+        if let Some(kbd) = self.keyboard.take() {
+            if kbd.version() >= 3 {
+                use self::wl_keyboard::RequestsTrait;
+                kbd.release();
             }
-            // create touch if applicable
-            if capabilities.contains(wl_seat::Capability::Touch) && idata.touch.is_none() {
-                let touch = seat.get_touch().expect("Seat is not dead");
-                let t_idata = super::touch::TouchIData::new(
-                    &idata.sink,
-                    idata.windows_token.clone()
-                );
-                evqh.register(&touch, super::touch::touch_implementation(), t_idata);
-                idata.touch = Some(touch);
-            }
-            // destroy touch if applicable
-            if !capabilities.contains(wl_seat::Capability::Touch) {
-                if let Some(touch) = idata.touch.take() {
-                    touch.release();
-                }
+        }
+        if let Some(touch) = self.touch.take() {
+            if touch.version() >= 3 {
+                use self::wl_touch::RequestsTrait;
+                touch.release();
             }
         }
     }
@@ -503,92 +403,102 @@ fn seat_implementation() -> wl_seat::Implementation<SeatIData> {
  * Monitor stuff
  */
 
-fn output_impl() -> wl_output::Implementation<StateToken<StateContext>> {
-    wl_output::Implementation {
-        geometry: |evqh, token, output, x, y, _, _, _, make, model, _| {
-            let ctxt = evqh.state().get_mut(token);
-            for info in &ctxt.monitors {
-                let mut guard = info.lock().unwrap();
-                if guard.output.equals(output) {
-                    guard.pix_pos = (x, y);
-                    guard.name = format!("{} - {}", make, model);
-                    return;
-                }
-            }
-        },
-        mode: |evqh, token, output, flags, w, h, _refresh| {
-            if flags.contains(wl_output::Mode::Current) {
-                let ctxt = evqh.state().get_mut(token);
-                for info in &ctxt.monitors {
-                    let mut guard = info.lock().unwrap();
-                    if guard.output.equals(output) {
-                        guard.pix_size = (w as u32, h as u32);
-                        return;
-                    }
-                }
-            }
-        },
-        done: |_, _, _| {},
-        scale: |evqh, token, output, scale| {
-            let ctxt = evqh.state().get_mut(token);
-            for info in &ctxt.monitors {
-                let mut guard = info.lock().unwrap();
-                if guard.output.equals(output) {
-                    guard.scale = scale as f32;
-                    return;
-                }
-            }
-        }
-    }
-}
-
-pub struct OutputInfo {
-    pub output: wl_output::WlOutput,
-    pub id: u32,
-    pub scale: f32,
-    pub pix_size: (u32, u32),
-    pub pix_pos: (i32, i32),
-    pub 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),
-            pix_pos: (0, 0),
-            name: "".into()
-        }
-    }
-}
-
-#[derive(Clone)]
 pub struct MonitorId {
-    pub info: Arc<Mutex<OutputInfo>>
+    pub(crate) proxy: Proxy<wl_output::WlOutput>,
+    pub(crate) mgr: OutputMgr,
+}
+
+impl Clone for MonitorId {
+    fn clone(&self) -> MonitorId {
+        MonitorId {
+            proxy: self.proxy.clone(),
+            mgr: self.mgr.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for MonitorId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorId {
+            name: Option<String>,
+            native_identifier: u32,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: i32,
+        }
+
+        let monitor_id_proxy = MonitorId {
+            name: self.get_name(),
+            native_identifier: self.get_native_identifier(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
 }
 
 impl MonitorId {
     pub fn get_name(&self) -> Option<String> {
-        Some(self.info.lock().unwrap().name.clone())
+        self.mgr.with_info(&self.proxy, |_, info| {
+            format!("{} ({})", info.model, info.make)
+        })
     }
 
     #[inline]
     pub fn get_native_identifier(&self) -> u32 {
-        self.info.lock().unwrap().id
+        self.mgr.with_info(&self.proxy, |id, _| id).unwrap_or(0)
     }
 
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        self.info.lock().unwrap().pix_size
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        match self.mgr.with_info(&self.proxy, |_, info| {
+            info.modes
+                .iter()
+                .find(|m| m.is_current)
+                .map(|m| m.dimensions)
+        }) {
+            Some(Some((w, h))) => (w as u32, h as u32),
+            _ => (0, 0),
+        }.into()
     }
 
-    pub fn get_position(&self) -> (i32, i32) {
-        self.info.lock().unwrap().pix_pos
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.location)
+            .unwrap_or((0, 0))
+            .into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        self.info.lock().unwrap().scale
+    pub fn get_hidpi_factor(&self) -> i32 {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.scale_factor)
+            .unwrap_or(1)
     }
 }
+
+pub fn get_primary_monitor(outputs: &OutputMgr) -> MonitorId {
+    outputs.with_all(|list| {
+        if let Some(&(_, ref proxy, _)) = list.first() {
+            MonitorId {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            }
+        } else {
+            panic!("No monitor is available.")
+        }
+    })
+}
+
+pub fn get_available_monitors(outputs: &OutputMgr) -> VecDeque<MonitorId> {
+    outputs.with_all(|list| {
+        list.iter()
+            .map(|&(_, ref proxy, _)| MonitorId {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            })
+            .collect()
+    })
+}

src/platform/linux/wayland/keyboard.rs

@@ -1,150 +1,154 @@
 use std::sync::{Arc, Mutex};
 
-use {VirtualKeyCode, ElementState, WindowEvent as Event, KeyboardInput, ModifiersState};
+use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
 
-use super::{EventsLoopSink, WindowId, make_wid, DeviceId};
-use super::wayland_kbd::{MappedKeyboardImplementation, register_kbd};
-use wayland_client::protocol::wl_keyboard;
-use wayland_client::EventQueueHandle;
+use super::{make_wid, DeviceId, EventsLoopSink};
+use sctk::keyboard::{self, map_keyboard_auto, Event as KbEvent};
+use sctk::reexports::client::{NewProxy, Proxy};
+use sctk::reexports::client::protocol::wl_keyboard;
 
-pub fn init_keyboard(evq: &mut EventQueueHandle, keyboard: &wl_keyboard::WlKeyboard, sink: &Arc<Mutex<EventsLoopSink>>) {
-    let idata = KeyboardIData {
-        sink: sink.clone(),
-        target: None
-    };
-
-    if register_kbd(evq, keyboard, mapped_keyboard_impl(), idata).is_err() {
-        // initializing libxkbcommon failed :(
-        // fallback implementation
-        let idata = KeyboardIData {
-            sink: sink.clone(),
-            target: None
-        };
-        evq.register(keyboard, raw_keyboard_impl(), idata);
-    }
-}
-
-struct KeyboardIData {
+pub fn init_keyboard(
+    keyboard: NewProxy<wl_keyboard::WlKeyboard>,
     sink: Arc<Mutex<EventsLoopSink>>,
-    target: Option<WindowId>
-}
-
-fn mapped_keyboard_impl() -> MappedKeyboardImplementation<KeyboardIData> {
-    MappedKeyboardImplementation {
-        enter: |_, idata, _, _, surface, _, _, _| {
-            let wid = make_wid(surface);
-            idata.sink.lock().unwrap().send_event(Event::Focused(true), wid);
-            idata.target = Some(wid);
-        },
-        leave: |_, idata, _, _, surface| {
-            let wid = make_wid(surface);
-            idata.sink.lock().unwrap().send_event(Event::Focused(false), wid);
-            idata.target = None;
-        },
-        key: |_, idata, _, _, _, mods, rawkey, keysym, state, utf8| {
-            if let Some(wid) = idata.target {
+) -> Proxy<wl_keyboard::WlKeyboard> {
+    // { variables to be captured by the closure
+    let mut target = None;
+    let my_sink = sink.clone();
+    // }
+    let ret = map_keyboard_auto(keyboard, move |evt: KbEvent, _| match evt {
+        KbEvent::Enter { surface, .. } => {
+            let wid = make_wid(&surface);
+            my_sink
+                .lock()
+                .unwrap()
+                .send_event(WindowEvent::Focused(true), wid);
+            target = Some(wid);
+        }
+        KbEvent::Leave { surface, .. } => {
+            let wid = make_wid(&surface);
+            my_sink
+                .lock()
+                .unwrap()
+                .send_event(WindowEvent::Focused(false), wid);
+            target = None;
+        }
+        KbEvent::Key {
+            modifiers,
+            rawkey,
+            keysym,
+            state,
+            utf8,
+            ..
+        } => {
+            if let Some(wid) = 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 = idata.sink.lock().unwrap();
+                let mut guard = my_sink.lock().unwrap();
                 guard.send_event(
-                    Event::KeyboardInput {
+                    WindowEvent::KeyboardInput {
                         device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
                         input: KeyboardInput {
                             state: state,
                             scancode: rawkey,
                             virtual_keycode: vkcode,
-                            modifiers: ModifiersState {
-                                shift: mods.shift,
-                                ctrl: mods.ctrl,
-                                alt: mods.alt,
-                                logo: mods.logo
-                            },
+                            modifiers: modifiers.into(),
                         },
                     },
-                    wid
+                    wid,
                 );
                 // send char event only on key press, not release
-                if let ElementState::Released = state { return }
+                if let ElementState::Released = state {
+                    return;
+                }
                 if let Some(txt) = utf8 {
                     for chr in txt.chars() {
-                        guard.send_event(Event::ReceivedCharacter(chr), wid);
+                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
                     }
                 }
             }
-        },
-        repeat_info: |_, _idata, _, _rate, _delay| {
-            // TODO: handle repeat info
         }
-    }
-}
+        KbEvent::RepeatInfo { .. } => { /* TODO: handle repeat info */ }
+    });
 
+    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)
 
-// This is 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)
-fn raw_keyboard_impl() -> wl_keyboard::Implementation<KeyboardIData> {
-    wl_keyboard::Implementation {
-        enter: |_, idata, _, _, surface, _| {
-            let wid = make_wid(surface);
-            idata.sink.lock().unwrap().send_event(Event::Focused(true), wid);
-            idata.target = Some(wid);
-        },
-        leave: |_, idata, _, _, surface| {
-            let wid = make_wid(surface);
-            idata.sink.lock().unwrap().send_event(Event::Focused(false), wid);
-            idata.target = None;
-        },
-        key: |_, idata, _, _, _, key, state| {
-            if let Some(wid) = idata.target {
-                let state = match state {
-                    wl_keyboard::KeyState::Pressed => ElementState::Pressed,
-                    wl_keyboard::KeyState::Released => ElementState::Released,
-                };
-                idata.sink.lock().unwrap().send_event(
-                    Event::KeyboardInput {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        input: KeyboardInput {
-                            state: state,
-                            scancode: key,
-                            virtual_keycode: None,
-                            modifiers: ModifiersState::default(),
-                        },
-                    },
-                    wid
-                );
-            }
-        },
-        repeat_info: |_, _idata, _, _rate, _delay| {},
-        keymap: |_, _, _, _, _, _| {},
-        modifiers: |_, _, _, _, _, _, _, _| {}
+            // { 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),
@@ -174,15 +178,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),
@@ -243,7 +247,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),
@@ -266,7 +269,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),
@@ -290,7 +292,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,14 +1,11 @@
-#![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 = "openbsd"))]
 
 pub use self::window::Window;
 pub use self::event_loop::{EventsLoop, EventsLoopProxy, EventsLoopSink, MonitorId};
 
-extern crate wayland_kbd;
-extern crate wayland_window;
-extern crate wayland_protocols;
-
-use wayland_client::protocol::wl_surface;
-use wayland_client::Proxy;
+use sctk::reexports::client::protocol::wl_surface;
+use sctk::reexports::client::Proxy;
 
 mod event_loop;
 mod pointer;
@@ -23,6 +20,6 @@ pub struct DeviceId;
 pub struct WindowId(usize);
 
 #[inline]
-fn make_wid(s: &wl_surface::WlSurface) -> WindowId {
-    WindowId(s.ptr() as usize)
-}
+fn make_wid(s: &Proxy<wl_surface::WlSurface>) -> WindowId {
+    WindowId(s.c_ptr() as usize)
+}

src/platform/linux/wayland/pointer.rs

@@ -1,194 +1,190 @@
 use std::sync::{Arc, Mutex};
 
-use {WindowEvent as Event, ElementState, MouseButton, MouseScrollDelta, TouchPhase};
+use {ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent};
 use events::ModifiersState;
 
-use super::{WindowId, DeviceId};
+use super::DeviceId;
 use super::event_loop::EventsLoopSink;
 use super::window::WindowStore;
 
-use wayland_client::{Proxy, StateToken};
-use wayland_client::protocol::wl_pointer;
+use sctk::reexports::client::{NewProxy, Proxy};
+use sctk::reexports::client::protocol::wl_pointer::{self, Event as PtrEvent, WlPointer};
 
-pub struct PointerIData {
+pub fn implement_pointer(
+    pointer: NewProxy<WlPointer>,
     sink: Arc<Mutex<EventsLoopSink>>,
-    windows_token: StateToken<WindowStore>,
-    mouse_focus: Option<WindowId>,
-    axis_buffer: Option<(f32, f32)>,
-    axis_discrete_buffer: Option<(i32, i32)>,
-    axis_state: TouchPhase,
-}
+    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;
 
-impl PointerIData {
-    pub fn new(sink: &Arc<Mutex<EventsLoopSink>>, token: StateToken<WindowStore>)
-        -> PointerIData
-    {
-        PointerIData {
-            sink: sink.clone(),
-            windows_token: token,
-            mouse_focus: None,
-            axis_buffer: None,
-            axis_discrete_buffer: None,
-            axis_state: TouchPhase::Cancelled
+    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,
+                }
+            }
         }
-    }
-}
-
-pub fn pointer_implementation() -> wl_pointer::Implementation<PointerIData> {
-    wl_pointer::Implementation {
-        enter: |evqh, idata, _, _, surface, x, y| {
-            let wid = evqh.state().get(&idata.windows_token).find_wid(surface);
-            if let Some(wid) = wid {
-                idata.mouse_focus = Some(wid);
-                let mut guard = idata.sink.lock().unwrap();
-                guard.send_event(
-                    Event::CursorEntered {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                    },
-                    wid,
-                );
-                guard.send_event(
-                    Event::CursorMoved {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        position: (x, y),
-                        // TODO: replace dummy value with actual modifier state
-                        modifiers: ModifiersState::default(),
-                    },
-                    wid,
-                );
-            }
-        },
-        leave: |evqh, idata, _, _, surface| {
-            idata.mouse_focus = None;
-            let wid = evqh.state().get(&idata.windows_token).find_wid(surface);
-            if let Some(wid) = wid {
-                let mut guard = idata.sink.lock().unwrap();
-                guard.send_event(
-                    Event::CursorLeft {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                    },
-                    wid,
-                );
-            }
-        },
-        motion: |_, idata, _, _, x, y| {
-            if let Some(wid) = idata.mouse_focus {
-                idata.sink.lock().unwrap().send_event(
-                    Event::CursorMoved {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        position: (x, y),
-                        // TODO: replace dummy value with actual modifier state
-                        modifiers: ModifiersState::default(),
-                    },
-                    wid
-                );
-            }
-        },
-        button: |_, idata, _, _, _, button, state| {
-            if let Some(wid) = idata.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
-                };
-                idata.sink.lock().unwrap().send_event(
-                    Event::MouseInput {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        state: state,
-                        button: button,
-                        // TODO: replace dummy value with actual modifier state
-                        modifiers: ModifiersState::default(),
-                    },
-                    wid
-                );
-            }
-        },
-        axis: |_, idata, pointer, _, axis, value| {
-            if let Some(wid) = idata.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
-                    }
-                    idata.sink.lock().unwrap().send_event(
-                        Event::MouseWheel {
-                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                            delta: MouseScrollDelta::PixelDelta(x as f32, y as f32),
-                            phase: TouchPhase::Moved,
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        wid
-                    );
-                } else {
-                    let (mut x, mut y) = idata.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
-                    }
-                    idata.axis_buffer = Some((x,y));
-                    idata.axis_state = match idata.axis_state {
-                        TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
-                        _ => TouchPhase::Started
-                    }
-                }
-            }
-        },
-        frame: |_, idata, _| {
-            let axis_buffer = idata.axis_buffer.take();
-            let axis_discrete_buffer = idata.axis_discrete_buffer.take();
-            if let Some(wid) = idata.mouse_focus {
-                if let Some((x, y)) = axis_discrete_buffer {
-                    idata.sink.lock().unwrap().send_event(
-                        Event::MouseWheel {
-                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                            delta: MouseScrollDelta::LineDelta(x as f32, y as f32),
-                            phase: idata.axis_state,
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        wid
-                    );
-                } else if let Some((x, y)) = axis_buffer {
-                    idata.sink.lock().unwrap().send_event(
-                        Event::MouseWheel {
-                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                            delta: MouseScrollDelta::PixelDelta(x as f32, y as f32),
-                            phase: idata.axis_state,
-                            // TODO: replace dummy value with actual modifier state
-                            modifiers: ModifiersState::default(),
-                        },
-                        wid
-                    );
-                }
-            }
-        },
-        axis_source: |_, _, _, _| {},
-        axis_stop: |_, idata, _, _, _| {
-            idata.axis_state = TouchPhase::Ended;
-        },
-        axis_discrete: |_, idata, _, axis, discrete| {
-            let (mut x, mut y) = idata.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
-            }
-            idata.axis_discrete_buffer = Some((x,y));
-            idata.axis_state = match idata.axis_state {
-                TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
-                _ => TouchPhase::Started
-            }
-        },
-    }
+    })
 }

src/platform/linux/wayland/touch.rs

@@ -1,106 +1,93 @@
 use std::sync::{Arc, Mutex};
 
-use {WindowEvent as Event, TouchPhase};
+use {TouchPhase, WindowEvent};
 
-use super::{WindowId, DeviceId};
+use super::{DeviceId, WindowId};
 use super::event_loop::EventsLoopSink;
 use super::window::WindowStore;
 
-use wayland_client::StateToken;
-use wayland_client::protocol::wl_touch;
-
-pub struct TouchIData {
-    sink: Arc<Mutex<EventsLoopSink>>,
-    windows_token: StateToken<WindowStore>,
-    pending_ids: Vec<TouchPoint>,
-}
+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
+    id: i32,
 }
 
-impl TouchIData {
-    pub fn new(sink: &Arc<Mutex<EventsLoopSink>>, token: StateToken<WindowStore>)
-        -> TouchIData
-    {
-        TouchIData {
-            sink: sink.clone(),
-            windows_token: token,
-            pending_ids: Vec::new(),
-        }
-    }
-}
-
-pub fn touch_implementation() -> wl_touch::Implementation<TouchIData> {
-    wl_touch::Implementation {
-        down: |evqh, idata, _, _serial, _time, surface, touch_id, x, y| {
-            let wid = evqh.state().get(&idata.windows_token).find_wid(surface);
-            if let Some(wid) = wid {
-                let mut guard = idata.sink.lock().unwrap();
-                guard.send_event(
-                    Event::Touch(::Touch {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        phase: TouchPhase::Started,
+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: touch_id as u64
-                    }),
-                    wid,
-                );
-                idata.pending_ids.push(TouchPoint {
-                    wid: wid,
-                    location: (x, y),
-                    id: touch_id
-                });
+                        id: id,
+                    });
+                }
             }
-        },
-        up: |_, idata, _, _serial, _time, touch_id| {
-            let idx = idata.pending_ids.iter().position(|p| p.id == touch_id);
-            if let Some(idx) = idx {
-                let pt = idata.pending_ids.remove(idx);
-                let mut guard = idata.sink.lock().unwrap();
-                guard.send_event(
-                    Event::Touch(::Touch {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        phase: TouchPhase::Ended,
-                        location: pt.location,
-                        id: touch_id as u64
-                    }),
-                    pt.wid,
-                );
+            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,
+                    );
+                }
             }
-        },
-        motion: |_, idata, _, _time, touch_id, x, y| {
-            let pt = idata.pending_ids.iter_mut().find(|p| p.id == touch_id);
-            if let Some(pt) = pt {
-                let mut guard = idata.sink.lock().unwrap();
-                pt.location = (x, y);
-                guard.send_event(
-                    Event::Touch(::Touch {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        phase: TouchPhase::Moved,
-                        location: (x, y),
-                        id: touch_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,
+                    );
+                }
             }
-        },
-        frame: |_, _, _| {},
-        cancel: |_, idata, _| {
-            let mut guard = idata.sink.lock().unwrap();
-            for pt in idata.pending_ids.drain(..) {
-                guard.send_event(
-                    Event::Touch(::Touch {
+            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,
-                        id: pt.id as u64
+                        location: pt.location.into(),
+                        id: pt.id as u64,
                     }),
                     pt.wid,
                 );
-            }
+            },
         }
-    }
-}
+    })
+}

src/platform/linux/wayland/window.rs

@@ -1,90 +1,164 @@
+use std::collections::VecDeque;
 use std::sync::{Arc, Mutex, Weak};
 
-use wayland_client::protocol::{wl_display,wl_surface};
-use wayland_client::{Proxy, StateToken};
-
-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::{EventsLoop, WindowId, make_wid, MonitorId};
-use super::wayland_window::{Frame, FrameImplementation, State as FrameState};
-use super::event_loop::StateContext;
+use sctk::window::{BasicFrame, Event as WEvent, Window as SWindow};
+use sctk::reexports::client::{Display, Proxy};
+use sctk::reexports::client::protocol::{wl_seat, wl_surface, wl_output};
+use sctk::reexports::client::protocol::wl_compositor::RequestsTrait as CompositorRequests;
+use sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceRequests;
+use sctk::output::OutputMgr;
+
+use super::{make_wid, EventsLoop, MonitorId, WindowId};
+use platform::platform::wayland::event_loop::{get_available_monitors, get_primary_monitor};
 
 pub struct Window {
-    surface: wl_surface::WlSurface,
-    frame: Arc<Mutex<Frame>>,
-    monitors: Arc<Mutex<MonitorList>>,
+    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<wl_display::WlDisplay>,
-    need_frame_refresh: Arc<Mutex<bool>>
+    display: Arc<Display>,
+    need_frame_refresh: Arc<Mutex<bool>>,
 }
 
 impl Window {
-    pub fn new(evlp: &EventsLoop, attributes: &WindowAttributes) -> Result<Window, CreationError>
-    {
-        let (width, height) = attributes.dimensions.unwrap_or((800,600));
-
-        // Create the decorated surface
+    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 store_token = evlp.store.clone();
-        let (surface, mut frame) = evlp.create_window(
-            width, height, decorated_impl(),
-            |surface| FrameIData {
-                surface: surface.clone().unwrap(),
-                store_token: store_token.clone()
+
+        // monitor tracking
+        let monitor_list = Arc::new(Mutex::new(MonitorList::new()));
+
+        let surface = evlp.env.compositor.create_surface().unwrap().implement({
+            let list = monitor_list.clone();
+            let omgr = evlp.env.outputs.clone();
+            let window_store = evlp.store.clone();
+            move |event, surface: Proxy<wl_surface::WlSurface>| match event {
+                wl_surface::Event::Enter { output } => {
+                    let dpi_change = list.lock().unwrap().add_output(MonitorId {
+                        proxy: output,
+                        mgr: omgr.clone(),
+                    });
+                    if let Some(dpi) = dpi_change {
+                        if surface.version() >= 3 {
+                            // without version 3 we can't be dpi aware
+                            window_store.lock().unwrap().dpi_change(&surface, dpi);
+                            surface.set_buffer_scale(dpi);
+                        }
+                    }
+                },
+                wl_surface::Event::Leave { output } => {
+                    let dpi_change = list.lock().unwrap().del_output(&output);
+                    if let Some(dpi) = dpi_change {
+                        if surface.version() >= 3 {
+                            // without version 3 we can't be dpi aware
+                            window_store.lock().unwrap().dpi_change(&surface, dpi);
+                            surface.set_buffer_scale(dpi);
+                        }
+                    }
+                }
             }
-        );
-        // Check for fullscreen requirements
-        if let Some(RootMonitorId { inner: PlatformMonitorId::Wayland(ref monitor_id) }) = attributes.fullscreen {
-            let info = monitor_id.info.lock().unwrap();
-            frame.set_state(FrameState::Fullscreen(Some(&info.output)));
-        } else if attributes.maximized {
-            frame.set_state(FrameState::Maximized);
+        });
+
+        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(|(w, h)| (w as i32, h as i32)));
-        frame.set_max_size(attributes.max_dimensions.map(|(w, h)| (w as i32, h as i32)));
-
-        // setup the monitor tracking
-        let monitor_list = Arc::new(Mutex::new(MonitorList::default()));
-        {
-            let mut evq = evlp.evq.borrow_mut();
-            let idata = (evlp.ctxt_token.clone(), monitor_list.clone());
-            evq.register(&surface, surface_impl(), idata);
-        }
+        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));
 
-        {
-            let mut evq = evlp.evq.borrow_mut();
-            evq.state().get_mut(&store_token).windows.push(InternalWindow {
-                closed: false,
-                newsize: None,
-                need_refresh: false,
-                need_frame_refresh: need_frame_refresh.clone(),
-                surface: surface.clone().unwrap(),
-                kill_switch: kill_switch.clone(),
-                frame: Arc::downgrade(&frame)
-            });
-            evq.sync_roundtrip().unwrap();
-        }
+        evlp.store.lock().unwrap().windows.push(InternalWindow {
+            closed: false,
+            newsize: None,
+            size: size.clone(),
+            need_refresh: false,
+            need_frame_refresh: need_frame_refresh.clone(),
+            surface: surface.clone(),
+            kill_switch: kill_switch.clone(),
+            frame: Arc::downgrade(&frame),
+            current_dpi: 1,
+            new_dpi: None,
+        });
+        evlp.evq.borrow_mut().sync_roundtrip().unwrap();
 
         Ok(Window {
             display: evlp.display.clone(),
             surface: surface,
             frame: frame,
             monitors: monitor_list,
+            outputs: evlp.env.outputs.clone(),
             size: size,
             kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
-            need_frame_refresh: need_frame_refresh
+            need_frame_refresh: need_frame_refresh,
         })
     }
 
@@ -108,75 +182,59 @@ 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 get_inner_position(&self) -> Option<(i32, i32)> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         // Not possible with wayland
         None
     }
 
     #[inline]
-    pub fn set_position(&self, _x: i32, _y: i32) {
+    pub fn set_position(&self, _pos: LogicalPosition) {
         // Not possible with wayland
     }
 
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        Some(self.size.lock().unwrap().clone())
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        Some(self.size.lock().unwrap().clone().into())
     }
 
     #[inline]
-    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+    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) {
-        self.frame.lock().unwrap().resize(x as i32, y as i32);
-        *(self.size.lock().unwrap()) = (x, y);
+    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<(u32, u32)>) {
-        self.frame.lock().unwrap().set_min_size(dimensions.map(|(w, h)| (w as i32, h as i32)));
+    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<(u32, u32)>) {
-        self.frame.lock().unwrap().set_max_size(dimensions.map(|(w, h)| (w as i32, h as i32)));
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.frame.lock().unwrap().set_max_size(dimensions.map(Into::into));
     }
 
     #[inline]
-    pub fn set_cursor(&self, _cursor: MouseCursor) {
-        // TODO
+    pub fn set_resizable(&self, resizable: bool) {
+        self.frame.lock().unwrap().set_resizable(resizable);
     }
 
     #[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(())
-        }
-    }
-
-    #[inline]
-    pub fn hidpi_factor(&self) -> f32 {
-        let mut factor = 1.0;
-        let guard = self.monitors.lock().unwrap();
-        for monitor_id in &guard.monitors {
-            let info = monitor_id.info.lock().unwrap();
-            if info.scale > factor { factor = info.scale; }
-        }
-        factor
+    pub fn hidpi_factor(&self) -> i32 {
+        self.monitors.lock().unwrap().compute_hidpi_factor()
     }
 
     pub fn set_decorations(&self, decorate: bool) {
@@ -186,32 +244,51 @@ impl Window {
 
     pub fn set_maximized(&self, maximized: bool) {
         if maximized {
-            self.frame.lock().unwrap().set_state(FrameState::Maximized);
+            self.frame.lock().unwrap().set_maximized();
         } else {
-            self.frame.lock().unwrap().set_state(FrameState::Regular);
+            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 {
-            let info = monitor_id.info.lock().unwrap();
-            self.frame.lock().unwrap().set_state(FrameState::Fullscreen(Some(&info.output)));
+        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().set_state(FrameState::Regular);
+            self.frame.lock().unwrap().unset_fullscreen();
         }
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
-        // TODO: not yet possible on wayland
-        Err(())
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // TODO
     }
 
-    pub fn get_display(&self) -> &wl_display::WlDisplay {
+    #[inline]
+    pub fn hide_cursor(&self, _hide: bool) {
+        // TODO: This isn't possible on Wayland yet
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not yet possible on Wayland.".to_owned())
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _pos: LogicalPosition) -> Result<(), String> {
+        Err("Setting the cursor position is not yet possible on Wayland.".to_owned())
+    }
+
+    pub fn get_display(&self) -> &Display {
         &*self.display
     }
 
-    pub fn get_surface(&self) -> &wl_surface::WlSurface {
+    pub fn get_surface(&self) -> &Proxy<wl_surface::WlSurface> {
         &self.surface
     }
 
@@ -221,6 +298,14 @@ impl Window {
         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 {
@@ -235,25 +320,30 @@ impl Drop for Window {
  */
 
 struct InternalWindow {
-    surface: wl_surface::WlSurface,
-    newsize: Option<(i32, i32)>,
+    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<Frame>>
+    frame: Weak<Mutex<SWindow<BasicFrame>>>,
+    current_dpi: i32,
+    new_dpi: Option<i32>
 }
 
 pub struct WindowStore {
-    windows: Vec<InternalWindow>
+    windows: Vec<InternalWindow>,
 }
 
 impl WindowStore {
     pub fn new() -> WindowStore {
-        WindowStore { windows: Vec::new() }
+        WindowStore {
+            windows: Vec::new(),
+        }
     }
 
-    pub fn find_wid(&self, surface: &wl_surface::WlSurface) -> Option<WindowId> {
+    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));
@@ -277,20 +367,42 @@ impl WindowStore {
         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<(i32, i32)>, bool, bool, bool, WindowId, Option<&mut Frame>)
+    where
+        F: FnMut(Option<(u32, u32)>, &mut (u32, u32), Option<i32>, bool, bool, bool, WindowId, Option<&mut SWindow<BasicFrame>>),
     {
         for window in &mut self.windows {
             let opt_arc = window.frame.upgrade();
             let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap());
             f(
                 window.newsize.take(),
+                &mut *(window.size.lock().unwrap()),
+                window.new_dpi,
                 window.need_refresh,
                 ::std::mem::replace(&mut *window.need_frame_refresh.lock().unwrap(), false),
                 window.closed,
                 make_wid(&window.surface),
-                opt_mutex_lock.as_mut().map(|m| &mut **m)
+                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;
@@ -299,66 +411,48 @@ impl WindowStore {
 }
 
 /*
- * Protocol implementation
+ * Monitor list with some covenience method to compute DPI
  */
 
-struct FrameIData {
-    store_token: StateToken<WindowStore>,
-    surface: wl_surface::WlSurface
-}
-
-fn decorated_impl() -> FrameImplementation<FrameIData> {
-    FrameImplementation {
-        configure: |evqh, idata, _, newsize| {
-            let store = evqh.state().get_mut(&idata.store_token);
-            for window in &mut store.windows {
-                if window.surface.equals(&idata.surface) {
-                    window.newsize = newsize;
-                    window.need_refresh = true;
-                    *(window.need_frame_refresh.lock().unwrap()) = true;
-                    return;
-                }
-            }
-        },
-        close: |evqh, idata| {
-            let store = evqh.state().get_mut(&idata.store_token);
-            for window in &mut store.windows {
-                if window.surface.equals(&idata.surface) {
-                    window.closed = true;
-                    return;
-                }
-            }
-        },
-        refresh: |evqh, idata| {
-            let store = evqh.state().get_mut(&idata.store_token);
-            for window in &mut store.windows {
-                if window.surface.equals(&idata.surface) {
-                    *(window.need_frame_refresh.lock().unwrap()) = true;
-                    return;
-                }
-            }
-        }
-    }
-}
-
-#[derive(Default)]
 struct MonitorList {
     monitors: Vec<MonitorId>
 }
 
-fn surface_impl() -> wl_surface::Implementation<(StateToken<StateContext>, Arc<Mutex<MonitorList>>)> {
-    wl_surface::Implementation {
-        enter: |evqh, &mut (ref token, ref list), _, output| {
-            let mut guard = list.lock().unwrap();
-            let ctxt = evqh.state().get(token);
-            let monitor = ctxt.monitor_id_for(output);
-            guard.monitors.push(monitor);
-        },
-        leave: |evqh, &mut (ref token, ref list), _, output| {
-            let mut guard = list.lock().unwrap();
-            let ctxt = evqh.state().get(token);
-            let monitor = ctxt.monitor_id_for(output);
-            guard.monitors.retain(|m| !Arc::ptr_eq(&m.info, &monitor.info));
+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

@@ -2,14 +2,12 @@ use std::io;
 use std::sync::Arc;
 use std::path::{Path, PathBuf};
 use std::str::Utf8Error;
+use std::os::raw::*;
 
-use libc::{c_char, c_int, c_long, c_uchar, c_ulong};
 use percent_encoding::percent_decode;
 
 use super::{ffi, util, XConnection, XError};
 
-const DND_ATOMS_LEN: usize = 12;
-
 #[derive(Debug)]
 pub struct DndAtoms {
     pub aware: ffi::Atom,
@@ -28,36 +26,21 @@ pub struct DndAtoms {
 
 impl DndAtoms {
     pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> {
-        let mut atoms = Vec::with_capacity(DND_ATOMS_LEN);
-
-        let mut names = [
-            b"XdndAware\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndEnter\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndLeave\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndDrop\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndPosition\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndStatus\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndActionPrivate\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndSelection\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndFinished\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"XdndTypeList\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"text/uri-list\0".to_owned().as_mut_ptr() as *mut c_char,
-            b"None\0".to_owned().as_mut_ptr() as *mut c_char,
+        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,
         ];
-
-        unsafe {
-            (xconn.xlib.XInternAtoms)(
-                xconn.display,
-                names.as_mut_ptr(),
-                DND_ATOMS_LEN as c_int,
-                ffi::False,
-                atoms.as_mut_ptr(),
-            );
-        }
-        xconn.check_errors()?;
-        unsafe {
-            atoms.set_len(DND_ATOMS_LEN);
-        }
+        let atoms = unsafe { xconn.get_atoms(&names) }?;
         Ok(DndAtoms {
             aware: atoms[0],
             enter: atoms[1],
@@ -144,14 +127,13 @@ impl Dnd {
             DndState::Accepted => (1, self.atoms.action_private as c_long),
             DndState::Rejected => (0, self.atoms.none as c_long),
         };
-        util::send_client_msg(
-            &self.xconn,
+        self.xconn.send_client_msg(
             target_window,
             target_window,
             self.atoms.status,
             None,
-            (this_window as c_long, accepted, 0, 0, action),
-        )
+            [this_window as c_long, accepted, 0, 0, action],
+        ).flush()
     }
 
     pub unsafe fn send_finished(
@@ -164,22 +146,20 @@ impl Dnd {
             DndState::Accepted => (1, self.atoms.action_private as c_long),
             DndState::Rejected => (0, self.atoms.none as c_long),
         };
-        util::send_client_msg(
-            &self.xconn,
+        self.xconn.send_client_msg(
             target_window,
             target_window,
             self.atoms.finished,
             None,
-            (this_window as c_long, accepted, action, 0, 0),
-        )
+            [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> {
-        util::get_property(
-            &self.xconn,
+        self.xconn.get_property(
             source_window,
             self.atoms.type_list,
             ffi::XA_ATOM,
@@ -201,8 +181,7 @@ impl Dnd {
         &self,
         window: c_ulong,
     ) -> Result<Vec<c_uchar>, util::GetPropertyError> {
-        util::get_property(
-            &self.xconn,
+        self.xconn.get_property(
             window,
             self.atoms.selection,
             self.atoms.uri_list,

src/platform/linux/x11/events.rs

@@ -1000,6 +1000,9 @@ pub fn keysym_to_element(keysym: 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/ime/input_method.rs

@@ -5,12 +5,20 @@ 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.
@@ -85,13 +93,11 @@ enum GetXimServersError {
 // 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 = util::get_atom(&xconn, b"XIM_SERVERS\0")
-        .map_err(GetXimServersError::XError)?;
+    let servers_atom = xconn.get_atom_unchecked(b"XIM_SERVERS\0");
 
     let root = (xconn.xlib.XDefaultRootWindow)(xconn.display);
 
-    let mut atoms: Vec<ffi::Atom> = util::get_property(
-        &xconn,
+    let mut atoms: Vec<ffi::Atom> = xconn.get_property(
         root,
         servers_atom,
         ffi::XA_ATOM,

src/platform/linux/x11/monitor.rs

@@ -1,110 +1,85 @@
-use std::sync::Arc;
-use std::slice;
+use std::os::raw::*;
 
-use super::XConnection;
+use parking_lot::Mutex;
 
-#[derive(Clone)]
+use {PhysicalPosition, PhysicalSize};
+use super::{util, XConnection, XError};
+use super::ffi::{
+    RRCrtcChangeNotifyMask,
+    RROutputPropertyNotifyMask,
+    RRScreenChangeNotifyMask,
+    True,
+    Window,
+    XRRScreenResources,
+};
+
+// Used to test XRandR < 1.5 code path. This should always be committed as false.
+const FORCE_RANDR_COMPAT: bool = false;
+// Also used for testing. This should always be committed as false.
+const DISABLE_MONITOR_LIST_CACHING: bool = false;
+
+lazy_static! {
+    static ref XRANDR_VERSION: Mutex<Option<(c_int, c_int)>> = Mutex::default();
+    static ref MONITORS: Mutex<Option<Vec<MonitorId>>> = Mutex::default();
+}
+
+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
-    name: String,
+    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 scaling factor
-    hidpi_factor: f32,
-}
-
-pub fn get_available_monitors(x: &Arc<XConnection>) -> Vec<MonitorId> {
-    let mut available = Vec::new();
-    unsafe {
-        let root = (x.xlib.XDefaultRootWindow)(x.display);
-        let resources = (x.xrandr.XRRGetScreenResources)(x.display, root);
-
-        if let Some(ref xrandr_1_5) = x.xrandr_1_5 {
-            // We're in XRandR >= 1.5, enumerate Monitors to handle things like MST and videowalls
-            let mut nmonitors = 0;
-            let monitors = (xrandr_1_5.XRRGetMonitors)(x.display, root, 1, &mut nmonitors);
-            for i in 0..nmonitors {
-                let monitor = *(monitors.offset(i as isize));
-                let output = (xrandr_1_5.XRRGetOutputInfo)(x.display, resources, *(monitor.outputs.offset(0)));
-                let nameslice = slice::from_raw_parts((*output).name as *mut u8, (*output).nameLen as usize);
-                let name = String::from_utf8_lossy(nameslice).into_owned();
-                let hidpi_factor = {
-                    let x_mm = (*output).mm_width as f32;
-                    let y_mm = (*output).mm_height as f32;
-                    let x_px = monitor.width as f32;
-                    let y_px = monitor.height as f32;
-                    let ppmm = ((x_px * y_px) / (x_mm * y_mm)).sqrt();
-
-                    // Quantize 1/12 step size
-                    ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0)
-                };
-                (xrandr_1_5.XRRFreeOutputInfo)(output);
-                available.push(MonitorId{
-                    id: i as u32,
-                    name,
-                    hidpi_factor,
-                    dimensions: (monitor.width as u32, monitor.height as u32),
-                    position: (monitor.x as i32, monitor.y as i32),
-                    primary: (monitor.primary != 0),
-                });
-            }
-            (xrandr_1_5.XRRFreeMonitors)(monitors);
-        } else {
-            // We're in XRandR < 1.5, enumerate CRTCs. Everything will work but MST and
-            // videowall setups will show more monitors than the logical groups the user
-            // cares about
-            for i in 0..(*resources).ncrtc {
-                let crtcid = *((*resources).crtcs.offset(i as isize));
-                let crtc = (x.xrandr.XRRGetCrtcInfo)(x.display, resources, crtcid);
-                if (*crtc).width > 0 && (*crtc).height > 0 && (*crtc).noutput > 0 {
-                    let output = (x.xrandr.XRRGetOutputInfo)(x.display, resources, *((*crtc).outputs.offset(0)));
-                    let nameslice = slice::from_raw_parts((*output).name as *mut u8, (*output).nameLen as usize);
-                    let name = String::from_utf8_lossy(nameslice).into_owned();
-
-                    let hidpi_factor = {
-                        let x_mm = (*output).mm_width as f32;
-                        let y_mm = (*output).mm_height as f32;
-                        let x_px = (*crtc).width as f32;
-                        let y_px = (*crtc).height as f32;
-                        let ppmm = ((x_px * y_px) / (x_mm * y_mm)).sqrt();
-
-                        // Quantize 1/12 step size
-                        ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0)
-                    };
-
-                    (x.xrandr.XRRFreeOutputInfo)(output);
-                    available.push(MonitorId{
-                        id: crtcid as u32,
-                        name,
-                        hidpi_factor,
-                        dimensions: ((*crtc).width as u32, (*crtc).height as u32),
-                        position: ((*crtc).x as i32, (*crtc).y as i32),
-                        primary: true,
-                    });
-                }
-                (x.xrandr.XRRFreeCrtcInfo)(crtc);
-            }
-        }
-        (x.xrandr.XRRFreeScreenResources)(resources);
-    }
-    available
-}
-
-#[inline]
-pub fn get_primary_monitor(x: &Arc<XConnection>) -> MonitorId {
-    get_available_monitors(x).into_iter().find(|m| m.primary)
-        // 'no primary' case is better handled picking some existing monitor
-        .or_else(|| get_available_monitors(x).into_iter().next())
-        .expect("[winit] Failed to find any x11 monitor")
+    /// 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> {
         Some(self.name.clone())
     }
@@ -114,16 +89,181 @@ impl MonitorId {
         self.id as u32
     }
 
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        self.dimensions
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.dimensions.into()
     }
 
-    pub fn get_position(&self) -> (i32, i32) {
-        self.position
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.position.into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
+    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.rs

@@ -1,365 +0,0 @@
-use std::mem;
-use std::ptr;
-use std::str;
-use std::sync::Arc;
-use std::ops::{Deref, DerefMut};
-use std::os::raw::{c_char, c_double, c_int, c_long, c_short, c_uchar, c_uint, c_ulong};
-
-use super::{ffi, XConnection, XError};
-use events::ModifiersState;
-
-pub struct XSmartPointer<'a, T> {
-    xconn: &'a Arc<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 Arc<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 _);
-        }
-    }
-}
-
-pub unsafe fn get_atom(xconn: &Arc<XConnection>, name: &[u8]) -> Result<ffi::Atom, XError> {
-    let atom_name: *const c_char = name.as_ptr() as _;
-    let atom = (xconn.xlib.XInternAtom)(xconn.display, atom_name, ffi::False);
-    xconn.check_errors().map(|_| atom)
-}
-
-pub unsafe fn send_client_msg(
-    xconn: &Arc<XConnection>,
-    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: (c_long, c_long, c_long, c_long, c_long),
-) -> Result<(), XError> {
-    let mut event: ffi::XClientMessageEvent = mem::uninitialized();
-    event.type_ = ffi::ClientMessage;
-    event.display = xconn.display;
-    event.window = window;
-    event.message_type = message_type;
-    event.format = 32;
-    event.data = ffi::ClientMessageData::new();
-    event.data.set_long(0, data.0);
-    event.data.set_long(1, data.1);
-    event.data.set_long(2, data.2);
-    event.data.set_long(3, data.3);
-    event.data.set_long(4, data.4);
-
-    let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
-
-    (xconn.xlib.XSendEvent)(
-        xconn.display,
-        target_window,
-        ffi::False,
-        event_mask,
-        &mut event.into(),
-    );
-
-    xconn.check_errors().map(|_| ())
-}
-
-#[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
-        }
-    }
-}
-
-pub unsafe fn get_property<T>(
-    xconn: &Arc<XConnection>,
-    window: c_ulong,
-    property: ffi::Atom,
-    property_type: ffi::Atom,
-) -> Result<Vec<T>, GetPropertyError> {
-    let mut data = Vec::new();
-
-    let mut done = false;
-    while !done {
-        let mut actual_type: ffi::Atom = mem::uninitialized();
-        let mut actual_format: c_int = mem::uninitialized();
-        let mut byte_count: c_ulong = mem::uninitialized();
-        let mut bytes_after: c_ulong = mem::uninitialized();
-        let mut buf: *mut c_uchar = ptr::null_mut();
-        (xconn.xlib.XGetWindowProperty)(
-            xconn.display,
-            window,
-            property,
-            (data.len() / 4) as c_long,
-            1024,
-            ffi::False,
-            property_type,
-            &mut actual_type,
-            &mut actual_format,
-            &mut byte_count,
-            &mut bytes_after,
-            &mut buf,
-        );
-
-        if let Err(e) = xconn.check_errors() {
-            return Err(GetPropertyError::XError(e));
-        }
-
-        if actual_type != property_type {
-            return Err(GetPropertyError::TypeMismatch(actual_type));
-        }
-
-        // Fun fact: actual_format ISN'T the size of the type; it's more like a really bad enum
-        let format_mismatch = match actual_format as usize {
-            8 => mem::size_of::<T>() != mem::size_of::<c_char>(),
-            16 => mem::size_of::<T>() != mem::size_of::<c_short>(),
-            32 => mem::size_of::<T>() != mem::size_of::<c_long>(),
-            _ => true, // this won't actually be reached; the XError condition above is triggered
-        };
-
-        if format_mismatch {
-            return Err(GetPropertyError::FormatMismatch(actual_format));
-        }
-
-        if !buf.is_null() {
-            let mut buf =
-                Vec::from_raw_parts(buf as *mut T, byte_count as usize, byte_count as usize);
-            data.append(&mut buf);
-        } else {
-            return Err(GetPropertyError::NothingAllocated);
-        }
-
-        done = bytes_after == 0;
-    }
-
-    Ok(data)
-}
-
-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,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct PointerState {
-    #[allow(dead_code)]
-    root: ffi::Window,
-    #[allow(dead_code)]
-    child: ffi::Window,
-    #[allow(dead_code)]
-    root_x: c_double,
-    #[allow(dead_code)]
-    root_y: c_double,
-    #[allow(dead_code)]
-    win_x: c_double,
-    #[allow(dead_code)]
-    win_y: c_double,
-    #[allow(dead_code)]
-    buttons: ffi::XIButtonState,
-    modifiers: ffi::XIModifierState,
-    #[allow(dead_code)]
-    group: ffi::XIGroupState,
-    #[allow(dead_code)]
-    relative_to_window: bool,
-}
-
-impl PointerState {
-    pub fn get_modifier_state(&self) -> ModifiersState {
-        self.modifiers.into()
-    }
-}
-
-pub unsafe fn query_pointer(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-    device_id: c_int,
-) -> Result<PointerState, XError> {
-    let mut root_return = mem::uninitialized();
-    let mut child_return = mem::uninitialized();
-    let mut root_x_return = mem::uninitialized();
-    let mut root_y_return = mem::uninitialized();
-    let mut win_x_return = mem::uninitialized();
-    let mut win_y_return = mem::uninitialized();
-    let mut buttons_return = mem::uninitialized();
-    let mut modifiers_return = mem::uninitialized();
-    let mut group_return = mem::uninitialized();
-
-    let relative_to_window = (xconn.xinput2.XIQueryPointer)(
-        xconn.display,
-        device_id,
-        window,
-        &mut root_return,
-        &mut child_return,
-        &mut root_x_return,
-        &mut root_y_return,
-        &mut win_x_return,
-        &mut win_y_return,
-        &mut buttons_return,
-        &mut modifiers_return,
-        &mut group_return,
-    ) == ffi::True;
-
-    xconn.check_errors()?;
-
-    Ok(PointerState {
-        root: root_return,
-        child: child_return,
-        root_x: root_x_return,
-        root_y: root_y_return,
-        win_x: win_x_return,
-        win_y: win_y_return,
-        buttons: buttons_return,
-        modifiers: modifiers_return,
-        group: group_return,
-        relative_to_window,
-    })
-}
-
-unsafe fn lookup_utf8_inner(
-    xconn: &Arc<XConnection>,
-    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 = (xconn.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 unsafe fn lookup_utf8(
-    xconn: &Arc<XConnection>,
-    ic: ffi::XIC,
-    key_event: &mut ffi::XKeyEvent,
-) -> String {
-    const INIT_BUFF_SIZE: usize = 16;
-
-    // Buffer allocated on heap instead of stack, due to the possible reallocation
-    let mut buffer: Vec<u8> = vec![mem::uninitialized(); INIT_BUFF_SIZE];
-    let (_, status, mut count) = lookup_utf8_inner(
-        xconn,
-        ic,
-        key_event,
-        &mut buffer,
-    );
-
-    // Buffer overflowed, dynamically reallocate
-    if status == ffi::XBufferOverflow {
-        buffer = vec![mem::uninitialized(); count as usize];
-        let (_, _, new_count) = lookup_utf8_inner(
-            xconn,
-            ic,
-            key_event,
-            &mut buffer,
-        );
-        count = new_count;
-    }
-
-    str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string()
-}
-
-#[derive(Debug)]
-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)
-    }
-}
-
-#[derive(Debug)]
-pub struct WindowGeometry {
-    pub x: c_int,
-    pub y: c_int,
-    pub width: c_uint,
-    pub height: c_uint,
-    pub frame: FrameExtents,
-}
-
-impl WindowGeometry {
-    pub fn get_position(&self) -> (i32, i32) {
-        (self.x as _, self.y as _)
-    }
-
-    pub fn get_inner_position(&self) -> (i32, i32) {
-        (
-            self.x.saturating_add(self.frame.left as c_int) as _,
-            self.y.saturating_add(self.frame.top as c_int) as _,
-        )
-    }
-
-    pub fn get_inner_size(&self) -> (u32, u32) {
-        (self.width as _, self.height as _)
-    }
-
-    pub fn get_outer_size(&self) -> (u32, u32) {
-        (
-            self.width.saturating_add(
-                self.frame.left.saturating_add(self.frame.right) as c_uint
-            ) as _,
-            self.height.saturating_add(
-                self.frame.top.saturating_add(self.frame.bottom) as c_uint
-            ) as _,
-        )
-    }
-}

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,9 +1,9 @@
 use std::ptr;
 use std::fmt;
 use std::error::Error;
-use std::sync::Mutex;
 
 use libc;
+use parking_lot::Mutex;
 
 use super::ffi;
 
@@ -29,12 +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 xrandr = try!(ffi::Xrandr_2_2_0::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 = try!(ffi::XInput2::open());
-        let xlib_xcb = try!(ffi::Xlib_xcb::open());
+        let xinput2 = ffi::XInput2::open()?;
+        let xlib_xcb = ffi::Xlib_xcb::open()?;
 
         unsafe { (xlib.XInitThreads)() };
         unsafe { (xlib.XSetErrorHandler)(error_handler) };
@@ -49,13 +49,13 @@ impl XConnection {
         };
 
         Ok(XConnection {
-            xlib: xlib,
-            xrandr: xrandr,
-            xrandr_1_5: xrandr_1_5,
-            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),
         })
     }
@@ -63,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 {
@@ -75,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,14 +1,14 @@
 use {ControlFlow, EventsLoopClosed};
 use cocoa::{self, appkit, foundation};
 use cocoa::appkit::{NSApplication, NSEvent, NSEventMask, NSEventModifierFlags, NSEventPhase, NSView, NSWindow};
-use events::{self, ElementState, Event, MouseButton, TouchPhase, WindowEvent, DeviceEvent, ModifiersState, KeyboardInput};
+use events::{self, ElementState, Event, TouchPhase, WindowEvent, DeviceEvent, ModifiersState, KeyboardInput};
 use std::collections::VecDeque;
 use std::sync::{Arc, Mutex, Weak};
 use super::window::Window2;
 use std;
+use std::os::raw::*;
 use super::DeviceId;
 
-
 pub struct EventsLoop {
     modifiers: Modifiers,
     pub shared: Arc<Shared>,
@@ -94,7 +94,7 @@ impl Shared {
         if let Ok(mut windows) = self.windows.lock() {
             windows.retain(|w| match w.upgrade() {
                 Some(w) => w.id() != id,
-                None => true,
+                None => false,
             });
         }
     }
@@ -294,10 +294,7 @@ 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.shared.windows.lock().unwrap();
         let maybe_window = windows.iter()
@@ -318,137 +315,53 @@ impl EventsLoop {
             });
 
         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);
-
-                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
-                let state = ElementState::Pressed;
-                let code = NSEvent::keyCode(ns_event) as u32;
-                let window_event = WindowEvent::KeyboardInput {
-                    device_id: DEVICE_ID,
-                    input: KeyboardInput {
-                        state: state,
-                        scancode: code,
-                        virtual_keycode: vkey,
-                        modifiers: event_mods(ns_event),
-                    },
-                };
-                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));
-                }
-                self.shared.pending_events.lock().unwrap().extend(events.into_iter());
-                Some(into_event(window_event))
-            },
-
-            appkit::NSKeyUp => {
-                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
-
-                let state = ElementState::Released;
-                let code = NSEvent::keyCode(ns_event) as u32;
-                let window_event = WindowEvent::KeyboardInput {
-                    device_id: DEVICE_ID,
-                    input: KeyboardInput {
-                        state: state,
-                        scancode: code,
-                        virtual_keycode: vkey,
-                        modifiers: event_mods(ns_event),
-                    },
-                };
-                Some(into_event(window_event))
-            },
-
             appkit::NSFlagsChanged => {
-                unsafe fn modifier_event(event: cocoa::base::id,
-                                         keymask: 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 u32;
-                        let window_event = WindowEvent::KeyboardInput {
-                            device_id: DEVICE_ID,
-                            input: KeyboardInput {
-                                state: state,
-                                scancode: code,
-                                virtual_keycode: Some(key),
-                                modifiers: 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 u32;
-                        let window_event = WindowEvent::KeyboardInput {
-                            device_id: DEVICE_ID,
-                            input: KeyboardInput {
-                                state: state,
-                                scancode: code,
-                                virtual_keycode: Some(key),
-                                modifiers: event_mods(event),
-                            },
-                        };
-                        Some(window_event)
-
-                    } else {
-                        None
-                    }
-                }
-
                 let mut events = std::collections::VecDeque::new();
-                if let Some(window_event) = modifier_event(ns_event,
-                                                           NSEventModifierFlags::NSShiftKeyMask,
-                                                           events::VirtualKeyCode::LShift,
-                                                           self.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,
-                                                           NSEventModifierFlags::NSControlKeyMask,
-                                                           events::VirtualKeyCode::LControl,
-                                                           self.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,
-                                                           NSEventModifierFlags::NSCommandKeyMask,
-                                                           events::VirtualKeyCode::LWin,
-                                                           self.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,
-                                                           NSEventModifierFlags::NSAlternateKeyMask,
-                                                           events::VirtualKeyCode::LAlt,
-                                                           self.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.shared.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 { device_id: DEVICE_ID, state: ElementState::Pressed, button: MouseButton::Left, modifiers: event_mods(ns_event) })) },
-            appkit::NSLeftMouseUp => { Some(into_event(WindowEvent::MouseInput { device_id: DEVICE_ID, state: ElementState::Released, button: MouseButton::Left, modifiers: event_mods(ns_event) })) },
-            appkit::NSRightMouseDown => { Some(into_event(WindowEvent::MouseInput { device_id: DEVICE_ID, state: ElementState::Pressed, button: MouseButton::Right, modifiers: event_mods(ns_event) })) },
-            appkit::NSRightMouseUp => { Some(into_event(WindowEvent::MouseInput { device_id: DEVICE_ID, state: ElementState::Released, button: MouseButton::Right, modifiers: event_mods(ns_event) })) },
-            appkit::NSOtherMouseDown => { Some(into_event(WindowEvent::MouseInput { device_id: DEVICE_ID, state: ElementState::Pressed, button: MouseButton::Middle, modifiers: event_mods(ns_event) })) },
-            appkit::NSOtherMouseUp => { Some(into_event(WindowEvent::MouseInput { device_id: DEVICE_ID, state: ElementState::Released, button: MouseButton::Middle, modifiers: event_mods(ns_event) })) },
-
             appkit::NSMouseEntered => {
                 let window = match maybe_window.or_else(maybe_key_window) {
                     Some(window) => window,
@@ -464,14 +377,16 @@ 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 f64;
-                let y = (scale_factor * (view_rect.size.height - view_point.y) as f32) as f64;
-                let window_event = WindowEvent::CursorMoved { device_id: DEVICE_ID, position: (x, y), modifiers: event_mods(ns_event) };
+                let x = view_point.x as f64;
+                let y = (view_rect.size.height - view_point.y) as f64;
+                let window_event = WindowEvent::CursorMoved {
+                    device_id: DEVICE_ID,
+                    position: (x, y).into(),
+                    modifiers: event_mods(ns_event),
+                };
                 let event = Event::WindowEvent { window_id: ::WindowId(window.id()), event: window_event };
-
                 self.shared.pending_events.lock().unwrap().push_back(event);
                 Some(into_event(WindowEvent::CursorEntered { device_id: DEVICE_ID }))
             },
@@ -484,50 +399,30 @@ impl EventsLoop {
                 // 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`.
-                let window = match maybe_window.or_else(maybe_key_window) {
-                    Some(window) => window,
+                match maybe_window.or_else(maybe_key_window) {
+                    Some(_window) => (),
                     None => return None,
-                };
-
-                let window_point = ns_event.locationInWindow();
-                let view_point = if ns_window == cocoa::base::nil {
-                    let ns_size = foundation::NSSize::new(0.0, 0.0);
-                    let ns_rect = foundation::NSRect::new(window_point, ns_size);
-                    let window_rect = window.window.convertRectFromScreen_(ns_rect);
-                    window.view.convertPoint_fromView_(window_rect.origin, cocoa::base::nil)
-                } else {
-                    window.view.convertPoint_fromView_(window_point, cocoa::base::nil)
-                };
-                let view_rect = NSView::frame(*window.view);
-                let scale_factor = window.hidpi_factor();
-
-                let mut events = std::collections::VecDeque::new();
-
-                {
-                    let x = (scale_factor * view_point.x as f32) as f64;
-                    let y = (scale_factor * (view_rect.size.height - view_point.y) as f32) as f64;
-                    let window_event = WindowEvent::CursorMoved { device_id: DEVICE_ID, position: (x, y), modifiers: event_mods(ns_event) };
-                    let event = Event::WindowEvent { window_id: ::WindowId(window.id()), event: window_event };
-                    events.push_back(event);
                 }
 
-                let delta_x = (scale_factor * ns_event.deltaX() as f32) as f64;
+                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 };
+                    let event = Event::DeviceEvent { device_id: DEVICE_ID, event: motion_event };
                     events.push_back(event);
                 }
 
-                let delta_y = (scale_factor * ns_event.deltaY() as f32) as f64;
+                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 };
+                    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 };
+                    let event = Event::DeviceEvent { device_id: DEVICE_ID, event: motion_event };
                     events.push_back(event);
                 }
 
@@ -538,19 +433,22 @@ impl EventsLoop {
 
             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() {
                     NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => TouchPhase::Started,
@@ -561,11 +459,15 @@ impl EventsLoop {
                     device_id: DEVICE_ID,
                     event: DeviceEvent::MouseWheel {
                         delta: if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
-                            PixelDelta(ns_event.scrollingDeltaX() as f32,
-                                       ns_event.scrollingDeltaY() as f32)
+                            PixelDelta((
+                                ns_event.scrollingDeltaX() as f64,
+                                ns_event.scrollingDeltaY() as f64,
+                            ).into())
                         } else {
-                            LineDelta(ns_event.scrollingDeltaX() as f32,
-                                      ns_event.scrollingDeltaY() as f32)
+                            LineDelta(
+                                ns_event.scrollingDeltaX() as f32,
+                                ns_event.scrollingDeltaY() as f32,
+                            )
                         },
                     }
                 });
@@ -621,8 +523,7 @@ impl Proxy {
     }
 }
 
-
-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,
@@ -678,14 +579,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,
@@ -758,7 +659,7 @@ fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
     })
 }
 
-fn event_mods(event: cocoa::base::id) -> ModifiersState {
+pub fn event_mods(event: cocoa::base::id) -> ModifiersState {
     let flags = unsafe {
         NSEvent::modifierFlags(event)
     };
@@ -770,5 +671,30 @@ fn event_mods(event: cocoa::base::id) -> ModifiersState {
     }
 }
 
+unsafe fn modifier_event(
+    ns_event: cocoa::base::id,
+    keymask: NSEventModifierFlags,
+    key_pressed: bool,
+) -> Option<WindowEvent> {
+    if !key_pressed && NSEvent::modifierFlags(ns_event).contains(keymask)
+    || key_pressed && !NSEvent::modifierFlags(ns_event).contains(keymask) {
+        let state = ElementState::Released;
+        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.
-const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);
+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::{class, 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

@@ -25,8 +25,8 @@ impl ::std::ops::Deref for Window {
 impl Window {
 
     pub fn new(events_loop: &EventsLoop,
-               attributes: &::WindowAttributes,
-               pl_attribs: &PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
+               attributes: ::WindowAttributes,
+               pl_attribs: PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
     {
         let weak_shared = Arc::downgrade(&events_loop.shared);
         let window = Arc::new(try!(Window2::new(weak_shared, attributes, pl_attribs)));
@@ -38,5 +38,8 @@ impl Window {
 }
 
 mod events_loop;
+mod ffi;
 mod monitor;
+mod util;
+mod view;
 mod window;

src/platform/macos/monitor.rs

@@ -1,29 +1,44 @@
+use std::collections::VecDeque;
+use std::fmt;
+
 use cocoa::appkit::NSScreen;
 use cocoa::base::{id, nil};
 use cocoa::foundation::{NSString, NSUInteger};
-use core_graphics::display::{CGDirectDisplayID, CGDisplay};
-use std::collections::VecDeque;
+use core_graphics::display::{CGDirectDisplayID, CGDisplay, CGDisplayBounds};
+
+use {PhysicalPosition, PhysicalSize};
 use super::EventsLoop;
-use super::window::IdRef;
+use super::window::{IdRef, Window2};
 
 #[derive(Clone, PartialEq)]
 pub struct MonitorId(CGDirectDisplayID);
 
-impl EventsLoop {
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut monitors = VecDeque::new();
-        if let Ok(displays) = CGDisplay::active_displays() {
-            for d in displays {
-                monitors.push_back(MonitorId(d));
-            }
+fn get_available_monitors() -> VecDeque<MonitorId> {
+    if let Ok(displays) = CGDisplay::active_displays() {
+        let mut monitors = VecDeque::with_capacity(displays.len());
+        for d in displays {
+            monitors.push_back(MonitorId(d));
         }
         monitors
+    } else {
+        VecDeque::with_capacity(0)
+    }
+}
+
+pub fn get_primary_monitor() -> MonitorId {
+    let id = MonitorId(CGDisplay::main().id);
+    id
+}
+
+impl EventsLoop {
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+        get_available_monitors()
     }
 
     #[inline]
     pub fn get_primary_monitor(&self) -> MonitorId {
-        let id = MonitorId(CGDisplay::main().id);
-        id
+        get_primary_monitor()
     }
 
     pub fn make_monitor_from_display(id: CGDirectDisplayID) -> MonitorId {
@@ -32,6 +47,41 @@ impl EventsLoop {
     }
 }
 
+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;
@@ -44,29 +94,32 @@ impl MonitorId {
         self.0
     }
 
-    pub fn get_dimensions(&self) -> (u32, u32) {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         let MonitorId(display_id) = *self;
         let display = CGDisplay::new(display_id);
-        let dimension = {
-            let height = display.pixels_high();
-            let width = display.pixels_wide();
-            (width as u32, height as u32)
-        };
-        dimension
+        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) -> (i32, i32) {
-        unimplemented!()
+    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) -> f32 {
+    pub fn get_hidpi_factor(&self) -> f64 {
         let screen = match self.get_nsscreen() {
             Some(screen) => screen,
             None => return 1.0, // default to 1.0 when we can't find the screen
         };
-
-        unsafe { NSScreen::backingScaleFactor(screen) as f32 }
+        unsafe { NSScreen::backingScaleFactor(screen) as f64 }
     }
 
     pub(crate) fn get_nsscreen(&self) -> Option<id> {

src/platform/macos/util.rs

@@ -0,0 +1,38 @@
+use cocoa::appkit::NSWindowStyleMask;
+use cocoa::base::{class, 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,568 @@
+// 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::{class, 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};
+
+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::get("NSView").unwrap();
+        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_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);
+}

src/platform/windows/dpi.rs

@@ -0,0 +1,196 @@
+#![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,
+    HDC,
+    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_window_dpi(hwnd: HWND, hdc: HDC) -> u32 {
+    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
+        }
+    }
+}
+
+// Use this when you have both the HWND and HDC on hand (i.e. window methods)
+pub fn get_window_scale_factor(hwnd: HWND, hdc: HDC) -> f64 {
+    dpi_to_scale_factor(unsafe { get_window_dpi(hwnd, hdc) })
+}
+
+// Use this when you only have the HWND (i.e. event handling)
+pub fn get_hwnd_scale_factor(hwnd: HWND) -> f64 {
+    let hdc = unsafe { winuser::GetDC(hwnd) };
+    if hdc.is_null() {
+        panic!("[winit] `GetDC` returned null!");
+    }
+    unsafe { get_window_scale_factor(hwnd, hdc) }
+}

src/platform/windows/event.rs

@@ -1,14 +1,13 @@
+use std::char;
+use std::os::raw::c_int;
+
 use events::VirtualKeyCode;
 use events::ModifiersState;
 
-use winapi::shared::minwindef::{WPARAM, LPARAM};
+use winapi::shared::minwindef::{WPARAM, LPARAM, UINT};
 use winapi::um::winuser;
 
 use ScanCode;
-use std::char;
-
-const MAPVK_VK_TO_CHAR: u32 = 2;
-const MAPVK_VSC_TO_VK_EX: u32 = 3;
 
 pub fn get_key_mods() -> ModifiersState {
     let mut mods = ModifiersState::default();
@@ -29,18 +28,9 @@ pub fn get_key_mods() -> ModifiersState {
     mods
 }
 
-pub fn vkeycode_to_element(wparam: WPARAM, lparam: LPARAM) -> (ScanCode, Option<VirtualKeyCode>) {
-    let scancode = ((lparam >> 16) & 0xff) as u32;
-    let extended = (lparam & 0x01000000) != 0;
-    let vk = match wparam as i32 {
-        winuser::VK_SHIFT => unsafe { winuser::MapVirtualKeyA(scancode, MAPVK_VSC_TO_VK_EX) as i32 },
-        winuser::VK_CONTROL => if extended { winuser::VK_RCONTROL } else { winuser::VK_LCONTROL },
-        winuser::VK_MENU => if extended { winuser::VK_RMENU } else { winuser::VK_LMENU },
-        other => other
-    };
-
+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
-    (scancode, match vk {
+    match vkey {
         //winuser::VK_LBUTTON => Some(VirtualKeyCode::Lbutton),
         //winuser::VK_RBUTTON => Some(VirtualKeyCode::Rbutton),
         //winuser::VK_CANCEL => Some(VirtualKeyCode::Cancel),
@@ -55,8 +45,8 @@ pub fn vkeycode_to_element(wparam: WPARAM, lparam: LPARAM) -> (ScanCode, Option<
         winuser::VK_RSHIFT => Some(VirtualKeyCode::RShift),
         winuser::VK_LCONTROL => Some(VirtualKeyCode::LControl),
         winuser::VK_RCONTROL => Some(VirtualKeyCode::RControl),
-        winuser::VK_LMENU => Some(VirtualKeyCode::LMenu),
-        winuser::VK_RMENU => Some(VirtualKeyCode::RMenu),
+        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),
@@ -191,13 +181,13 @@ pub fn vkeycode_to_element(wparam: WPARAM, lparam: LPARAM) -> (ScanCode, Option<
         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(vk),
-        winuser::VK_OEM_2 => map_text_keys(vk),
-        winuser::VK_OEM_3 => map_text_keys(vk),
-        winuser::VK_OEM_4 => map_text_keys(vk),
-        winuser::VK_OEM_5 => map_text_keys(vk),
-        winuser::VK_OEM_6 => map_text_keys(vk),
-        winuser::VK_OEM_7 => map_text_keys(vk),
+        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),
@@ -212,13 +202,58 @@ pub fn vkeycode_to_element(wparam: WPARAM, lparam: LPARAM) -> (ScanCode, Option<
         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, MAPVK_VK_TO_CHAR) } & 0x7FFF;
+    let char_key = unsafe { winuser::MapVirtualKeyA(win_virtual_key as u32, winuser::MAPVK_VK_TO_CHAR) } & 0x7FFF;
     match char::from_u32(char_key) {
         Some(';') => Some(VirtualKeyCode::Semicolon),
         Some('/') => Some(VirtualKeyCode::Slash),

src/platform/windows/events_loop.rs

@@ -12,41 +12,54 @@
 //! The closure passed to the `execute_in_thread` method takes an `Inserter` that you can use to
 //! add a `WindowState` entry to a list of window to be used by the callback.
 
+use std::{mem, ptr, thread};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ffi::OsString;
-use std::mem;
 use std::os::windows::ffi::OsStringExt;
 use std::os::windows::io::AsRawHandle;
-use std::ptr;
-use std::sync::mpsc;
-use std::sync::Arc;
-use std::sync::Barrier;
-use std::sync::Mutex;
-use std::sync::Condvar;
-use std::thread;
+use std::sync::{Arc, Barrier, Condvar, mpsc, Mutex};
 
-use winapi::shared::minwindef::{LOWORD, HIWORD, DWORD, WPARAM, LPARAM, INT, UINT, LRESULT, MAX_PATH};
+use winapi::ctypes::c_int;
+use winapi::shared::minwindef::{
+    BOOL,
+    DWORD,
+    HIWORD,
+    INT,
+    LOWORD,
+    LPARAM,
+    LRESULT,
+    MAX_PATH,
+    UINT,
+    WPARAM,
+};
 use winapi::shared::windef::{HWND, POINT, RECT};
 use winapi::shared::windowsx;
 use winapi::um::{winuser, shellapi, processthreadsapi};
-use winapi::um::winnt::LONG;
+use winapi::um::winnt::{LONG, LPCSTR, SHORT};
 
-use platform::platform::event;
+use {
+    ControlFlow,
+    Event,
+    EventsLoopClosed,
+    KeyboardInput,
+    LogicalPosition,
+    LogicalSize,
+    PhysicalSize,
+    WindowEvent,
+    WindowId as SuperWindowId,
+};
+use events::{DeviceEvent, Touch, TouchPhase};
+use platform::platform::{event, Cursor, WindowId, DEVICE_ID, wrap_device_id, util};
+use platform::platform::dpi::{
+    become_dpi_aware,
+    dpi_to_scale_factor,
+    enable_non_client_dpi_scaling,
+    get_hwnd_scale_factor,
+};
+use platform::platform::event::{handle_extended_keys, process_key_params, vkey_to_winit_vkey};
+use platform::platform::raw_input::{get_raw_input_data, get_raw_mouse_button_state};
 use platform::platform::window::adjust_size;
-use platform::platform::Cursor;
-use platform::platform::WindowId;
-use platform::platform::DEVICE_ID;
-
-use ControlFlow;
-use CursorState;
-use Event;
-use EventsLoopClosed;
-use KeyboardInput;
-use WindowAttributes;
-use WindowEvent;
-use WindowId as SuperWindowId;
-use events::{Touch, TouchPhase};
 
 /// Contains saved window info for switching between fullscreen
 #[derive(Clone)]
@@ -57,6 +70,11 @@ pub struct SavedWindowInfo {
     pub ex_style: LONG,
     /// Window position and size
     pub rect: RECT,
+    // Since a window can be fullscreened to a different monitor, a DPI change can be triggered. This could result in
+    // the window being automitcally resized to smaller/larger than it was supposed to be restored to, so we thus must
+    // check if the post-fullscreen DPI matches the pre-fullscreen DPI.
+    pub is_fullscreen: bool,
+    pub dpi_factor: Option<f64>,
 }
 
 /// Contains information about states and the window that the callback is going to use.
@@ -64,14 +82,31 @@ pub struct SavedWindowInfo {
 pub struct WindowState {
     /// Cursor to set at the next `WM_SETCURSOR` event received.
     pub cursor: Cursor,
-    /// Cursor state to set at the next `WM_SETCURSOR` event received.
-    pub cursor_state: CursorState,
+    pub cursor_grabbed: bool,
+    pub cursor_hidden: bool,
     /// Used by `WM_GETMINMAXINFO`.
-    pub attributes: WindowAttributes,
+    pub max_size: Option<PhysicalSize>,
+    pub min_size: Option<PhysicalSize>,
     /// Will contain `true` if the mouse is hovering the window.
     pub mouse_in_window: bool,
     /// Saved window info for fullscreen restored
     pub saved_window_info: Option<SavedWindowInfo>,
+    // This is different from the value in `SavedWindowInfo`! That one represents the DPI saved upon entering
+    // fullscreen. This will always be the most recent DPI for the window.
+    pub dpi_factor: f64,
+}
+
+impl WindowState {
+    pub fn update_min_max(&mut self, old_dpi_factor: f64, new_dpi_factor: f64) {
+        let scale_factor = new_dpi_factor / old_dpi_factor;
+        let dpi_adjuster = |mut physical_size: PhysicalSize| -> PhysicalSize {
+            physical_size.width *= scale_factor;
+            physical_size.height *= scale_factor;
+            physical_size
+        };
+        self.max_size = self.max_size.map(&dpi_adjuster);
+        self.min_size = self.min_size.map(&dpi_adjuster);
+    }
 }
 
 /// Dummy object that allows inserting a window's state.
@@ -98,11 +133,17 @@ pub struct EventsLoop {
     // Variable that contains the block state of the win32 event loop thread during a WM_SIZE event.
     // The mutex's value is `true` when it's blocked, and should be set to false when it's done
     // blocking. That's done by the parent thread when it receives a Resized event.
-    win32_block_loop: Arc<(Mutex<bool>, Condvar)>
+    win32_block_loop: Arc<(Mutex<bool>, Condvar)>,
 }
 
 impl EventsLoop {
     pub fn new() -> EventsLoop {
+        Self::with_dpi_awareness(true)
+    }
+
+    pub fn with_dpi_awareness(dpi_aware: bool) -> EventsLoop {
+        become_dpi_aware(dpi_aware);
+
         // The main events transfer channel.
         let (tx, rx) = mpsc::channel();
         let win32_block_loop = Arc::new((Mutex::new(false), Condvar::new()));
@@ -171,7 +212,7 @@ impl EventsLoop {
         EventsLoop {
             thread_id,
             receiver: rx,
-            win32_block_loop
+            win32_block_loop,
         }
     }
 
@@ -279,8 +320,9 @@ impl EventsLoopProxy {
 
     /// Executes a function in the background thread.
     ///
-    /// Note that we use a FnMut instead of a FnOnce because we're too lazy to create an equivalent
-    /// to the unstable FnBox.
+    /// Note that we use FnMut instead of FnOnce because boxing FnOnce won't work on stable Rust
+    /// until 2030 when the design of Box is finally complete.
+    /// https://github.com/rust-lang/rust/issues/28796
     ///
     /// The `Inserted` can be used to inject a `WindowState` for the callback to use. The state is
     /// removed automatically if the callback receives a `WM_CLOSE` message for the window.
@@ -288,25 +330,21 @@ impl EventsLoopProxy {
     where
         F: FnMut(Inserter) + Send + 'static,
     {
-        unsafe {
-            // We are using double-boxing here because it make casting back much easier
-            let boxed = Box::new(function) as Box<FnMut(_)>;
-            let boxed2 = Box::new(boxed);
-            let raw = Box::into_raw(boxed2);
+        // We are using double-boxing here because it make casting back much easier
+        let double_box = Box::new(Box::new(function) as Box<FnMut(_)>);
+        let raw = Box::into_raw(double_box);
 
-            let res = winuser::PostThreadMessageA(
+        let res = unsafe {
+            winuser::PostThreadMessageA(
                 self.thread_id,
                 *EXEC_MSG_ID,
                 raw as *mut () as usize as WPARAM,
                 0,
-            );
-            // PostThreadMessage can only fail if the thread ID is invalid (which shouldn't happen
-            // as the events loop is still alive) or if the queue is full.
-            assert!(
-                res != 0,
-                "PostThreadMessage failed ; is the messages queue full?"
-            );
-        }
+            )
+        };
+        // PostThreadMessage can only fail if the thread ID is invalid (which shouldn't happen as
+        // the events loop is still alive) or if the queue is full.
+        assert!(res != 0, "PostThreadMessage failed; is the messages queue full?");
     }
 }
 
@@ -315,7 +353,7 @@ lazy_static! {
     // WPARAM and LPARAM are unused.
     static ref WAKEUP_MSG_ID: u32 = {
         unsafe {
-            winuser::RegisterWindowMessageA("Winit::WakeupMsg\0".as_ptr() as *const i8)
+            winuser::RegisterWindowMessageA("Winit::WakeupMsg\0".as_ptr() as LPCSTR)
         }
     };
     // Message sent when we want to execute a closure in the thread.
@@ -323,14 +361,21 @@ lazy_static! {
     // and LPARAM is unused.
     static ref EXEC_MSG_ID: u32 = {
         unsafe {
-            winuser::RegisterWindowMessageA("Winit::ExecMsg\0".as_ptr() as *const i8)
+            winuser::RegisterWindowMessageA("Winit::ExecMsg\0".as_ptr() as LPCSTR)
         }
     };
     // Message sent by a `Window` when it wants to be destroyed by the main thread.
     // WPARAM and LPARAM are unused.
     pub static ref DESTROY_MSG_ID: u32 = {
         unsafe {
-            winuser::RegisterWindowMessageA("Winit::DestroyMsg\0".as_ptr() as *const i8)
+            winuser::RegisterWindowMessageA("Winit::DestroyMsg\0".as_ptr() as LPCSTR)
+        }
+    };
+    // Message sent by a `Window` after creation if it has a DPI != 96.
+    // WPARAM is the the DPI (u32). LOWORD of LPARAM is width, and HIWORD is height.
+    pub static ref INITIAL_DPI_MSG_ID: u32 = {
+        unsafe {
+            winuser::RegisterWindowMessageA("Winit::InitialDpiMsg\0".as_ptr() as LPCSTR)
         }
     };
 }
@@ -387,11 +432,18 @@ unsafe fn release_mouse() {
 //
 // 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: HWND, msg: UINT,
-                                       wparam: WPARAM, lparam: LPARAM)
-                                       -> LRESULT
-{
+pub unsafe extern "system" fn callback(
+    window: HWND,
+    msg: UINT,
+    wparam: WPARAM,
+    lparam: LPARAM,
+) -> LRESULT {
     match msg {
+        winuser::WM_NCCREATE => {
+            enable_non_client_dpi_scaling(window);
+            winuser::DefWindowProcW(window, msg, wparam, lparam)
+        },
+
         winuser::WM_CLOSE => {
             use events::WindowEvent::CloseRequested;
             send_event(Event::WindowEvent {
@@ -423,6 +475,27 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             winuser::DefWindowProcW(window, msg, wparam, lparam)
         },
 
+        // WM_MOVE supplies client area positions, so we send Moved here instead.
+        winuser::WM_WINDOWPOSCHANGED => {
+            use events::WindowEvent::Moved;
+
+            let windowpos = lparam as *const winuser::WINDOWPOS;
+            if (*windowpos).flags & winuser::SWP_NOMOVE != winuser::SWP_NOMOVE {
+                let dpi_factor = get_hwnd_scale_factor(window);
+                let logical_position = LogicalPosition::from_physical(
+                    ((*windowpos).x, (*windowpos).y),
+                    dpi_factor,
+                );
+                send_event(Event::WindowEvent {
+                    window_id: SuperWindowId(WindowId(window)),
+                    event: Moved(logical_position),
+                });
+            }
+
+            // This is necessary for us to still get sent WM_SIZE.
+            winuser::DefWindowProcW(window, msg, wparam, lparam)
+        },
+
         winuser::WM_SIZE => {
             use events::WindowEvent::Resized;
             let w = LOWORD(lparam as DWORD) as u32;
@@ -434,9 +507,11 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
                 let mut context_stash = context_stash.borrow_mut();
                 let cstash = context_stash.as_mut().unwrap();
 
+                let dpi_factor = get_hwnd_scale_factor(window);
+                let logical_size = LogicalSize::from_physical((w, h), dpi_factor);
                 let event = Event::WindowEvent {
                     window_id: SuperWindowId(WindowId(window)),
-                    event: Resized(w, h),
+                    event: Resized(logical_size),
                 };
 
                 // If this window has been inserted into the window map, the resize event happened
@@ -461,17 +536,6 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             0
         },
 
-        winuser::WM_MOVE => {
-            use events::WindowEvent::Moved;
-            let x = LOWORD(lparam as DWORD) as i32;
-            let y = HIWORD(lparam as DWORD) as i32;
-            send_event(Event::WindowEvent {
-                window_id: SuperWindowId(WindowId(window)),
-                event: Moved(x, y),
-            });
-            0
-        },
-
         winuser::WM_CHAR => {
             use std::mem;
             use events::WindowEvent::ReceivedCharacter;
@@ -525,10 +589,12 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
 
             let x = windowsx::GET_X_LPARAM(lparam) as f64;
             let y = windowsx::GET_Y_LPARAM(lparam) as f64;
+            let dpi_factor = get_hwnd_scale_factor(window);
+            let position = LogicalPosition::from_physical((x, y), dpi_factor);
 
             send_event(Event::WindowEvent {
                 window_id: SuperWindowId(WindowId(window)),
-                event: CursorMoved { device_id: DEVICE_ID, position: (x, y), modifiers: event::get_key_mods() },
+                event: CursorMoved { device_id: DEVICE_ID, position, modifiers: event::get_key_mods() },
             });
 
             0
@@ -562,7 +628,6 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
         },
 
         winuser::WM_MOUSEWHEEL => {
-            use events::{DeviceEvent, WindowEvent};
             use events::MouseScrollDelta::LineDelta;
             use events::TouchPhase;
 
@@ -575,11 +640,6 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
                 event: WindowEvent::MouseWheel { device_id: DEVICE_ID, delta: LineDelta(0.0, value), phase: TouchPhase::Moved, modifiers: event::get_key_mods() },
             });
 
-            send_event(Event::DeviceEvent {
-                device_id: DEVICE_ID,
-                event: DeviceEvent::MouseWheel { delta: LineDelta(0.0, value) },
-            });
-
             0
         },
 
@@ -589,26 +649,27 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             if msg == winuser::WM_SYSKEYDOWN && wparam as i32 == winuser::VK_F4 {
                 winuser::DefWindowProcW(window, msg, wparam, lparam)
             } else {
-                let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
-                send_event(Event::WindowEvent {
-                    window_id: SuperWindowId(WindowId(window)),
-                    event: WindowEvent::KeyboardInput {
-                        device_id: DEVICE_ID,
-                        input: KeyboardInput {
-                            state: Pressed,
-                            scancode: scancode,
-                            virtual_keycode: vkey,
-                            modifiers: event::get_key_mods(),
-                        }
-                    }
-                });
-                // Windows doesn't emit a delete character by default, but in order to make it
-                // consistent with the other platforms we'll emit a delete character here.
-                if vkey == Some(VirtualKeyCode::Delete) {
+                if let Some((scancode, vkey)) = process_key_params(wparam, lparam) {
                     send_event(Event::WindowEvent {
                         window_id: SuperWindowId(WindowId(window)),
-                        event: WindowEvent::ReceivedCharacter('\u{7F}'),
+                        event: WindowEvent::KeyboardInput {
+                            device_id: DEVICE_ID,
+                            input: KeyboardInput {
+                                state: Pressed,
+                                scancode: scancode,
+                                virtual_keycode: vkey,
+                                modifiers: event::get_key_mods(),
+                            }
+                        }
                     });
+                    // Windows doesn't emit a delete character by default, but in order to make it
+                    // consistent with the other platforms we'll emit a delete character here.
+                    if vkey == Some(VirtualKeyCode::Delete) {
+                        send_event(Event::WindowEvent {
+                            window_id: SuperWindowId(WindowId(window)),
+                            event: WindowEvent::ReceivedCharacter('\u{7F}'),
+                        });
+                    }
                 }
                 0
             }
@@ -616,19 +677,20 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
 
         winuser::WM_KEYUP | winuser::WM_SYSKEYUP => {
             use events::ElementState::Released;
-            let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
-            send_event(Event::WindowEvent {
-                window_id: SuperWindowId(WindowId(window)),
-                event: WindowEvent::KeyboardInput {
-                    device_id: DEVICE_ID,
-                    input: KeyboardInput {
-                        state: Released,
-                        scancode: scancode,
-                        virtual_keycode: vkey,
-                        modifiers: event::get_key_mods(),
-                    },
-                }
-            });
+            if let Some((scancode, vkey)) = process_key_params(wparam, lparam) {
+                send_event(Event::WindowEvent {
+                    window_id: SuperWindowId(WindowId(window)),
+                    event: WindowEvent::KeyboardInput {
+                        device_id: DEVICE_ID,
+                        input: KeyboardInput {
+                            state: Released,
+                            scancode: scancode,
+                            virtual_keycode: vkey,
+                            modifiers: event::get_key_mods(),
+                        },
+                    }
+                });
+            }
             0
         },
 
@@ -746,46 +808,123 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             0
         },
 
+        winuser::WM_INPUT_DEVICE_CHANGE => {
+            let event = match wparam as _ {
+                winuser::GIDC_ARRIVAL => DeviceEvent::Added,
+                winuser::GIDC_REMOVAL => DeviceEvent::Removed,
+                _ => unreachable!(),
+            };
+
+            send_event(Event::DeviceEvent {
+                device_id: wrap_device_id(lparam as _),
+                event,
+            });
+
+            winuser::DefWindowProcW(window, msg, wparam, lparam)
+        },
+
         winuser::WM_INPUT => {
-            use events::DeviceEvent::{Motion, MouseMotion};
-            let mut data: winuser::RAWINPUT = mem::uninitialized();
-            let mut data_size = mem::size_of::<winuser::RAWINPUT>() as UINT;
-            winuser::GetRawInputData(mem::transmute(lparam), winuser::RID_INPUT,
-                                    mem::transmute(&mut data), &mut data_size,
-                                    mem::size_of::<winuser::RAWINPUTHEADER>() as UINT);
+            use events::DeviceEvent::{Motion, MouseMotion, MouseWheel, Button, Key};
+            use events::MouseScrollDelta::LineDelta;
+            use events::ElementState::{Pressed, Released};
 
-            if data.header.dwType == winuser::RIM_TYPEMOUSE {
-                let mouse = data.data.mouse();
-                if mouse.usFlags & winuser::MOUSE_MOVE_RELATIVE == winuser::MOUSE_MOVE_RELATIVE {
-                    let x = mouse.lLastX as f64;
-                    let y = mouse.lLastY as f64;
+            if let Some(data) = get_raw_input_data(lparam as _) {
+                let device_id = wrap_device_id(data.header.hDevice as _);
 
-                    if x != 0.0 {
+                if data.header.dwType == winuser::RIM_TYPEMOUSE {
+                    let mouse = data.data.mouse();
+
+                    if util::has_flag(mouse.usFlags, winuser::MOUSE_MOVE_RELATIVE) {
+                        let x = mouse.lLastX as f64;
+                        let y = mouse.lLastY as f64;
+
+                        if x != 0.0 {
+                            send_event(Event::DeviceEvent {
+                                device_id,
+                                event: Motion { axis: 0, value: x }
+                            });
+                        }
+
+                        if y != 0.0 {
+                            send_event(Event::DeviceEvent {
+                                device_id,
+                                event: Motion { axis: 1, value: y }
+                            });
+                        }
+
+                        if x != 0.0 || y != 0.0 {
+                            send_event(Event::DeviceEvent {
+                                device_id,
+                                event: MouseMotion { delta: (x, y) }
+                            });
+                        }
+                    }
+
+                    if util::has_flag(mouse.usButtonFlags, winuser::RI_MOUSE_WHEEL) {
+                        let delta = mouse.usButtonData as SHORT / winuser::WHEEL_DELTA;
                         send_event(Event::DeviceEvent {
-                            device_id: DEVICE_ID,
-                            event: Motion { axis: 0, value: x }
+                            device_id,
+                            event: MouseWheel { delta: LineDelta(0.0, delta as f32) }
                         });
                     }
 
-                    if y != 0.0 {
-                        send_event(Event::DeviceEvent {
-                            device_id: DEVICE_ID,
-                            event: Motion { axis: 1, value: y }
-                        });
+                    let button_state = get_raw_mouse_button_state(mouse.usButtonFlags);
+                    // Left, middle, and right, respectively.
+                    for (index, state) in button_state.iter().enumerate() {
+                        if let Some(state) = *state {
+                            // This gives us consistency with X11, since there doesn't
+                            // seem to be anything else reasonable to do for a mouse
+                            // button ID.
+                            let button = (index + 1) as _;
+                            send_event(Event::DeviceEvent {
+                                device_id,
+                                event: Button {
+                                    button,
+                                    state,
+                                }
+                            });
+                        }
                     }
+                } else if data.header.dwType == winuser::RIM_TYPEKEYBOARD {
+                    let keyboard = data.data.keyboard();
 
-                    if x != 0.0 || y != 0.0 {
-                        send_event(Event::DeviceEvent {
-                            device_id: DEVICE_ID,
-                            event: MouseMotion { delta: (x, y) }
-                        });
+                    let pressed = keyboard.Message == winuser::WM_KEYDOWN
+                        || keyboard.Message == winuser::WM_SYSKEYDOWN;
+                    let released = keyboard.Message == winuser::WM_KEYUP
+                        || keyboard.Message == winuser::WM_SYSKEYUP;
+
+                    if pressed || released {
+                        let state = if pressed {
+                            Pressed
+                        } else {
+                            Released
+                        };
+
+                        let scancode = keyboard.MakeCode as _;
+                        let extended = util::has_flag(keyboard.Flags, winuser::RI_KEY_E0 as _)
+                            | util::has_flag(keyboard.Flags, winuser::RI_KEY_E1 as _);
+                        if let Some((vkey, scancode)) = handle_extended_keys(
+                            keyboard.VKey as _,
+                            scancode,
+                            extended,
+                        ) {
+                            let virtual_keycode = vkey_to_winit_vkey(vkey);
+
+                            send_event(Event::DeviceEvent {
+                                device_id,
+                                event: Key(KeyboardInput {
+                                    scancode,
+                                    state,
+                                    virtual_keycode,
+                                    modifiers: event::get_key_mods(),
+                                }),
+                            });
+                        }
                     }
                 }
-
-                0
-            } else {
-                winuser::DefWindowProcW(window, msg, wparam, lparam)
             }
+
+            winuser::DefWindowProcW(window, msg, wparam, lparam)
         },
 
         winuser::WM_TOUCH => {
@@ -793,10 +932,17 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             let mut inputs = Vec::with_capacity( pcount );
             inputs.set_len( pcount );
             let htouch = lparam as winuser::HTOUCHINPUT;
-            if winuser::GetTouchInputInfo( htouch, pcount as UINT,
-                                           inputs.as_mut_ptr(),
-                                           mem::size_of::<winuser::TOUCHINPUT>() as INT ) > 0 {
+            if winuser::GetTouchInputInfo(
+                htouch,
+                pcount as UINT,
+                inputs.as_mut_ptr(),
+                mem::size_of::<winuser::TOUCHINPUT>() as INT,
+            ) > 0 {
+                let dpi_factor = get_hwnd_scale_factor(window);
                 for input in &inputs {
+                    let x = (input.x as f64) / 100f64;
+                    let y = (input.y as f64) / 100f64;
+                    let location = LogicalPosition::from_physical((x, y), dpi_factor);
                     send_event( Event::WindowEvent {
                         window_id: SuperWindowId(WindowId(window)),
                         event: WindowEvent::Touch(Touch {
@@ -810,8 +956,7 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
                             } else {
                                 continue;
                             },
-                            location: ((input.x as f64) / 100f64,
-                                       (input.y as f64) / 100f64),
+                            location,
                             id: input.dwID as u64,
                             device_id: DEVICE_ID,
                         })
@@ -831,11 +976,14 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
 
             let x = windowsx::GET_X_LPARAM(lparam) as f64;
             let y = windowsx::GET_Y_LPARAM(lparam) as f64;
+            let dpi_factor = get_hwnd_scale_factor(window);
+            let position = LogicalPosition::from_physical((x, y), dpi_factor);
 
             send_event(Event::WindowEvent {
                 window_id: SuperWindowId(WindowId(window)),
-                event: CursorMoved { device_id: DEVICE_ID, position: (x, y), modifiers: event::get_key_mods() },
+                event: CursorMoved { device_id: DEVICE_ID, position, modifiers: event::get_key_mods() },
             });
+
             0
         },
 
@@ -850,30 +998,24 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
 
         winuser::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 Some(w_stash) = cstash.windows.get(&window) {
-                        if let Ok(window_state) = w_stash.lock() {
-                            if window_state.mouse_in_window {
-                                match window_state.cursor_state {
-                                    CursorState::Normal => {
-                                        winuser::SetCursor(winuser::LoadCursorW(
-                                                ptr::null_mut(),
-                                                window_state.cursor));
-                                    },
-                                    CursorState::Grab | CursorState::Hide => {
-                                        winuser::SetCursor(ptr::null_mut());
-                                    }
-                                }
-                            } else {
-                                call_def_window_proc = true;
-                            }
+                context_stash
+                    .borrow()
+                    .as_ref()
+                    .and_then(|cstash| cstash.windows.get(&window))
+                    .map(|window_state_mutex| {
+                        let window_state = window_state_mutex.lock().unwrap();
+                        if window_state.mouse_in_window {
+                            let cursor = winuser::LoadCursorW(
+                                ptr::null_mut(),
+                                window_state.cursor.0,
+                            );
+                            winuser::SetCursor(cursor);
+                            false
+                        } else {
+                            true
                         }
-                    }
-                }
-
-                call_def_window_proc
+                    })
+                    .unwrap_or(true)
             });
 
             if call_def_window_proc {
@@ -915,18 +1057,15 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
                     if let Some(wstash) = cstash.windows.get(&window) {
                         let window_state = wstash.lock().unwrap();
 
-                        if window_state.attributes.min_dimensions.is_some() ||
-                           window_state.attributes.max_dimensions.is_some() {
-
+                        if window_state.min_size.is_some() || window_state.max_size.is_some() {
                             let style = winuser::GetWindowLongA(window, winuser::GWL_STYLE) as DWORD;
                             let ex_style = winuser::GetWindowLongA(window, winuser::GWL_EXSTYLE) as DWORD;
-
-                            if let Some(min_dimensions) = window_state.attributes.min_dimensions {
-                                let (width, height) = adjust_size(min_dimensions, style, ex_style);
+                            if let Some(min_size) = window_state.min_size {
+                                let (width, height) = adjust_size(min_size, style, ex_style);
                                 (*mmi).ptMinTrackSize = POINT { x: width as i32, y: height as i32 };
                             }
-                            if let Some(max_dimensions) = window_state.attributes.max_dimensions {
-                                let (width, height) = adjust_size(max_dimensions, style, ex_style);
+                            if let Some(max_size) = window_state.max_size {
+                                let (width, height) = adjust_size(max_size, style, ex_style);
                                 (*mmi).ptMaxTrackSize = POINT { x: width as i32, y: height as i32 };
                             }
                         }
@@ -937,10 +1076,115 @@ pub unsafe extern "system" fn callback(window: HWND, msg: UINT,
             0
         },
 
+        // Only sent on Windows 8.1 or newer. On Windows 7 and older user has to log out to change
+        // DPI, therefore all applications are closed while DPI is changing.
+        winuser::WM_DPICHANGED => {
+            use events::WindowEvent::HiDpiFactorChanged;
+
+            // This message actually provides two DPI values - x and y. However MSDN says that
+            // "you only need to use either the X-axis or the Y-axis value when scaling your
+            // application since they are the same".
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/dn312083(v=vs.85).aspx
+            let new_dpi_x = u32::from(LOWORD(wparam as DWORD));
+            let new_dpi_factor = dpi_to_scale_factor(new_dpi_x);
+
+            let suppress_resize = CONTEXT_STASH.with(|context_stash| {
+                context_stash
+                    .borrow()
+                    .as_ref()
+                    .and_then(|cstash| cstash.windows.get(&window))
+                    .map(|window_state_mutex| {
+                        let mut window_state = window_state_mutex.lock().unwrap();
+                        let suppress_resize = window_state.saved_window_info
+                            .as_mut()
+                            .map(|saved_window_info| {
+                                let dpi_changed = if !saved_window_info.is_fullscreen {
+                                    saved_window_info.dpi_factor.take() != Some(new_dpi_factor)
+                                } else {
+                                    false
+                                };
+                                !dpi_changed || saved_window_info.is_fullscreen
+                            })
+                            .unwrap_or(false);
+                        // Now we adjust the min/max dimensions for the new DPI.
+                        if !suppress_resize {
+                            let old_dpi_factor = window_state.dpi_factor;
+                            window_state.update_min_max(old_dpi_factor, new_dpi_factor);
+                        }
+                        window_state.dpi_factor = new_dpi_factor;
+                        suppress_resize
+                    })
+                    .unwrap_or(false)
+            });
+
+            // This prevents us from re-applying DPI adjustment to the restored size after exiting
+            // fullscreen (the restored size is already DPI adjusted).
+            if !suppress_resize {
+                // Resize window to the size suggested by Windows.
+                let rect = &*(lparam as *const RECT);
+                winuser::SetWindowPos(
+                    window,
+                    ptr::null_mut(),
+                    rect.left,
+                    rect.top,
+                    rect.right - rect.left,
+                    rect.bottom - rect.top,
+                    winuser::SWP_NOZORDER | winuser::SWP_NOACTIVATE,
+                );
+            }
+
+            send_event(Event::WindowEvent {
+                window_id: SuperWindowId(WindowId(window)),
+                event: HiDpiFactorChanged(new_dpi_factor),
+            });
+
+            0
+        },
+
         _ => {
             if msg == *DESTROY_MSG_ID {
                 winuser::DestroyWindow(window);
                 0
+            } else if msg == *INITIAL_DPI_MSG_ID {
+                use events::WindowEvent::HiDpiFactorChanged;
+                let scale_factor = dpi_to_scale_factor(wparam as u32);
+                send_event(Event::WindowEvent {
+                    window_id: SuperWindowId(WindowId(window)),
+                    event: HiDpiFactorChanged(scale_factor),
+                });
+                // Automatically resize for actual DPI
+                let width = LOWORD(lparam as DWORD) as u32;
+                let height = HIWORD(lparam as DWORD) as u32;
+                let (adjusted_width, adjusted_height): (u32, u32) = PhysicalSize::from_logical(
+                    (width, height),
+                    scale_factor,
+                ).into();
+                // We're not done yet! `SetWindowPos` needs the window size, not the client area size.
+                let mut rect = RECT {
+                    top: 0,
+                    left: 0,
+                    bottom: adjusted_height as LONG,
+                    right: adjusted_width as LONG,
+                };
+                let dw_style = winuser::GetWindowLongA(window, winuser::GWL_STYLE) as DWORD;
+                let b_menu = !winuser::GetMenu(window).is_null() as BOOL;
+                let dw_style_ex = winuser::GetWindowLongA(window, winuser::GWL_EXSTYLE) as DWORD;
+                winuser::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;
+                winuser::SetWindowPos(
+                    window,
+                    ptr::null_mut(),
+                    0,
+                    0,
+                    outer_x,
+                    outer_y,
+                    winuser::SWP_NOMOVE
+                    | winuser::SWP_NOREPOSITION
+                    | winuser::SWP_NOZORDER
+                    | winuser::SWP_NOACTIVATE,
+                );
+                0
             } else {
                 winuser::DefWindowProcW(window, msg, wparam, lparam)
             }

src/platform/windows/icon.rs

@@ -0,0 +1,112 @@
+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(Debug)]
+pub struct WinIcon {
+    pub handle: HICON,
+}
+
+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/mod.rs

@@ -10,25 +10,49 @@ pub use self::window::Window;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes {
     pub parent: Option<HWND>,
+    pub taskbar_icon: Option<::Icon>,
+    pub no_redirection_bitmap: bool,
 }
 
 unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
 unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
 
-// TODO: document what this means
-pub type Cursor = *const winapi::ctypes::wchar_t;
+// 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 {}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(u32);
+
+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
+        }
+    }
+}
 
 // Constant device ID, to be removed when this backend is updated to report real device IDs.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId;
-const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);
+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 events_loop;
+mod icon;
 mod monitor;
+mod raw_input;
+mod util;
 mod window;

src/platform/windows/monitor.rs

@@ -1,178 +1,173 @@
-use winapi::ctypes::wchar_t;
-use winapi::shared::minwindef::{DWORD, LPARAM, BOOL, TRUE};
-use winapi::shared::windef::{HMONITOR, HDC, LPRECT, HWND};
+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::collections::VecDeque;
 use std::{mem, ptr};
+use std::collections::VecDeque;
 
-use super::EventsLoop;
+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: [wchar_t; 32],
-
     /// Monitor handle.
     hmonitor: HMonitor,
-
     /// The system name of the monitor.
     monitor_name: String,
-
     /// True if this is the primary monitor.
     primary: bool,
-
     /// The position of the monitor in pixels on the desktop.
     ///
     /// A window that is positioned at these coordinates will overlap the monitor.
     position: (i32, i32),
-
     /// The current resolution in pixels on the monitor.
     dimensions: (u32, u32),
-
-    /// DPI scaling factor.
-    hidpi_factor: f32,
+    /// DPI scale factor.
+    hidpi_factor: f64,
 }
 
 // Send is not implemented for HMONITOR, we have to wrap it and implement it manually.
 // For more info see:
 // https://github.com/retep998/winapi-rs/issues/360
 // https://github.com/retep998/winapi-rs/issues/396
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 struct HMonitor(HMONITOR);
 
 unsafe impl Send for HMonitor {}
 
-fn wchar_as_string(wchar: &[wchar_t]) -> String {
-    String::from_utf16_lossy(wchar)
-        .trim_right_matches(0 as char)
-        .to_string()
+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
 }
 
-unsafe extern "system" fn monitor_enum_proc(hmonitor: HMONITOR, _: HDC, place: LPRECT, data: LPARAM) -> BOOL {
-    let monitors = data as *mut VecDeque<MonitorId>;
-
-    let place = *place;
-    let position = (place.left as i32, place.top as i32);
-    let dimensions = ((place.right - place.left) as u32, (place.bottom - place.top) as u32);
-
-    let mut monitor_info: winuser::MONITORINFOEXW = mem::zeroed();
-    monitor_info.cbSize = mem::size_of::<winuser::MONITORINFOEXW>() as DWORD;
-    if winuser::GetMonitorInfoW(hmonitor, &mut monitor_info as *mut winuser::MONITORINFOEXW as *mut winuser::MONITORINFO) == 0 {
-        // Some error occurred, just skip this monitor and go on.
-        return TRUE;
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    let mut monitors: VecDeque<MonitorId> = VecDeque::new();
+    unsafe {
+        winuser::EnumDisplayMonitors(
+            ptr::null_mut(),
+            ptr::null_mut(),
+            Some(monitor_enum_proc),
+            &mut monitors as *mut _ as LPARAM,
+        );
     }
+    monitors
+}
 
-    (*monitors).push_back(MonitorId {
-        adapter_name: monitor_info.szDevice,
-        hmonitor: HMonitor(hmonitor),
-        monitor_name: wchar_as_string(&monitor_info.szDevice),
-        primary: monitor_info.dwFlags & winuser::MONITORINFOF_PRIMARY != 0,
-        position,
-        dimensions,
-        hidpi_factor: 1.0,
-    });
-
-    // TRUE means continue enumeration.
-    TRUE
+pub fn get_primary_monitor() -> MonitorId {
+    const ORIGIN: POINT = POINT { x: 0, y: 0 };
+    let hmonitor = unsafe {
+        winuser::MonitorFromPoint(ORIGIN, winuser::MONITOR_DEFAULTTOPRIMARY)
+    };
+    MonitorId::from_hmonitor(hmonitor)
 }
 
 impl EventsLoop {
+    // TODO: Investigate opportunities for caching
     pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        unsafe {
-            let mut result: VecDeque<MonitorId> = VecDeque::new();
-            winuser::EnumDisplayMonitors(ptr::null_mut(), ptr::null_mut(), Some(monitor_enum_proc), &mut result as *mut _ as LPARAM);
-            result
-        }
+        get_available_monitors()
     }
 
-    pub fn get_current_monitor(handle: HWND) -> MonitorId {
-        unsafe {
-            let mut monitor_info: winuser::MONITORINFOEXW = mem::zeroed();
-            monitor_info.cbSize = mem::size_of::<winuser::MONITORINFOEXW>() as DWORD;
-
-            let hmonitor = winuser::MonitorFromWindow(handle, winuser::MONITOR_DEFAULTTONEAREST);
-
-            winuser::GetMonitorInfoW(
-                hmonitor,
-                &mut monitor_info as *mut winuser::MONITORINFOEXW as *mut winuser::MONITORINFO,
-            );
-
-            let place = monitor_info.rcMonitor;
-            let position = (place.left as i32, place.top as i32);
-            let dimensions = (
-                (place.right - place.left) as u32,
-                (place.bottom - place.top) as u32,
-            );
-
-            MonitorId {
-                adapter_name: monitor_info.szDevice,
-                hmonitor: super::monitor::HMonitor(hmonitor),
-                monitor_name: wchar_as_string(&monitor_info.szDevice),
-                primary: monitor_info.dwFlags & winuser::MONITORINFOF_PRIMARY != 0,
-                position,
-                dimensions,
-                hidpi_factor: 1.0,
-            }
-        }
+    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 {
-        // we simply get all available monitors and return the one with the `MONITORINFOF_PRIMARY` flag
-        // TODO: it is possible to query the win32 API for the primary monitor, this should be done
-        //  instead
-        for monitor in self.get_available_monitors().into_iter() {
-            if monitor.primary {
-                return monitor;
-            }
-        }
+        get_primary_monitor()
+    }
+}
 
-        panic!("Failed to find the 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.monitor_name.clone())
     }
 
-    /// See the docs of the crate root file.
     #[inline]
     pub fn get_native_identifier(&self) -> String {
         self.monitor_name.clone()
     }
 
-    /// See the docs of the crate root file.
     #[inline]
     pub fn get_hmonitor(&self) -> HMONITOR {
         self.hmonitor.0
     }
 
-    /// See the docs of the crate root file.
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        // TODO: retrieve the dimensions every time this is called
-        self.dimensions
-    }
-
-    /// This is a Win32-only function for `MonitorId` that returns the system name of the adapter
-    /// device.
-    #[inline]
-    pub fn get_adapter_name(&self) -> &[wchar_t] {
-        &self.adapter_name
-    }
-
-    /// A window that is positioned at these coordinates will overlap the monitor.
-    #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        self.position
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.dimensions.into()
     }
 
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
+    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,15 +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 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.
@@ -22,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
     }
 
@@ -91,6 +105,31 @@ impl WindowBuilder {
         self
     }
 
+    /// 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 {
@@ -102,23 +141,24 @@ 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.dimensions = Some(self.window.dimensions.unwrap_or_else(|| {
             if let Some(ref monitor) = self.window.fullscreen {
-                self.window.dimensions = Some(monitor.get_dimensions());
+                // 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()
             }
-        }
-
-        // default dimensions
-        if self.window.dimensions.is_none() {
-            self.window.dimensions = Some((1024, 768));
-        }
+        }));
 
         // building
-        let w = try!(platform::Window::new(&events_loop.events_loop, &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 })
     }
 }
 
@@ -177,7 +217,7 @@ 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()
     }
 
@@ -186,7 +226,7 @@ impl Window {
     ///
     /// The same conditions that apply to `get_position` apply to this method.
     #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
         self.window.get_inner_position()
     }
 
@@ -196,61 +236,30 @@ impl Window {
     ///
     /// 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 pixels 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.
-    /// These are the dimensions that need to be supplied to `glViewport`.
+    ///
+    /// 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(&self) -> Option<(u32, u32)> {
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
         self.window.get_inner_size()
     }
 
-    /// Returns the size in points 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.
-    /// 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]
-    #[deprecated]
-    pub fn get_inner_size_points(&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 client area of the 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`.
-    ///
-    /// Returns `None` if the window no longer exists.
-    ///
-    /// DEPRECATED
-    #[inline]
-    #[deprecated]
-    pub fn get_inner_size_pixels(&self) -> Option<(u32, u32)> {
-        self.window.get_inner_size()
-    }
-
-    /// 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.
+    /// 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_outer_size(&self) -> Option<(u32, u32)> {
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
         self.window.get_outer_size()
     }
 
@@ -260,70 +269,88 @@ impl Window {
     ///
     /// 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)
     }
 
     /// Sets a minimum dimension size for the window.
-    ///
-    /// Width and height are in pixels.
     #[inline]
-    pub fn set_min_dimensions(&self, dimensions: Option<(u32, u32)>) {
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
         self.window.set_min_dimensions(dimensions)
     }
 
     /// Sets a maximum dimension size for the window.
-    ///
-    /// Width and height are in pixels.
     #[inline]
-    pub fn set_max_dimensions(&self, dimensions: Option<(u32, u32)>) {
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
         self.window.set_max_dimensions(dimensions)
     }
 
-    /// 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 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 unsafe fn platform_display(&self) -> *mut libc::c_void {
-        self.window.platform_display()
+    pub fn set_resizable(&self, resizable: bool) {
+        self.window.set_resizable(resizable)
     }
 
-    /// DEPRECATED. Gets the native platform specific window handle. This is
-    /// typically only required when integrating with other libraries
-    /// that need this information.
-    #[deprecated]
+    /// 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 unsafe fn platform_window(&self) -> *mut libc::c_void {
-        self.window.platform_window()
+    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 winit 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
@@ -344,11 +371,54 @@ impl Window {
         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]
     pub fn id(&self) -> WindowId {
         WindowId(self.window.id())
@@ -358,6 +428,7 @@ impl Window {
 /// An iterator for the list of available monitors.
 // Implementation note: we retrieve the list once, then serve each element by one by one.
 // This may change in the future.
+#[derive(Debug)]
 pub struct AvailableMonitorsIter {
     pub(crate) data: VecDequeIter<platform::MonitorId>,
 }
@@ -377,7 +448,7 @@ impl Iterator for AvailableMonitorsIter {
 }
 
 /// Identifier for a monitor.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct MonitorId {
     pub(crate) inner: platform::MonitorId
 }
@@ -391,22 +462,29 @@ impl MonitorId {
         self.inner.get_name()
     }
 
-    /// Returns the number of pixels currently displayed on the monitor.
+    /// Returns the monitor's resolution.
     #[inline]
-    pub fn get_dimensions(&self) -> (u32, u32) {
+    pub fn get_dimensions(&self) -> PhysicalSize {
         self.inner.get_dimensions()
     }
 
     /// Returns the top-left corner position of the monitor relative to the larger full
     /// screen area.
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
+    pub fn get_position(&self) -> PhysicalPosition {
         self.inner.get_position()
     }
 
-    /// Returns the ratio between the monitor's physical pixels and logical pixels.
+    /// 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) -> f32 {
+    pub fn get_hidpi_factor(&self) -> f64 {
         self.inner.get_hidpi_factor()
     }
 }