Publish 0.6.4

ICCCM 4.1.2.5 (https://tronche.com/gui/x/icccm/sec-4.html#WM_CLASS)
states that:

> This property must be present when the window leaves the Withdrawn
> state and may be changed only while the window is in the Withdrawn
> state.

Previously, we would first map the window, and then set these
properties, causing sadness for window managers (#167,
tomaka/glutin#879). This patch changes that by setting the class and
name attributes immediately after the window is created, and before it
is mapped.

Fixes #167.

.circleci/config.yml

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

.gitignore

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

.travis.yml

@@ -1,57 +1,30 @@
 language: rust
 
+rust:
+  - nightly
+  - stable
+
 cache: cargo
 
-matrix:
-  include:
-    # Linux 32bit
-    - env: TARGET=i686-unknown-linux-gnu
-      os: linux
-      rust: nightly
-      addons:
-        apt:
-          # Cross compiler and cross compiled C libraries
-          packages: &i686_packages
-            - gcc-multilib
-    - env: TARGET=i686-unknown-linux-gnu
-      os: linux
-      rust: stable
-      addons:
-        apt:
-          packages: *i686_packages
-
-    # Linux 64bit
-    - env: TARGET=x86_64-unknown-linux-gnu
-      os: linux
-      rust: nightly
-    - env: TARGET=x86_64-unknown-linux-gnu
-      os: linux
-      rust: stable
-
-    # macOS
-    - env: TARGET=x86_64-apple-darwin
-      os: osx
-      rust: nightly
-    - env: TARGET=x86_64-apple-darwin
-      os: osx
-      rust: stable
-
-    # iOS
-    - env: TARGET=x86_64-apple-ios
-      os: osx
-      rust: nightly
-    - env: TARGET=x86_64-apple-ios
-      os: osx
-      rust: stable
+addons:
+  apt:
+    packages:
+    - libxxf86vm-dev
 
 install:
-  - rustup self update
-  - rustup target add $TARGET; true
+  - |
+      if [ $TRAVIS_OS_NAME = osx ]; then
+        rustup target add x86_64-apple-ios
+      fi
 
 script:
-  - cargo build --target $TARGET --verbose
-  # Running iOS apps on OSX requires the simulator so we skip that for now
-  - if [ "$TARGET" != "x86_64-apple-ios" ]; then cargo test --target $TARGET --verbose; fi
+  - cargo build --verbose
+  - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
+  - cargo test --verbose
+
+os:
+  - linux
+  - osx
 
 after_success:
   - |

CHANGELOG.md

@@ -1,178 +0,0 @@
-# Unreleased
-
-# Version 0.15.0 (2018-05-22)
-
-- `Icon::to_cardinals` is no longer public, since it was never supposed to be.
-- Wayland: improve diagnostics if initialization fails
-- Fix some system event key doesn't work when focused, do not block keyevent forward to system on macOS
-- On X11, the scroll wheel position is now correctly reset on i3 and other WMs that have the same quirk.
-- On X11, `Window::get_current_monitor` now reliably returns the correct monitor.
-- On X11, `Window::hidpi_factor` returns values from XRandR rather than the inaccurate values previously queried from the core protocol.
-- On X11, the primary monitor is detected correctly even when using versions of XRandR less than 1.5.
-- `MonitorId` now implements `Debug`.
-- Fixed bug on macOS where using `with_decorations(false)` would cause `set_decorations(true)` to produce a transparent titlebar with no title.
-- Implemented `MonitorId::get_position` on macOS.
-- On macOS, `Window::get_current_monitor` now returns accurate values.
-- Added `WindowBuilderExt::with_resize_increments` to macOS.
-- **Breaking:** On X11, `WindowBuilderExt::with_resize_increments` and `WindowBuilderExt::with_base_size` now take `u32` values rather than `i32`.
-- macOS keyboard handling has been overhauled, allowing for the use of dead keys, IME, etc. Right modifier keys are also no longer reported as being left.
-- Added the `Window::set_ime_spot(x: i32, y: i32)` method, which is implemented on X11 and macOS.
-- **Breaking**: `os::unix::WindowExt::send_xim_spot(x: i16, y: i16)` no longer exists. Switch to the new `Window::set_ime_spot(x: i32, y: i32)`, which has equivalent functionality.
-- Fixed detection of `Pause` and `Scroll` keys on Windows.
-- On Windows, alt-tabbing while the cursor is grabbed no longer makes it impossible to re-grab the cursor.
-- On Windows, using `CursorState::Hide` when the cursor is grabbed now ungrabs the cursor first.
-- Implemented `MouseCursor::NoneCursor` on Windows.
-- Added `WindowBuilder::with_always_on_top` and `Window::set_always_on_top`. Implemented on Windows, macOS, and X11.
-- On X11, `WindowBuilderExt` now has `with_class`, `with_override_redirect`, and `with_x11_window_type` to allow for more control over window creation. `WindowExt` additionally has `set_urgent`.
-- More hints are set by default on X11, including `_NET_WM_PID` and `WM_CLIENT_MACHINE`. Note that prior to this, the `WM_CLASS` hint was automatically set to whatever value was passed to `with_title`. It's now set to the executable name to better conform to expectations and the specification; if this is undesirable, you must explicitly use `WindowBuilderExt::with_class`.
-
-# Version 0.14.0 (2018-05-09)
-
-- Created the `Copy`, `Paste` and `Cut` `VirtualKeyCode`s and added support for them on X11 and Wayland
-- Fix `.with_decorations(false)` in macOS
-- On Mac, `NSWindow` and supporting objects might be alive long after they were `closed` which resulted in apps consuming more heap then needed. Mainly it was affecting multi window applications. Not expecting any user visible change of behaviour after the fix.
-- Fix regression of Window platform extensions for macOS where `NSFullSizeContentViewWindowMask` was not being correctly applied to `.fullsize_content_view`.
-- Corrected `get_position` on Windows to be relative to the screen rather than to the taskbar.
-- Corrected `Moved` event on Windows to use position values equivalent to those returned by `get_position`. It previously supplied client area positions instead of window positions, and would additionally interpret negative values as being very large (around `u16::MAX`).
-- Implemented `Moved` event on macOS.
-- On X11, the `Moved` event correctly use window positions rather than client area positions. Additionally, a stray `Moved` that unconditionally accompanied `Resized` with the client area position relative to the parent has been eliminated; `Moved` is still received alongside `Resized`, but now only once and always correctly.
-- On Windows, implemented all variants of `DeviceEvent` other than `Text`. Mouse `DeviceEvent`s are now received even if the window isn't in the foreground.
-- `DeviceId` on Windows is no longer a unit struct, and now contains a `u32`. For `WindowEvent`s, this will always be 0, but on `DeviceEvent`s it will be the handle to that device. `DeviceIdExt::get_persistent_identifier` can be used to acquire a unique identifier for that device that persists across replugs/reboots/etc.
-- Corrected `run_forever` on X11 to stop discarding `Awakened` events.
-- Various safety and correctness improvements to the X11 backend internals.
-- Fixed memory leak on X11 every time the mouse entered the window.
-- On X11, drag and drop now works reliably in release mode.
-- Added `WindowBuilderExt::with_resize_increments` and `WindowBuilderExt::with_base_size` to X11, allowing for more optional hints to be set.
-- Rework of the wayland backend, migrating it to use [Smithay's Client Toolkit](https://github.com/Smithay/client-toolkit).
-- Added `WindowBuilder::with_window_icon` and `Window::set_window_icon`, finally making it possible to set the window icon on Windows and X11. The `icon_loading` feature can be enabled to allow for icons to be easily loaded; see example program `window_icon.rs` for usage.
-- Windows additionally has `WindowBuilderExt::with_taskbar_icon` and `WindowExt::set_taskbar_icon`.
-- On Windows, fix panic when trying to call `set_fullscreen(None)` on a window that has not been fullscreened prior.
-
-# Version 0.13.1 (2018-04-26)
-
-- Ensure necessary `x11-dl` version is used.
-
-# Version 0.13.0 (2018-04-25)
-
-- Implement `WindowBuilder::with_maximized`, `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for MacOS.
-- Implement `WindowBuilder::with_maximized`, `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for Windows.
-- On Windows, `WindowBuilder::with_fullscreen` no longer changing monitor display resolution.
-- Overhauled X11 window geometry calculations. `get_position` and `set_position` are more universally accurate across different window managers, and `get_outer_size` actually works now.
-- Fixed SIGSEGV/SIGILL crashes on macOS caused by stabilization of the `!` (never) type.
-- Implement `WindowEvent::HiDPIFactorChanged` for macOS
-- On X11, input methods now work completely out of the box, no longer requiring application developers to manually call `setlocale`. Additionally, when input methods are started, stopped, or restarted on the server end, it's correctly handled.
-- Implemented `Refresh` event on Windows.
-- Properly calculate the minimum and maximum window size on Windows, including window decorations.
-- Map more `MouseCursor` variants to cursor icons on Windows.
-- Corrected `get_position` on macOS to return outer frame position, not content area position.
-- Corrected `set_position` on macOS to set outer frame position, not content area position.
-- Added `get_inner_position` method to `Window`, which gets the position of the window's client area. This is implemented on all applicable platforms (all desktop platforms other than Wayland, where this isn't possible).
-- **Breaking:** the `Closed` event has been replaced by `CloseRequested` and `Destroyed`. To migrate, you typically just need to replace all usages of `Closed` with `CloseRequested`; see example programs for more info. The exception is iOS, where `Closed` must be replaced by `Destroyed`.
-
-# Version 0.12.0 (2018-04-06)
-
-- Added subclass to macos windows so they can be made resizable even with no decorations.
-- Dead keys now work properly on X11, no longer resulting in a panic.
-- On X11, input method creation first tries to use the value from the user's `XMODIFIERS` environment variable, so application developers should no longer need to manually call `XSetLocaleModifiers`. If that fails, fallbacks are tried, which should prevent input method initialization from ever outright failing.
-- Fixed thread safety issues with input methods on X11.
-- Add support for `Touch` for win32 backend.
-- Fixed `Window::get_inner_size` and friends to return the size in pixels instead of points when using HIDPI displays on OSX.
-
-# Version 0.11.3 (2018-03-28)
-
-- Added `set_min_dimensions` and `set_max_dimensions` methods to `Window`, and implemented on Windows, X11, Wayland, and OSX.
-- On X11, dropping a `Window` actually closes it now, and clicking the window's × button (or otherwise having the WM signal to close it) will result in the window closing.
-- Added `WindowBuilderExt` methods for macos: `with_titlebar_transparent`,
-  `with_title_hidden`, `with_titlebar_buttons_hidden`,
-  `with_fullsize_content_view`.
-- Mapped X11 numpad keycodes (arrows, Home, End, PageUp, PageDown, Insert and Delete) to corresponding virtual keycodes
-
-# Version 0.11.2 (2018-03-06)
-
-- Impl `Hash`, `PartialEq`, and `Eq` for `events::ModifiersState`.
-- Implement `MonitorId::get_hidpi_factor` for MacOS.
-- Added method `os::macos::MonitorIdExt::get_nsscreen() -> *mut c_void` that gets a `NSScreen` object matching the monitor ID.
-- Send `Awakened` event on Android when event loop is woken up.
-
-# Version 0.11.1 (2018-02-19)
-
-- Fixed windows not receiving mouse events when click-dragging the mouse outside the client area of a window, on Windows platforms.
-- Added method `os::android::EventsLoopExt:set_suspend_callback(Option<Box<Fn(bool) -> ()>>)` that allows glutin to register a callback when a suspend event happens
-
-# Version 0.11.0 (2018-02-09)
-
-- Implement `MonitorId::get_dimensions` for Android.
-- Added method `os::macos::WindowBuilderExt::with_movable_by_window_background(bool)` that allows to move a window without a titlebar - `with_decorations(false)`
-- Implement `Window::set_fullscreen`, `Window::set_maximized` and `Window::set_decorations` for Wayland.
-- Added `Caret` as VirtualKeyCode and support OSX ^-Key with german input.
-
-# Version 0.10.1 (2018-02-05)
-
-*Yanked*
-
-# Version 0.10.0 (2017-12-27)
-
-- Add support for `Touch` for emscripten backend.
-- Added support for `DroppedFile`, `HoveredFile`, and `HoveredFileCancelled` to X11 backend.
-- **Breaking:** `unix::WindowExt` no longer returns pointers for things that aren't actually pointers; `get_xlib_window` now returns `Option<std::os::raw::c_ulong>` and `get_xlib_screen_id` returns `Option<std::os::raw::c_int>`. Additionally, methods that previously returned `libc::c_void` have been changed to return `std::os::raw::c_void`, which are not interchangeable types, so users wanting the former will need to explicitly cast.
-- Added `set_decorations` method to `Window` to allow decorations to be toggled after the window is built. Presently only implemented on X11.
-- Raised the minimum supported version of Rust to 1.20 on MacOS due to usage of associated constants in new versions of cocoa and core-graphics.
-- Added `modifiers` field to `MouseInput`, `MouseWheel`, and `CursorMoved` events to track the modifiers state (`ModifiersState`).
-- Fixed the emscripten backend to return the size of the canvas instead of the size of the window.
-
-# Version 0.9.0 (2017-12-01)
-
-- Added event `WindowEvent::HiDPIFactorChanged`.
-- Added method `MonitorId::get_hidpi_factor`.
-- Deprecated `get_inner_size_pixels` and `get_inner_size_points` methods of `Window` in favor of
-`get_inner_size`.
-- **Breaking:** `EventsLoop` is `!Send` and `!Sync` because of platform-dependant constraints,
-  but `Window`, `WindowId`, `DeviceId` and `MonitorId` guaranteed to be `Send`.
-- `MonitorId::get_position` now returns `(i32, i32)` instead of `(u32, u32)`.
-- Rewrite of the wayland backend to use wayland-client-0.11
-- Support for dead keys on wayland for keyboard utf8 input
-- Monitor enumeration on Windows is now implemented using `EnumDisplayMonitors` instead of
-`EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`.
-- On Windows added `MonitorIdExt::hmonitor` method
-- Impl `Clone` for `EventsLoopProxy`
-- `EventsLoop::get_primary_monitor()` on X11 will fallback to any available monitor if no primary is found
-- Support for touch event on wayland
-- `WindowEvent`s `MouseMoved`, `MouseEntered`, and `MouseLeft` have been renamed to
-`CursorMoved`, `CursorEntered`, and `CursorLeft`.
-- New `DeviceEvent`s added, `MouseMotion` and `MouseWheel`.
-- Send `CursorMoved` event after `CursorEntered` and `Focused` events.
-- Add support for `ModifiersState`, `MouseMove`, `MouseInput`, `MouseMotion` for emscripten backend.
-
-# Version 0.8.3 (2017-10-11)
-
-- Fixed issue of calls to `set_inner_size` blocking on Windows.
-- Mapped `ISO_Left_Tab` to `VirtualKeyCode::Tab` to make the key work with modifiers
-- Fixed the X11 backed on 32bit targets
-
-# Version 0.8.2 (2017-09-28)
-
-- Uniformize keyboard scancode values accross Wayland and X11 (#297).
-- Internal rework of the wayland event loop
-- Added method `os::linux::WindowExt::is_ready`
-
-# Version 0.8.1 (2017-09-22)
-
-- Added various methods to `os::linux::EventsLoopExt`, plus some hidden items necessary to make
-  glutin work.
-
-# Version 0.8.0 (2017-09-21)
-
-- Added `Window::set_maximized`, `WindowAttributes::maximized` and `WindowBuilder::with_maximized`.
-- Added `Window::set_fullscreen`.
-- Changed `with_fullscreen` to take a `Option<MonitorId>` instead of a `MonitorId`.
-- Removed `MonitorId::get_native_identifer()` in favor of platform-specific traits in the `os`
-  module.
-- Changed `get_available_monitors()` and `get_primary_monitor()` to be methods of `EventsLoop`
-  instead of stand-alone methods.
-- Changed `EventsLoop` to be tied to a specific X11 or Wayland connection.
-- Added a `os::linux::EventsLoopExt` trait that makes it possible to configure the connection.
-- Fixed the emscripten code, which now compiles.
-- Changed the X11 fullscreen code to use `xrandr` instead of `xxf86vm`.
-- Fixed the Wayland backend to produce `Refresh` event after window creation.
-- Changed the `Suspended` event to be outside of `WindowEvent`.
-- Fixed the X11 backend sometimes reporting the wrong virtual key (#273).

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "winit"
-version = "0.15.0"
+version = "0.6.4"
 authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
 keywords = ["windowing"]
@@ -10,16 +10,10 @@ 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"
+lazy_static = "0.2.2"
 libc = "0.2"
-image = { version = "0.19", optional = true }
+shared_library = "0.1.5"
 
 [target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.2"
@@ -29,30 +23,21 @@ objc = "0.2"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
-cocoa = "0.15"
-core-foundation = "0.6"
-core-graphics = "0.14"
+cgl = "0.2"
+cocoa = "=0.5.2"
+core-foundation = "0.2"
+core-graphics = "0.4"
 
-[target.'cfg(target_os = "windows")'.dependencies.winapi]
-version = "0.3"
-features = [
-    "winnt",
-    "winuser",
-    "wingdi",
-    "shellapi",
-    "dwmapi",
-    "processthreadsapi",
-    "libloaderapi",
-    "windowsx",
-    "hidusage",
-    "combaseapi",
-    "objbase",
-    "unknwnbase",
-]
+[target.'cfg(target_os = "windows")'.dependencies]
+winapi = "0.2"
+shell32-sys = "0.1"
+gdi32-sys = "0.1"
+user32-sys = "~0.1.2"
+kernel32-sys = "0.2"
+dwmapi-sys = "0.1"
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
-wayland-client = { version = "0.20.6", features = [ "dlopen", "egl", "cursor"] }
-smithay-client-toolkit = "0.2.1"
-x11-dl = "2.17.5"
-parking_lot = "0.5"
-percent-encoding = "1.0"
+wayland-client = { version = "0.8.6", features = ["dlopen"] }
+wayland-kbd = "0.8.0"
+wayland-window = "0.5.0"
+x11-dl = "2.8"

README.md

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

examples/cursor.rs

@@ -1,9 +1,9 @@
 extern crate winit;
 
-use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
+use winit::{Event, ElementState, MouseCursor, WindowEvent};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
     window.set_title("A fantastic window!");
@@ -13,7 +13,7 @@ fn main() {
 
     events_loop.run_forever(|event| {
         match event {
-            Event::WindowEvent { event: WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. }, .. } => {
+            Event::WindowEvent { event: WindowEvent::KeyboardInput(ElementState::Pressed, _, _, _), .. } => {
                 println!("Setting cursor to \"{:?}\"", cursors[cursor_idx]);
                 window.set_cursor(cursors[cursor_idx]);
                 if cursor_idx < cursors.len() - 1 {
@@ -22,11 +22,10 @@ fn main() {
                     cursor_idx = 0;
                 }
             },
-            Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
-                return ControlFlow::Break;
+            Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+                events_loop.interrupt()
             },
             _ => ()
         }
-        ControlFlow::Continue
     });
 }

examples/fullscreen.rs

@@ -1,14 +1,11 @@
 extern crate winit;
 
 use std::io::{self, Write};
-use winit::{ControlFlow, Event, WindowEvent};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
-
     // enumerating monitors
     let monitor = {
-        for (num, monitor) in events_loop.get_available_monitors().enumerate() {
+        for (num, monitor) in winit::get_available_monitors().enumerate() {
             println!("Monitor #{}: {:?}", num, monitor.get_name());
         }
 
@@ -18,62 +15,32 @@ fn main() {
         let mut num = String::new();
         io::stdin().read_line(&mut num).unwrap();
         let num = num.trim().parse().ok().expect("Please enter a number");
-        let monitor = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
+        let monitor = winit::get_available_monitors().nth(num).expect("Please enter a valid ID");
 
         println!("Using {:?}", monitor.get_name());
 
         monitor
     };
 
-    let window = winit::WindowBuilder::new()
+    let events_loop = winit::EventsLoop::new();
+
+    let _window = winit::WindowBuilder::new()
         .with_title("Hello world!")
-        .with_fullscreen(Some(monitor))
+        .with_fullscreen(monitor)
         .build(&events_loop)
         .unwrap();
 
-    let mut is_fullscreen = true;
-    let mut is_maximized = false;
-    let mut decorations = true;
-
     events_loop.run_forever(|event| {
         println!("{:?}", event);
 
         match event {
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => return ControlFlow::Break,
-                WindowEvent::KeyboardInput {
-                    input:
-                        winit::KeyboardInput {
-                            virtual_keycode: Some(virtual_code),
-                            state,
-                            ..
-                        },
-                    ..
-                } => match (virtual_code, state) {
-                    (winit::VirtualKeyCode::Escape, _) => return ControlFlow::Break,
-                    (winit::VirtualKeyCode::F, winit::ElementState::Pressed) => {
-                        is_fullscreen = !is_fullscreen;
-                        if !is_fullscreen {
-                            window.set_fullscreen(None);
-                        } else {
-                            window.set_fullscreen(Some(window.get_current_monitor()));
-                        }
-                    }
-                    (winit::VirtualKeyCode::M, winit::ElementState::Pressed) => {
-                        is_maximized = !is_maximized;
-                        window.set_maximized(is_maximized);
-                    }
-                    (winit::VirtualKeyCode::D, winit::ElementState::Pressed) => {
-                        decorations = !decorations;
-                        window.set_decorations(decorations);
-                    }
-                    _ => (),
-                },
-                _ => (),
+            winit::Event::WindowEvent { event, .. } => {
+                match event {
+                    winit::WindowEvent::Closed => events_loop.interrupt(),
+                    winit::WindowEvent::KeyboardInput(_, _, Some(winit::VirtualKeyCode::Escape), _) => events_loop.interrupt(),
+                    _ => ()
+                }
             },
-            _ => {}
         }
-
-        ControlFlow::Continue
     });
 }

examples/grabbing.rs

@@ -1,9 +1,9 @@
 extern crate winit;
 
-use winit::{ControlFlow, WindowEvent, ElementState, KeyboardInput};
+use winit::{WindowEvent, ElementState};
 
 fn main() {
-    let mut events_loop = winit::EventsLoop::new();
+    let events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
     window.set_title("winit - Cursor grabbing test");
@@ -16,7 +16,7 @@ fn main() {
         match event {
             winit::Event::WindowEvent { event, .. } => {
                 match event {
-                    WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. } => {
+                    WindowEvent::KeyboardInput(ElementState::Pressed, _, _, _) => {
                         if grabbed {
                             grabbed = false;
                             window.set_cursor_state(winit::CursorState::Normal)
@@ -28,18 +28,15 @@ fn main() {
                         }
                     },
 
-                    WindowEvent::CloseRequested => return ControlFlow::Break,
+                    WindowEvent::Closed => events_loop.interrupt(),
 
-                    a @ WindowEvent::CursorMoved { .. } => {
+                    a @ WindowEvent::MouseMoved(_, _) => {
                         println!("{:?}", a);
                     },
 
                     _ => (),
                 }
-            }
-            _ => {}
+            },
         }
-
-        ControlFlow::Continue
     });
 }

examples/handling_close.rs

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

examples/min_max_size.rs

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

examples/multiwindow.rs

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

examples/proxy.rs

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

examples/transparent.rs

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

examples/window.rs

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

examples/window_icon.rs

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

src/api_transition.rs

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

src/events.rs

@@ -1,50 +1,31 @@
 use std::path::PathBuf;
-use {WindowId, DeviceId};
+use WindowId;
 
-/// Describes a generic event.
 #[derive(Clone, Debug)]
 pub enum Event {
     WindowEvent {
         window_id: WindowId,
         event: WindowEvent,
-    },
-    DeviceEvent {
-        device_id: DeviceId,
-        event: DeviceEvent,
-    },
-    Awakened,
-
-    /// The application has been suspended or resumed.
-    ///
-    /// The parameter is true if app was suspended, and false if it has been resumed.
-    Suspended(bool),
+    }
 }
 
-/// Describes an event from a `Window`.
 #[derive(Clone, Debug)]
 pub enum WindowEvent {
+    // TODO: remove ; can break the lib internally so be careful
+    Awakened,
 
-    /// The size of the window has changed. Contains the client area's new dimensions.
+    /// The size of the window has changed.
     Resized(u32, u32),
 
-    /// The position of the window has changed. Contains the window's new position.
+    /// The position of the window has changed.
     Moved(i32, i32),
 
-    /// The window has been requested to close.
-    CloseRequested,
-
-    /// The window has been destroyed.
-    Destroyed,
+    /// The window has been closed.
+    Closed,
 
     /// A file has been dropped into the window.
     DroppedFile(PathBuf),
 
-    /// A file is being hovered over the window.
-    HoveredFile(PathBuf),
-
-    /// A file was hovered, but has exited the window.
-    HoveredFileCancelled,
-
     /// The window received a unicode character.
     ReceivedCharacter(char),
 
@@ -54,122 +35,44 @@ pub enum WindowEvent {
     Focused(bool),
 
     /// An event from the keyboard has been received.
-    KeyboardInput { device_id: DeviceId, input: KeyboardInput },
+    KeyboardInput(ElementState, ScanCode, Option<VirtualKeyCode>, ModifiersState),
 
     /// The cursor has moved on the window.
-    CursorMoved {
-        device_id: DeviceId,
-
-        /// (x,y) coords in pixels relative to the top-left corner of the window. Because the range of this data is
-        /// limited by the display area and it may have been transformed by the OS to implement effects such as cursor
-        /// acceleration, it should not be used to implement non-cursor-like interactions such as 3D camera control.
-        position: (f64, f64),
-        modifiers: ModifiersState
-    },
+    ///
+    /// The parameter are the (x,y) coords in pixels relative to the top-left corner of the window.
+    MouseMoved(i32, i32),
 
     /// The cursor has entered the window.
-    CursorEntered { device_id: DeviceId },
+    MouseEntered,
 
     /// The cursor has left the window.
-    CursorLeft { device_id: DeviceId },
+    MouseLeft,
 
     /// A mouse wheel movement or touchpad scroll occurred.
-    MouseWheel { device_id: DeviceId, delta: MouseScrollDelta, phase: TouchPhase, modifiers: ModifiersState },
-
-    /// An mouse button press has been received.
-    MouseInput { device_id: DeviceId, state: ElementState, button: MouseButton, modifiers: ModifiersState },
+    MouseWheel(MouseScrollDelta, TouchPhase),
 
+    /// An event from the mouse has been received.
+    MouseInput(ElementState, MouseButton),
 
     /// Touchpad pressure event.
     ///
     /// At the moment, only supported on Apple forcetouch-capable macbooks.
     /// The parameters are: pressure level (value between 0 and 1 representing how hard the touchpad
     /// is being pressed) and stage (integer representing the click level).
-    TouchpadPressure { device_id: DeviceId, pressure: f32, stage: i64 },
-
-    /// Motion on some analog axis. May report data redundant to other, more specific events.
-    AxisMotion { device_id: DeviceId, axis: AxisId, value: f64 },
+    TouchpadPressure(f32, i64),
 
     /// The window needs to be redrawn.
     Refresh,
 
+    /// App has been suspended or resumed.
+    ///
+    /// The parameter is true if app was suspended, and false if it has been resumed.
+    Suspended(bool),
+
     /// Touch event has been received
-    Touch(Touch),
-
-    /// DPI scaling factor of the window has changed.
-    ///
-    /// The following actions 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),
+    Touch(Touch)
 }
 
-/// Represents raw hardware events that are not associated with any particular window.
-///
-/// Useful for interactions that diverge significantly from a conventional 2D GUI, such as 3D camera or first-person
-/// game controls. Many physical actions, such as mouse movement, can produce both device and window events. Because
-/// window events typically arise from virtual devices (corresponding to GUI cursors and keyboard focus) the device IDs
-/// may not match.
-///
-/// Note that these events are delivered regardless of input focus.
-#[derive(Clone, Debug)]
-pub enum DeviceEvent {
-    Added,
-    Removed,
-
-    /// Change in physical position of a pointing device.
-    ///
-    /// This represents raw, unfiltered physical motion. Not to be confused with `WindowEvent::CursorMoved`.
-    MouseMotion {
-        /// (x, y) change in position in unspecified units.
-        ///
-        /// Different devices may use different units.
-        delta: (f64, f64),
-    },
-
-    /// Physical scroll event
-    MouseWheel {
-        delta: MouseScrollDelta,
-    },
-
-    /// Motion on some analog axis.  This event will be reported for all arbitrary input devices
-    /// that winit supports on this platform, including mouse devices.  If the device is a mouse
-    /// device then this will be reported alongside the MouseMotion event.
-    Motion { axis: AxisId, value: f64 },
-
-    Button { button: ButtonId, state: ElementState },
-    Key(KeyboardInput),
-    Text { codepoint: char },
-}
-
-/// Describes a keyboard input event.
-#[derive(Debug, Clone, Copy)]
-pub struct KeyboardInput {
-    /// Identifies the physical key pressed
-    ///
-    /// This should not change if the user adjusts the host's keyboard map. Use when the physical location of the
-    /// key is more important than the key's host GUI semantics, such as for movement controls in a first-person
-    /// game.
-    pub scancode: ScanCode,
-
-    pub state: ElementState,
-
-    /// Identifies the semantic meaning of the key
-    ///
-    /// Use when the semantics of the key are more important than the physical location of the key, such as when
-    /// implementing appropriate behavior for "page up."
-    pub virtual_keycode: Option<VirtualKeyCode>,
-
-    /// Modifier keys active at the time of this input.
-    ///
-    /// This is tracked internally to avoid tracking errors arising from modifier key state changes when events from
-    /// this device are not being delivered to the application, e.g. due to keyboard focus being elsewhere.
-    pub modifiers: ModifiersState
-}
-
-/// Describes touch-screen input state.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum TouchPhase {
     Started,
@@ -178,6 +81,7 @@ pub enum TouchPhase {
     Cancelled
 }
 
+#[derive(Debug, Clone, Copy)]
 /// Represents touch event
 ///
 /// Every time user touches screen new Start event with some finger id is generated.
@@ -193,32 +97,21 @@ pub enum TouchPhase {
 /// as previously received End event is a new finger and has nothing to do with an old one.
 ///
 /// Touch may be cancelled if for example window lost focus.
-#[derive(Debug, Clone, Copy)]
 pub struct Touch {
-    pub device_id: DeviceId,
     pub phase: TouchPhase,
     pub location: (f64,f64),
     /// unique identifier of a finger.
     pub id: u64
 }
 
-/// Hardware-dependent keyboard scan code.
-pub type ScanCode = u32;
+pub type ScanCode = u8;
 
-/// Identifier for a specific analog axis on some device.
-pub type AxisId = u32;
-
-/// Identifier for a specific button on some device.
-pub type ButtonId = u32;
-
-/// Describes the input state of a key.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum ElementState {
     Pressed,
     Released,
 }
 
-/// Describes a button of a mouse controller.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum MouseButton {
     Left,
@@ -227,7 +120,6 @@ pub enum MouseButton {
     Other(u8),
 }
 
-/// Describes a difference in the mouse scroll wheel state.
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum MouseScrollDelta {
 	/// Amount in lines or rows to scroll in the horizontal
@@ -245,9 +137,7 @@ pub enum MouseScrollDelta {
 	PixelDelta(f32, f32)
 }
 
-/// Symbolic name for a keyboard key.
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
-#[repr(u32)]
 pub enum VirtualKeyCode {
     /// The '1' key over the letters.
     Key1,
@@ -347,8 +237,6 @@ pub enum VirtualKeyCode {
     /// The "Compose" key on Linux.
     Compose,
 
-    Caret,
-
     Numlock,
     Numpad0,
     Numpad1,
@@ -431,15 +319,12 @@ pub enum VirtualKeyCode {
     WebSearch,
     WebStop,
     Yen,
-    Copy,
-    Paste,
-    Cut,
 }
 
 /// Represents the current state of the keyboard modifiers
 ///
 /// Each field of this struct represents a modifier and is `true` if this modifier is active.
-#[derive(Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
+#[derive(Default, Debug, Clone, Copy)]
 pub struct ModifiersState {
     /// The "shift" key
     pub shift: bool,

src/icon.rs

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

src/lib.rs

@@ -1,4 +1,4 @@
-//! Winit allows you to build a window on as many platforms as possible.
+//! Winit allows you to build a window on as many platforms as possible. 
 //!
 //! # Building a window
 //!
@@ -15,7 +15,7 @@
 //!  - Calling `Window::new(&events_loop)`.
 //!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
 //!
-//! The first way is the simplest way and will give you default values for everything.
+//! The first way is the simpliest 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.
@@ -34,9 +34,10 @@
 //! screen, such as video games.
 //!
 //! ```no_run
-//! use winit::{Event, WindowEvent};
+//! use winit::Event;
+//! use winit::WindowEvent;
 //! # use winit::EventsLoop;
-//! # let mut events_loop = EventsLoop::new();
+//! # let events_loop = EventsLoop::new();
 //!
 //! loop {
 //!     events_loop.poll_events(|event| {
@@ -51,20 +52,21 @@
 //! ```
 //!
 //! The second way is to call `events_loop.run_forever(...)`. As its name tells, it will run
-//! forever unless it is stopped by returning `ControlFlow::Break`.
+//! forever unless it is stopped by calling `events_loop.interrupt()`.
 //!
 //! ```no_run
-//! use winit::{ControlFlow, Event, WindowEvent};
+//! use winit::Event;
+//! use winit::WindowEvent;
 //! # use winit::EventsLoop;
-//! # let mut events_loop = EventsLoop::new();
+//! # let events_loop = EventsLoop::new();
 //!
 //! events_loop.run_forever(|event| {
 //!     match event {
-//!         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
-//!             println!("The close button was pressed; stopping");
-//!             ControlFlow::Break
+//!         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+//!             println!("The window was closed ; stopping");
+//!             events_loop.interrupt();
 //!         },
-//!         _ => ControlFlow::Continue,
+//!         _ => ()
 //!     }
 //! });
 //! ```
@@ -82,17 +84,30 @@
 
 #[macro_use]
 extern crate lazy_static;
+
+#[macro_use]
+extern crate shared_library;
+
 extern crate libc;
-#[cfg(feature = "icon_loading")]
-extern crate image;
 
 #[cfg(target_os = "windows")]
-#[macro_use]
 extern crate winapi;
+#[cfg(target_os = "windows")]
+extern crate kernel32;
+#[cfg(target_os = "windows")]
+extern crate shell32;
+#[cfg(target_os = "windows")]
+extern crate gdi32;
+#[cfg(target_os = "windows")]
+extern crate user32;
+#[cfg(target_os = "windows")]
+extern crate dwmapi;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;
 #[cfg(target_os = "macos")]
+extern crate cgl;
+#[cfg(target_os = "macos")]
 extern crate cocoa;
 #[cfg(target_os = "macos")]
 extern crate core_foundation;
@@ -100,21 +115,22 @@ extern crate core_foundation;
 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"))]
-extern crate smithay_client_toolkit as sctk;
+#[macro_use(wayland_env,declare_handler)]
+extern crate wayland_client;
+
+use std::sync::Arc;
 
 pub use events::*;
-pub use window::{AvailableMonitorsIter, MonitorId};
-pub use icon::*;
+pub use window::{AvailableMonitorsIter, MonitorId, get_available_monitors, get_primary_monitor};
+pub use native_monitor::NativeMonitorId;
+
+#[macro_use]
+mod api_transition;
 
 mod platform;
 mod events;
 mod window;
-mod icon;
 
 pub mod os;
 
@@ -123,22 +139,25 @@ pub mod os;
 /// # Example
 ///
 /// ```no_run
-/// use winit::{Event, EventsLoop, Window, WindowEvent, ControlFlow};
+/// use winit::Event;
+/// use winit::EventsLoop;
+/// use winit::Window;
+/// use winit::WindowEvent;
 ///
-/// let mut events_loop = EventsLoop::new();
+/// let events_loop = EventsLoop::new();
 /// let window = Window::new(&events_loop).unwrap();
 ///
 /// events_loop.run_forever(|event| {
 ///     match event {
-///         Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => {
-///             ControlFlow::Break
+///         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+///             events_loop.interrupt();
 ///         },
-///         _ => ControlFlow::Continue,
+///         _ => ()
 ///     }
 /// });
 /// ```
 pub struct Window {
-    window: platform::Window,
+    window: platform::Window2,
 }
 
 /// Identifier of a window. Unique for each window.
@@ -150,131 +169,42 @@ pub struct Window {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct WindowId(platform::WindowId);
 
-/// Identifier of an input device.
-///
-/// Whenever you receive an event arising from a particular input device, this event contains a `DeviceId` which
-/// identifies its origin. Note that devices may be virtual (representing an on-screen cursor and keyboard focus) or
-/// physical. Virtual devices typically aggregate inputs from multiple physical devices.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId(platform::DeviceId);
-
-/// Provides a way to retreive events from the system and from the windows that were registered to
-/// the events loop.
-///
-/// An `EventsLoop` can be seen more or less as a "context". Calling `EventsLoop::new()`
-/// initializes everything that will be required to create windows. For example on Linux creating
-/// an events loop opens a connection to the X or Wayland server.
-///
-/// To wake up an `EventsLoop` from a another thread, see the `EventsLoopProxy` docs.
-///
-/// Note that the `EventsLoop` cannot be shared accross threads (due to platform-dependant logic
-/// forbiding it), as such it is neither `Send` nor `Sync`. If you need cross-thread access, the
-/// `Window` created from this `EventsLoop` _can_ be sent to an other thread, and the
-/// `EventsLoopProxy` allows you to wakeup an `EventsLoop` from an other thread.
+/// Provides a way to retreive events from the windows that were registered to it.
+// TODO: document usage in multiple threads
 pub struct EventsLoop {
-    events_loop: platform::EventsLoop,
-    _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync
-}
-
-/// Returned by the user callback given to the `EventsLoop::run_forever` method.
-///
-/// Indicates whether the `run_forever` method should continue or complete.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ControlFlow {
-    /// Continue looping and waiting for events.
-    Continue,
-    /// Break from the event loop.
-    Break,
+    events_loop: Arc<platform::EventsLoop>,
 }
 
 impl EventsLoop {
     /// Builds a new events loop.
-    ///
-    /// Usage will result in display backend initialisation, this can be controlled on linux
-    /// using an environment variable `WINIT_UNIX_BACKEND`. Legal values are `x11` and `wayland`.
-    /// If it is not set, winit will try to connect to a wayland connection, and if it fails will
-    /// fallback on x11. If this variable is set with any other value, winit will panic.
     pub fn new() -> EventsLoop {
         EventsLoop {
-            events_loop: platform::EventsLoop::new(),
-            _marker: ::std::marker::PhantomData,
+            events_loop: Arc::new(platform::EventsLoop::new()),
         }
     }
 
-    /// Returns the list of all the monitors available on the system.
-    ///
-    // Note: should be replaced with `-> impl Iterator` once stable.
-    #[inline]
-    pub fn get_available_monitors(&self) -> AvailableMonitorsIter {
-        let data = self.events_loop.get_available_monitors();
-        AvailableMonitorsIter{ data: data.into_iter() }
-    }
-
-    /// Returns the primary monitor of the system.
-    #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId { inner: self.events_loop.get_primary_monitor() }
-    }
-
     /// Fetches all the events that are pending, calls the callback function for each of them,
     /// and returns.
     #[inline]
-    pub fn poll_events<F>(&mut self, callback: F)
+    pub fn poll_events<F>(&self, callback: F)
         where F: FnMut(Event)
     {
         self.events_loop.poll_events(callback)
     }
 
-    /// Calls `callback` every time an event is received. If no event is available, sleeps the
-    /// current thread and waits for an event. If the callback returns `ControlFlow::Break` then
-    /// `run_forever` will immediately return.
+    /// Runs forever until `interrupt()` is called. Whenever an event happens, calls the callback.
     #[inline]
-    pub fn run_forever<F>(&mut self, callback: F)
-        where F: FnMut(Event) -> ControlFlow
+    pub fn run_forever<F>(&self, callback: F)
+        where F: FnMut(Event)
     {
         self.events_loop.run_forever(callback)
     }
 
-    /// Creates an `EventsLoopProxy` that can be used to wake up the `EventsLoop` from another
-    /// thread.
-    pub fn create_proxy(&self) -> EventsLoopProxy {
-        EventsLoopProxy {
-            events_loop_proxy: self.events_loop.create_proxy(),
-        }
-    }
-}
-
-/// Used to wake up the `EventsLoop` from another thread.
-#[derive(Clone)]
-pub struct EventsLoopProxy {
-    events_loop_proxy: platform::EventsLoopProxy,
-}
-
-impl EventsLoopProxy {
-    /// Wake up the `EventsLoop` from which this proxy was created.
-    ///
-    /// This causes the `EventsLoop` to emit an `Awakened` event.
-    ///
-    /// Returns an `Err` if the associated `EventsLoop` no longer exists.
-    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
-        self.events_loop_proxy.wakeup()
-    }
-}
-
-/// The error that is returned when an `EventsLoopProxy` attempts to wake up an `EventsLoop` that
-/// no longer exists.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct EventsLoopClosed;
-
-impl std::fmt::Display for EventsLoopClosed {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{}", std::error::Error::description(self))
-    }
-}
-
-impl std::error::Error for EventsLoopClosed {
-    fn description(&self) -> &str {
-        "Tried to wake up a closed `EventsLoop`"
+    /// If we called `run_forever()`, stops the process of waiting for events.
+    // TODO: what if we're waiting from multiple threads?
+    #[inline]
+    pub fn interrupt(&self) {
+        self.events_loop.interrupt()
     }
 }
 
@@ -289,7 +219,7 @@ pub struct WindowBuilder {
 }
 
 /// Error that can happen while creating a window or a headless renderer.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub enum CreationError {
     OsError(String),
     /// TODO: remove this error
@@ -317,7 +247,6 @@ impl std::error::Error for CreationError {
     }
 }
 
-/// Describes the appearance of the mouse cursor.
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum MouseCursor {
     /// The platform-dependent default cursor.
@@ -374,7 +303,7 @@ pub enum MouseCursor {
     RowResize,
 }
 
-/// Describes how winit handles the cursor.
+/// Describes how glutin handles the cursor.
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum CursorState {
     /// Normal cursor behavior.
@@ -410,21 +339,16 @@ pub struct WindowAttributes {
     /// The default is `None`.
     pub max_dimensions: Option<(u32, u32)>,
 
-    /// Whether the window should be set as fullscreen upon creation.
+    /// If `Some`, the window will be in fullscreen mode with the given monitor.
     ///
     /// The default is `None`.
-    pub fullscreen: Option<MonitorId>,
+    pub monitor: Option<platform::MonitorId>,
 
     /// The title of the window in the title bar.
     ///
-    /// The default is `"winit window"`.
+    /// The default is `"glutin window"`.
     pub title: String,
 
-    /// Whether the window should be maximized upon creation.
-    ///
-    /// The default is `false`.
-    pub maximized: bool,
-
     /// Whether the window should be immediately visible upon creation.
     ///
     /// The default is `true`.
@@ -441,18 +365,8 @@ 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)
+    /// [iOS only] Enable multitouch, see [UIView#multipleTouchEnabled]
+    /// (https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIView_Class/#//apple_ref/occ/instp/UIView/multipleTouchEnabled)
     pub multitouch: bool,
 }
 
@@ -463,15 +377,28 @@ impl Default for WindowAttributes {
             dimensions: None,
             min_dimensions: None,
             max_dimensions: None,
-            title: "winit window".to_owned(),
-            maximized: false,
-            fullscreen: None,
+            monitor: None,
+            title: "glutin window".to_owned(),
             visible: true,
             transparent: false,
             decorations: true,
-            always_on_top: false,
-            window_icon: None,
             multitouch: false,
         }
     }
 }
+
+mod native_monitor {
+    /// Native platform identifier for a monitor. Different platforms use fundamentally different types
+    /// to represent a monitor ID.
+    #[derive(Clone, PartialEq, Eq)]
+    pub enum NativeMonitorId {
+        /// Cocoa and X11 use a numeric identifier to represent a monitor.
+        Numeric(u32),
+
+        /// Win32 uses a Unicode string to represent a monitor.
+        Name(String),
+
+        /// Other platforms (Android) don't support monitor identification.
+        Unavailable
+    }
+}

src/os/android.rs

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

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

src/os/unix.rs

@@ -1,137 +1,91 @@
 #![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 libc;
 use Window;
-use platform::EventsLoop as LinuxEventsLoop;
-use platform::Window as LinuxWindow;
+use platform::Window2 as LinuxWindow;
+use platform::{UnixBackend, UNIX_BACKEND};
 use WindowBuilder;
 use platform::x11::XConnection;
 use platform::x11::ffi::XVisualInfo;
 
-// TODO: stupid hack so that glutin can do its work
-#[doc(hidden)]
+use wayland_client::protocol::wl_display::WlDisplay;
+use wayland_client::protocol::wl_surface::WlSurface;
+
 pub use platform::x11;
 
-pub use platform::XNotSupported;
-pub use platform::x11::util::WindowType as XWindowType;
-
-/// Additional methods on `EventsLoop` that are specific to Linux.
-pub trait EventsLoopExt {
-    /// Builds a new `EventsLoop` that is forced to use X11.
-    fn new_x11() -> Result<Self, XNotSupported>
-        where Self: Sized;
-
-    /// Builds a new `EventsLoop` that is forced to use Wayland.
-    fn new_wayland() -> Self
-        where Self: Sized;
-
-    /// True if the `EventsLoop` uses Wayland.
-    fn is_wayland(&self) -> bool;
-
-    /// True if the `EventsLoop` uses X11.
-    fn is_x11(&self) -> bool;
-
-    #[doc(hidden)]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
-}
-
-impl EventsLoopExt for EventsLoop {
-    #[inline]
-    fn new_x11() -> Result<Self, XNotSupported> {
-        LinuxEventsLoop::new_x11().map(|ev|
-            EventsLoop {
-                events_loop: ev,
-                _marker: ::std::marker::PhantomData,
-            }
-        )
-    }
-
-    #[inline]
-    fn new_wayland() -> Self {
-        EventsLoop {
-            events_loop: match LinuxEventsLoop::new_wayland() {
-                Ok(e) => e,
-                Err(_) => panic!()      // TODO: propagate
-            },
-            _marker: ::std::marker::PhantomData,
-        }
-    }
-
-    #[inline]
-    fn is_wayland(&self) -> bool {
-        self.events_loop.is_wayland()
-    }
-
-    #[inline]
-    fn is_x11(&self) -> bool {
-        !self.events_loop.is_wayland()
-    }
-
-    #[inline]
-    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
-        self.events_loop.x_connection().cloned()
+// TODO: do not expose XConnection
+pub fn get_x11_xconnection() -> Option<Arc<XConnection>> {
+    match *UNIX_BACKEND {
+        UnixBackend::X(ref connec) => Some(connec.clone()),
+        _ => None,
     }
 }
 
 /// Additional methods on `Window` that are specific to Unix.
 pub trait WindowExt {
-    /// Returns the ID of the `Window` xlib object that is used by this window.
+    /// Returns a pointer to the `Window` object of xlib that is used by this window.
     ///
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
-    fn get_xlib_window(&self) -> Option<raw::c_ulong>;
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_xlib_window(&self) -> Option<*mut libc::c_void>;
 
     /// Returns a pointer to the `Display` object of xlib that is used by this window.
     ///
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_xlib_display(&self) -> Option<*mut raw::c_void>;
+    fn get_xlib_display(&self) -> Option<*mut libc::c_void>;
 
-    fn get_xlib_screen_id(&self) -> Option<raw::c_int>;
+    fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void>;
 
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
-
-    /// Set window urgency hint (`XUrgencyHint`). Only relevant on X.
-    fn set_urgent(&self, is_urgent: bool);
-
+    
     /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
     ///
     /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_xcb_connection(&self) -> Option<*mut raw::c_void>;
+    fn get_xcb_connection(&self) -> Option<*mut libc::c_void>;
 
     /// Returns a pointer to the `wl_surface` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_wayland_surface(&self) -> Option<*mut raw::c_void>;
+    fn get_wayland_surface(&self) -> Option<*mut libc::c_void>;
 
     /// Returns a pointer to the `wl_display` object of wayland that is used by this window.
     ///
     /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
     ///
     /// The pointer will become invalid when the glutin `Window` is destroyed.
-    fn get_wayland_display(&self) -> Option<*mut raw::c_void>;
+    fn get_wayland_display(&self) -> Option<*mut libc::c_void>;
 
-    /// Check if the window is ready for drawing
+    /// Returns a reference to the `WlSurface` object of wayland that is used by this window.
     ///
-    /// It is a remnant of a previous implementation detail for the
-    /// wayland backend, and is no longer relevant.
+    /// For use with the `wayland-client` crate.
     ///
-    /// Always return true.
-    #[deprecated]
-    fn is_ready(&self) -> bool;
+    /// **This function is not part of winit's public API.**
+    ///
+    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
+    fn get_wayland_client_surface(&self) -> Option<&WlSurface>;
+
+    /// Returns a pointer to the `WlDisplay` object of wayland that is used by this window.
+    ///
+    /// For use with the `wayland-client` crate.
+    ///
+    /// **This function is not part of winit's public API.**
+    ///
+    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
+    fn get_wayland_client_display(&self) -> Option<&WlDisplay>;
 }
 
 impl WindowExt for Window {
     #[inline]
-    fn get_xlib_window(&self) -> Option<raw::c_ulong> {
+    fn get_xlib_window(&self) -> Option<*mut libc::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
             _ => None
@@ -139,22 +93,20 @@ impl WindowExt for Window {
     }
 
     #[inline]
-    fn get_xlib_display(&self) -> Option<*mut raw::c_void> {
+    fn get_xlib_display(&self) -> Option<*mut libc::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
             _ => None
         }
     }
 
-    #[inline]
-    fn get_xlib_screen_id(&self) -> Option<raw::c_int> {
+    fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
             _ => None
         }
     }
 
-    #[inline]
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
@@ -162,8 +114,7 @@ impl WindowExt for Window {
         }
     }
 
-    #[inline]
-    fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
+    fn get_xcb_connection(&self) -> Option<*mut libc::c_void> {
         match self.window {
             LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
             _ => None
@@ -171,49 +122,39 @@ impl WindowExt for Window {
     }
 
     #[inline]
-    fn set_urgent(&self, is_urgent: bool) {
-        if let LinuxWindow::X(ref w) = self.window {
-            w.set_urgent(is_urgent);
-        }
+    fn get_wayland_surface(&self) -> Option<*mut libc::c_void> {
+        use wayland_client::Proxy;
+        self.get_wayland_client_surface().map(|p| p.ptr() as *mut _)
+    }
+
+
+    #[inline]
+    fn get_wayland_display(&self) -> Option<*mut libc::c_void> {
+        use wayland_client::Proxy;
+        self.get_wayland_client_display().map(|p| p.ptr() as *mut _)
     }
 
     #[inline]
-    fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
+    fn get_wayland_client_surface(&self) -> Option<&WlSurface> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_surface().c_ptr() as *mut _),
+            LinuxWindow::Wayland(ref w) => Some(w.get_surface()),
             _ => None
         }
     }
 
     #[inline]
-    fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
+    fn get_wayland_client_display(&self) -> Option<&WlDisplay> {
         match self.window {
-            LinuxWindow::Wayland(ref w) => Some(w.get_display().c_ptr() as *mut _),
+            LinuxWindow::Wayland(ref w) => Some(w.get_display()),
             _ => None
         }
     }
-
-    #[inline]
-    fn is_ready(&self) -> bool {
-        true
-    }
 }
 
 /// Additional methods on `WindowBuilder` that are specific to Unix.
 pub trait WindowBuilderExt {
     fn with_x11_visual<T>(self, visual_infos: *const T) -> WindowBuilder;
     fn with_x11_screen(self, screen_id: i32) -> WindowBuilder;
-
-    /// Build window with `WM_CLASS` hint; defaults to the name of the binary. Only relevant on X11.
-    fn with_class(self, class: String, instance: String) -> WindowBuilder;
-    /// Build window with override-redirect flag; defaults to false. Only relevant on X11.
-    fn with_override_redirect(self, override_redirect: bool) -> WindowBuilder;
-    /// Build window with `_NET_WM_WINDOW_TYPE` hint; defaults to `Normal`. Only relevant on X11.
-    fn with_x11_window_type(self, x11_window_type: XWindowType) -> WindowBuilder;
-    /// Build window with resize increment hint. Only implemented on X11.
-    fn with_resize_increments(self, width_inc: u32, height_inc: u32) -> WindowBuilder;
-    /// Build window with base size hint. Only implemented on X11.
-    fn with_base_size(self, base_width: u32, base_height: u32) -> WindowBuilder;
 }
 
 impl WindowBuilderExt for WindowBuilder {
@@ -230,47 +171,4 @@ 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, width_inc: u32, height_inc: u32) -> WindowBuilder {
-        self.platform_specific.resize_increments = Some((width_inc, height_inc));
-        self
-    }
-
-    #[inline]
-    fn with_base_size(mut self, base_width: u32, base_height: u32) -> WindowBuilder {
-        self.platform_specific.base_size = Some((base_width, base_height));
-        self
-    }
-}
-
-/// Additional methods on `MonitorId` that are specific to Linux.
-pub trait MonitorIdExt {
-    /// Returns the inner identifier of the monitor.
-    fn native_id(&self) -> u32;
-}
-
-impl MonitorIdExt for MonitorId {
-    #[inline]
-    fn native_id(&self) -> u32 {
-        self.inner.get_native_identifier()
-    }
 }

src/os/windows.rs

@@ -1,90 +1,37 @@
 #![cfg(target_os = "windows")]
 
-use std::os::raw::c_void;
-
 use libc;
-use winapi::shared::windef::HWND;
-
-use {DeviceId, Icon, MonitorId, Window, WindowBuilder};
+use Window;
+use WindowBuilder;
+use winapi;
 
 /// Additional methods on `Window` that are specific to Windows.
 pub trait WindowExt {
-    /// Returns the native handle that is used by this window.
+    /// Returns a pointer to the `Window` object of xlib that is used by this window.
     ///
-    /// The pointer will become invalid when the native window was destroyed.
+    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
     fn get_hwnd(&self) -> *mut libc::c_void;
-
-    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
-    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
 }
 
 impl WindowExt for Window {
     #[inline]
     fn get_hwnd(&self) -> *mut libc::c_void {
-        self.window.hwnd() as *mut _
-    }
-
-    #[inline]
-    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>) {
-        self.window.set_taskbar_icon(taskbar_icon)
+        self.window.platform_window()
     }
 }
 
 /// 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;
+    fn with_parent_window(self, parent: winapi::HWND) -> WindowBuilder;
 }
 
 impl WindowBuilderExt for WindowBuilder {
+    /// Sets a parent to the window to be created
     #[inline]
-    fn with_parent_window(mut self, parent: HWND) -> WindowBuilder {
+    fn with_parent_window(mut self, parent: winapi::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
-    }
-}
-
-/// Additional methods on `MonitorId` that are specific to Windows.
-pub trait MonitorIdExt {
-    /// Returns the name of the monitor adapter specific to the Win32 API.
-    fn native_id(&self) -> String;
-
-    /// Returns the handle of the monitor - `HMONITOR`.
-    fn hmonitor(&self) -> *mut c_void;
-}
-
-impl MonitorIdExt for MonitorId {
-    #[inline]
-    fn native_id(&self) -> String {
-        self.inner.get_native_identifier()
-    }
-
-    #[inline]
-    fn hmonitor(&self) -> *mut c_void {
-        self.inner.get_hmonitor() as *mut _
-    }
-}
-
-/// Additional methods on `DeviceId` that are specific to Windows.
-pub trait DeviceIdExt {
-    /// Returns an identifier that persistently refers to this specific device.
-    ///
-    /// Will return `None` if the device is no longer available.
-    fn get_persistent_identifier(&self) -> Option<String>;
-}
-
-impl DeviceIdExt for DeviceId {
-    #[inline]
-    fn get_persistent_identifier(&self) -> Option<String> {
-        self.0.get_persistent_identifier()
-    }
 }

src/platform/android/mod.rs

@@ -3,195 +3,58 @@
 extern crate android_glue;
 
 use libc;
+use std::ffi::{CString};
 use std::sync::mpsc::{Receiver, channel};
 use std::os::raw::c_void;
-use {CreationError, Event, WindowEvent, MouseCursor};
+use {CreationError, WindowEvent as Event, MouseCursor};
 use CreationError::OsError;
-use WindowId as RootWindowId;
+use events::ElementState::{Pressed, Released};
 use events::{Touch, TouchPhase};
-use window::MonitorId as RootMonitorId;
 
 use std::collections::VecDeque;
-use std::cell::RefCell;
 
 use CursorState;
 use WindowAttributes;
+use native_monitor::NativeMonitorId;
 
-pub struct EventsLoop {
-    event_rx: Receiver<android_glue::Event>,
-    suspend_callback: RefCell<Option<Box<Fn(bool) -> ()>>>
-}
-
-#[derive(Clone)]
-pub struct EventsLoopProxy;
-
-impl EventsLoop {
-    pub fn new() -> EventsLoop {
-        let (tx, rx) = channel();
-        android_glue::add_sender(tx);
-        EventsLoop {
-            event_rx: rx,
-            suspend_callback: RefCell::new(None),
-        }
-    }
-
-    #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut rb = VecDeque::new();
-        rb.push_back(MonitorId);
-        rb
-    }
-
-    #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
-    }
-
-
-    pub fn poll_events<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event)
-    {
-        while let Ok(event) = self.event_rx.try_recv() {
-
-            let e = match event{
-                android_glue::Event::EventMotion(motion) => {
-                    Some(Event::WindowEvent {
-                        window_id: RootWindowId(WindowId),
-                        event: WindowEvent::Touch(Touch {
-                            phase: match motion.action {
-                                android_glue::MotionAction::Down => TouchPhase::Started,
-                                android_glue::MotionAction::Move => TouchPhase::Moved,
-                                android_glue::MotionAction::Up => TouchPhase::Ended,
-                                android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
-                            },
-                            location: (motion.x as f64, motion.y as f64),
-                            id: motion.pointer_id as u64,
-                            device_id: DEVICE_ID,
-                        }),
-                    })
-                },
-                android_glue::Event::InitWindow => {
-                    // The activity went to foreground.
-                    if let Some(cb) = self.suspend_callback.borrow().as_ref() {
-                        (*cb)(false);
-                    }
-                    Some(Event::Suspended(false))
-                },
-                android_glue::Event::TermWindow => {
-                    // The activity went to background.
-                    if let Some(cb) = self.suspend_callback.borrow().as_ref() {
-                        (*cb)(true);
-                    }
-                    Some(Event::Suspended(true))
-                },
-                android_glue::Event::WindowResized |
-                android_glue::Event::ConfigChanged => {
-                    // Activity Orientation changed or resized.
-                    let native_window = unsafe { android_glue::get_native_window() };
-                    if native_window.is_null() {
-                        None
-                    } else {
-                        let w = unsafe { ffi::ANativeWindow_getWidth(native_window as *const _) } as u32;
-                        let h = unsafe { ffi::ANativeWindow_getHeight(native_window as *const _) } as u32;
-                        Some(Event::WindowEvent {
-                            window_id: RootWindowId(WindowId),
-                            event: WindowEvent::Resized(w, h),
-                        })
-                    }
-                },
-                android_glue::Event::WindowRedrawNeeded => {
-                    // The activity needs to be redrawn.
-                    Some(Event::WindowEvent {
-                        window_id: RootWindowId(WindowId),
-                        event: WindowEvent::Refresh,
-                    })
-                }
-                android_glue::Event::Wake => {
-                    Some(Event::Awakened)
-                }
-                _ => {
-                    None
-                }
-            };
-
-            if let Some(event) = e {
-                callback(event);
-            }
-        };
-    }
-
-    pub fn set_suspend_callback(&self, cb: Option<Box<Fn(bool) -> ()>>) {
-        *self.suspend_callback.borrow_mut() = cb;
-    }
-
-    pub fn run_forever<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event) -> ::ControlFlow,
-    {
-        // Yeah that's a very bad implementation.
-        loop {
-            let mut control_flow = ::ControlFlow::Continue;
-            self.poll_events(|e| {
-                if let ::ControlFlow::Break = callback(e) {
-                    control_flow = ::ControlFlow::Break;
-                }
-            });
-            if let ::ControlFlow::Break = control_flow {
-                break;
-            }
-            ::std::thread::sleep(::std::time::Duration::from_millis(5));
-        }
-    }
-
-    pub fn create_proxy(&self) -> EventsLoopProxy {
-        EventsLoopProxy
-    }
-}
-
-impl EventsLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
-        android_glue::wake_event_loop();
-        Ok(())
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct WindowId;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId;
+gen_api_transition!();
 
 pub struct Window {
     native_window: *const c_void,
+    event_rx: Receiver<android_glue::Event>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct MonitorId;
 
 mod ffi;
 
+#[inline]
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    let mut rb = VecDeque::new();
+    rb.push_back(MonitorId);
+    rb
+}
+
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    MonitorId
+}
+
 impl MonitorId {
     #[inline]
     pub fn get_name(&self) -> Option<String> {
         Some("Primary".to_string())
     }
 
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Unavailable
+    }
+
     #[inline]
     pub fn get_dimensions(&self) -> (u32, u32) {
-        unsafe {
-            let window = android_glue::get_native_window();
-            (ffi::ANativeWindow_getWidth(window) as u32, ffi::ANativeWindow_getHeight(window) as u32)
-        }
-    }
-
-    #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        // Android assumes single screen
-        (0, 0)
-    }
-
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        1.0
+        unimplemented!()
     }
 }
 
@@ -200,11 +63,78 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
+pub struct PollEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for PollEventsIterator<'a> {
+    type Item = Event;
+
+    fn next(&mut self) -> Option<Event> {
+        match self.window.event_rx.try_recv() {
+            Ok(android_glue::Event::EventMotion(motion)) => {
+                Some(Event::Touch(Touch {
+                    phase: match motion.action {
+                        android_glue::MotionAction::Down => TouchPhase::Started,
+                        android_glue::MotionAction::Move => TouchPhase::Moved,
+                        android_glue::MotionAction::Up => TouchPhase::Ended,
+                        android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
+                    },
+                    location: (motion.x as f64, motion.y as f64),
+                    id: motion.pointer_id as u64,
+                }))
+            },
+            Ok(android_glue::Event::InitWindow) => {
+                // The activity went to foreground.
+                Some(Event::Suspended(false))
+            },
+            Ok(android_glue::Event::TermWindow) => {
+                // The activity went to background.
+                Some(Event::Suspended(true))
+            },
+            Ok(android_glue::Event::WindowResized) |
+            Ok(android_glue::Event::ConfigChanged) => {
+                // Activity Orientation changed or resized.
+                self.window.get_inner_size().map(|s| Event::Resized(s.0, s.1))
+            },
+            Ok(android_glue::Event::WindowRedrawNeeded) => {
+                // The activity needs to be redrawn.
+                Some(Event::Refresh)
+            }
+            _ => {
+                None
+            }
+        }
+    }
+}
+
+pub struct WaitEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for WaitEventsIterator<'a> {
+    type Item = Event;
+
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        loop {
+            // calling poll_events()
+            if let Some(ev) = self.window.poll_events().next() {
+                return Some(ev);
+            }
+
+            // TODO: Implement a proper way of sleeping on the event queue
+            // timer::sleep(Duration::milliseconds(16));
+        }
+    }
+}
+
 impl Window {
-    pub fn new(_: &EventsLoop, win_attribs: WindowAttributes,
-               _: PlatformSpecificWindowBuilderAttributes)
+    pub fn new(win_attribs: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes)
                -> Result<Window, CreationError>
     {
+        use std::{mem, ptr};
+
         // not implemented
         assert!(win_attribs.min_dimensions.is_none());
         assert!(win_attribs.max_dimensions.is_none());
@@ -214,10 +144,13 @@ impl Window {
             return Err(OsError(format!("Android's native window is null")));
         }
 
+        let (tx, rx) = channel();
+        android_glue::add_sender(tx);
         android_glue::set_multitouch(win_attribs.multitouch);
 
         Ok(Window {
             native_window: native_window as *const _,
+            event_rx: rx,
         })
     }
 
@@ -226,6 +159,11 @@ impl Window {
         self.native_window
     }
 
+    #[inline]
+    pub fn is_closed(&self) -> bool {
+        false
+    }
+
     #[inline]
     pub fn set_title(&self, _: &str) {
     }
@@ -243,29 +181,20 @@ impl Window {
         None
     }
 
-    #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        None
-    }
-
     #[inline]
     pub fn set_position(&self, _x: i32, _y: i32) {
     }
 
-    #[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 get_inner_size(&self) -> Option<(u32, u32)> {
-        if self.native_window.is_null() {
+        let native_window = unsafe { android_glue::get_native_window() };
+
+        if 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
+                unsafe { ffi::ANativeWindow_getWidth(native_window as *const _) } as u32,
+                unsafe { ffi::ANativeWindow_getHeight(native_window as *const _) } as u32
             ))
         }
     }
@@ -279,6 +208,25 @@ impl Window {
     pub fn set_inner_size(&self, _x: u32, _y: u32) {
     }
 
+    #[inline]
+    pub fn create_window_proxy(&self) -> WindowProxy {
+        WindowProxy
+    }
+
+    #[inline]
+    pub fn poll_events(&self) -> PollEventsIterator {
+        PollEventsIterator {
+            window: self
+        }
+    }
+
+    #[inline]
+    pub fn wait_events(&self) -> WaitEventsIterator {
+        WaitEventsIterator {
+            window: self
+        }
+    }
+
     #[inline]
     pub fn platform_display(&self) -> *mut libc::c_void {
         unimplemented!();
@@ -289,12 +237,16 @@ impl Window {
         unimplemented!()
     }
 
+    #[inline]
+    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
+    }
+
     #[inline]
     pub fn set_cursor(&self, _: MouseCursor) {
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, _state: CursorState) -> Result<(), String> {
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
         Ok(())
     }
 
@@ -304,52 +256,20 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
-        Ok(())
-    }
-
-    #[inline]
-    pub fn set_maximized(&self, _maximized: bool) {
-        // Android has single screen maximized apps so nothing to do
-    }
-
-    #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
-        // Android has single screen maximized apps so nothing to do
-    }
-
-    #[inline]
-    pub fn set_decorations(&self, _decorations: bool) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_always_on_top(&self, _always_on_top: bool) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_window_icon(&self, _icon: Option<::Icon>) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_ime_spot(&self, _x: i32, _y: i32) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId{inner: MonitorId}
-    }
-
-    pub fn id(&self) -> WindowId {
-        WindowId
+    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+        unimplemented!();
     }
 }
 
 unsafe impl Send for Window {}
 unsafe impl Sync for Window {}
 
-// Constant device ID, to be removed when this backend is updated to report real device IDs.
-const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);
+#[derive(Clone)]
+pub struct WindowProxy;
+
+impl WindowProxy {
+    #[inline]
+    pub fn wakeup_event_loop(&self) {
+        android_glue::wake_event_loop();
+    }
+}

src/platform/emscripten/ffi.rs

@@ -1,316 +0,0 @@
-#![allow(dead_code)]
-#![allow(non_snake_case)]
-#![allow(non_camel_case_types)]
-
-use std::os::raw::{c_int, c_char, c_void, c_ulong, c_double, c_long, c_ushort};
-#[cfg(test)]
-use std::mem;
-
-pub type EM_BOOL = c_int;
-pub type EM_UTF8 = c_char;
-pub type EMSCRIPTEN_RESULT = c_int;
-
-pub const EM_TRUE: EM_BOOL = 1;
-pub const EM_FALSE: EM_BOOL = 0;
-
-// values for EMSCRIPTEN_RESULT
-pub const EMSCRIPTEN_RESULT_SUCCESS: c_int = 0;
-pub const EMSCRIPTEN_RESULT_DEFERRED: c_int = 1;
-pub const EMSCRIPTEN_RESULT_NOT_SUPPORTED: c_int = -1;
-pub const EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED: c_int = -2;
-pub const EMSCRIPTEN_RESULT_INVALID_TARGET: c_int = -3;
-pub const EMSCRIPTEN_RESULT_UNKNOWN_TARGET: c_int = -4;
-pub const EMSCRIPTEN_RESULT_INVALID_PARAM: c_int = -5;
-pub const EMSCRIPTEN_RESULT_FAILED: c_int = -6;
-pub const EMSCRIPTEN_RESULT_NO_DATA: c_int = -7;
-
-// values for EMSCRIPTEN EVENT
-pub const EMSCRIPTEN_EVENT_KEYPRESS: c_int = 1;
-pub const EMSCRIPTEN_EVENT_KEYDOWN: c_int = 2;
-pub const EMSCRIPTEN_EVENT_KEYUP: c_int = 3;
-pub const EMSCRIPTEN_EVENT_CLICK: c_int = 4;
-pub const EMSCRIPTEN_EVENT_MOUSEDOWN: c_int = 5;
-pub const EMSCRIPTEN_EVENT_MOUSEUP: c_int = 6;
-pub const EMSCRIPTEN_EVENT_DBLCLICK: c_int = 7;
-pub const EMSCRIPTEN_EVENT_MOUSEMOVE: c_int = 8;
-pub const EMSCRIPTEN_EVENT_WHEEL: c_int = 9;
-pub const EMSCRIPTEN_EVENT_RESIZE: c_int = 10;
-pub const EMSCRIPTEN_EVENT_SCROLL: c_int = 11;
-pub const EMSCRIPTEN_EVENT_BLUR: c_int = 12;
-pub const EMSCRIPTEN_EVENT_FOCUS: c_int = 13;
-pub const EMSCRIPTEN_EVENT_FOCUSIN: c_int = 14;
-pub const EMSCRIPTEN_EVENT_FOCUSOUT: c_int = 15;
-pub const EMSCRIPTEN_EVENT_DEVICEORIENTATION: c_int = 16;
-pub const EMSCRIPTEN_EVENT_DEVICEMOTION: c_int = 17;
-pub const EMSCRIPTEN_EVENT_ORIENTATIONCHANGE: c_int = 18;
-pub const EMSCRIPTEN_EVENT_FULLSCREENCHANGE: c_int = 19;
-pub const EMSCRIPTEN_EVENT_POINTERLOCKCHANGE: c_int = 20;
-pub const EMSCRIPTEN_EVENT_VISIBILITYCHANGE: c_int = 21;
-pub const EMSCRIPTEN_EVENT_TOUCHSTART: c_int = 22;
-pub const EMSCRIPTEN_EVENT_TOUCHEND: c_int = 23;
-pub const EMSCRIPTEN_EVENT_TOUCHMOVE: c_int = 24;
-pub const EMSCRIPTEN_EVENT_TOUCHCANCEL: c_int = 25;
-pub const EMSCRIPTEN_EVENT_GAMEPADCONNECTED: c_int = 26;
-pub const EMSCRIPTEN_EVENT_GAMEPADDISCONNECTED: c_int = 27;
-pub const EMSCRIPTEN_EVENT_BEFOREUNLOAD: c_int = 28;
-pub const EMSCRIPTEN_EVENT_BATTERYCHARGINGCHANGE: c_int = 29;
-pub const EMSCRIPTEN_EVENT_BATTERYLEVELCHANGE: c_int = 30;
-pub const EMSCRIPTEN_EVENT_WEBGLCONTEXTLOST: c_int = 31;
-pub const EMSCRIPTEN_EVENT_WEBGLCONTEXTRESTORED: c_int = 32;
-pub const EMSCRIPTEN_EVENT_MOUSEENTER: c_int = 33;
-pub const EMSCRIPTEN_EVENT_MOUSELEAVE: c_int = 34;
-pub const EMSCRIPTEN_EVENT_MOUSEOVER: c_int = 35;
-pub const EMSCRIPTEN_EVENT_MOUSEOUT: c_int = 36;
-pub const EMSCRIPTEN_EVENT_CANVASRESIZED: c_int = 37;
-pub const EMSCRIPTEN_EVENT_POINTERLOCKERROR: c_int = 38;
-
-pub const EM_HTML5_SHORT_STRING_LEN_BYTES: usize = 32;
-
-pub const DOM_KEY_LOCATION_STANDARD: c_ulong = 0x00;
-pub const DOM_KEY_LOCATION_LEFT: c_ulong = 0x01;
-pub const DOM_KEY_LOCATION_RIGHT: c_ulong = 0x02;
-pub const DOM_KEY_LOCATION_NUMPAD: c_ulong = 0x03;
-
-pub type em_callback_func = Option<unsafe extern "C" fn()>;
-
-pub type em_key_callback_func = Option<unsafe extern "C" fn(
-    eventType: c_int,
-    keyEvent: *const EmscriptenKeyboardEvent,
-    userData: *mut c_void) -> EM_BOOL>;
-
-pub type em_mouse_callback_func = Option<unsafe extern "C" fn(
-    eventType: c_int,
-    mouseEvent: *const EmscriptenMouseEvent,
-    userData: *mut c_void) -> EM_BOOL>;
-
-pub type em_pointerlockchange_callback_func = Option<unsafe extern "C" fn(
-    eventType: c_int,
-    pointerlockChangeEvent: *const EmscriptenPointerlockChangeEvent,
-    userData: *mut c_void) -> EM_BOOL>;
-
-pub type em_fullscreenchange_callback_func = Option<unsafe extern "C" fn(
-    eventType: c_int,
-    fullscreenChangeEvent: *const EmscriptenFullscreenChangeEvent,
-    userData: *mut c_void) -> EM_BOOL>;
-
-pub type em_touch_callback_func = Option<unsafe extern "C" fn(
-    eventType: c_int,
-    touchEvent: *const EmscriptenTouchEvent,
-    userData: *mut c_void) -> EM_BOOL>;
-
-#[repr(C)]
-pub struct EmscriptenFullscreenChangeEvent {
-    pub isFullscreen: c_int,
-    pub fullscreenEnabled: c_int,
-    pub nodeName: [c_char; 128usize],
-    pub id: [c_char; 128usize],
-    pub elementWidth: c_int,
-    pub elementHeight: c_int,
-    pub screenWidth: c_int,
-    pub screenHeight: c_int,
-}
-#[test]
-fn bindgen_test_layout_EmscriptenFullscreenChangeEvent() {
-    assert_eq!(mem::size_of::<EmscriptenFullscreenChangeEvent>(), 280usize);
-    assert_eq!(mem::align_of::<EmscriptenFullscreenChangeEvent>(), 4usize);
-}
-
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct EmscriptenKeyboardEvent {
-    pub key: [c_char; 32usize],
-    pub code: [c_char; 32usize],
-    pub location: c_ulong,
-    pub ctrlKey: c_int,
-    pub shiftKey: c_int,
-    pub altKey: c_int,
-    pub metaKey: c_int,
-    pub repeat: c_int,
-    pub locale: [c_char; 32usize],
-    pub charValue: [c_char; 32usize],
-    pub charCode: c_ulong,
-    pub keyCode: c_ulong,
-    pub which: c_ulong,
-}
-#[test]
-fn bindgen_test_layout_EmscriptenKeyboardEvent() {
-    assert_eq!(mem::size_of::<EmscriptenKeyboardEvent>(), 184usize);
-    assert_eq!(mem::align_of::<EmscriptenKeyboardEvent>(), 8usize);
-}
-impl Clone for EmscriptenKeyboardEvent {
-    fn clone(&self) -> Self { *self }
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct EmscriptenMouseEvent {
-    pub timestamp: f64,
-    pub screenX: c_long,
-    pub screenY: c_long,
-    pub clientX: c_long,
-    pub clientY: c_long,
-    pub ctrlKey: c_int,
-    pub shiftKey: c_int,
-    pub altKey: c_int,
-    pub metaKey: c_int,
-    pub button: c_ushort,
-    pub buttons: c_ushort,
-    pub movementX: c_long,
-    pub movementY: c_long,
-    pub targetX: c_long,
-    pub targetY: c_long,
-    pub canvasX: c_long,
-    pub canvasY: c_long,
-    pub padding: c_long,
-}
-#[test]
-fn bindgen_test_layout_EmscriptenMouseEvent() {
-    assert_eq!(mem::size_of::<EmscriptenMouseEvent>(), 120usize);
-    assert_eq!(mem::align_of::<EmscriptenMouseEvent>(), 8usize);
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct EmscriptenTouchPoint {
-    pub identifier: c_long,
-    pub screenX: c_long,
-    pub screenY: c_long,
-    pub clientX: c_long,
-    pub clientY: c_long,
-    pub pageX: c_long,
-    pub pageY: c_long,
-    pub isChanged: c_int,
-    pub onTarget: c_int,
-    pub targetX: c_long,
-    pub targetY: c_long,
-    pub canvasX: c_long,
-    pub canvasY: c_long,
-}
-#[test]
-fn bindgen_test_layout_EmscriptenTouchPoint() {
-    assert_eq!(mem::size_of::<EmscriptenTouchPoint>(), 96usize);
-    assert_eq!(mem::align_of::<EmscriptenTouchPoint>(), 8usize);
-}
-
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct EmscriptenTouchEvent {
-    pub numTouches: c_int,
-    pub ctrlKey: c_int,
-    pub shiftKey: c_int,
-    pub altKey: c_int,
-    pub metaKey: c_int,
-    pub touches: [EmscriptenTouchPoint; 32usize],
-}
-#[test]
-fn bindgen_test_layout_EmscriptenTouchEvent() {
-    assert_eq!(mem::size_of::<EmscriptenTouchEvent>(), 3096usize);
-    assert_eq!(mem::align_of::<EmscriptenTouchEvent>(), 8usize);
-}
-
-#[repr(C)]
-pub struct EmscriptenPointerlockChangeEvent {
-    pub isActive: c_int,
-    pub nodeName: [c_char; 128usize],
-    pub id: [c_char; 128usize],
-}
-#[test]
-fn bindgen_test_layout_EmscriptenPointerlockChangeEvent() {
-    assert_eq!(mem::size_of::<EmscriptenPointerlockChangeEvent>(), 260usize);
-    assert_eq!(mem::align_of::<EmscriptenPointerlockChangeEvent>(), 4usize);
-}
-
-extern "C" {
-    pub fn emscripten_set_canvas_size(
-        width: c_int, height: c_int)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_get_canvas_size(
-        width: *mut c_int, height: *mut c_int,
-        is_fullscreen: *mut c_int)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_element_css_size(
-        target: *const c_char, width: c_double,
-        height: c_double) -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_get_element_css_size(
-        target: *const c_char, width: *mut c_double,
-        height: *mut c_double) -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_request_pointerlock(
-        target: *const c_char, deferUntilInEventHandler: EM_BOOL)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_exit_pointerlock() -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_request_fullscreen(
-        target: *const c_char, deferUntilInEventHandler: EM_BOOL)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_exit_fullscreen() -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_keydown_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: EM_BOOL, callback: em_key_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_keyup_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: EM_BOOL, callback: em_key_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_mousemove_callback(
-        target: *const c_char, user_data: *mut c_void,
-        use_capture: EM_BOOL, callback: em_mouse_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_mousedown_callback(
-        target: *const c_char, user_data: *mut c_void,
-        use_capture: EM_BOOL, callback: em_mouse_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_mouseup_callback(
-        target: *const c_char, user_data: *mut c_void,
-        use_capture: EM_BOOL, callback: em_mouse_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_hide_mouse();
-
-    pub fn emscripten_get_device_pixel_ratio() -> f64;
-
-    pub fn emscripten_set_pointerlockchange_callback(
-        target: *const c_char, userData: *mut c_void, useCapture: EM_BOOL,
-        callback: em_pointerlockchange_callback_func) -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_fullscreenchange_callback(
-        target: *const c_char, userData: *mut c_void, useCapture: EM_BOOL,
-        callback: em_fullscreenchange_callback_func) -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_asm_const(code: *const c_char);
-
-    pub fn emscripten_set_main_loop(
-        func: em_callback_func, fps: c_int, simulate_infinite_loop: EM_BOOL);
-
-    pub fn emscripten_cancel_main_loop();
-
-    pub fn emscripten_set_touchstart_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: c_int, callback: em_touch_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_touchend_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: c_int, callback: em_touch_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_touchmove_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: c_int, callback: em_touch_callback_func)
-        -> EMSCRIPTEN_RESULT;
-
-    pub fn emscripten_set_touchcancel_callback(
-        target: *const c_char, userData: *mut c_void,
-        useCapture: c_int, callback: em_touch_callback_func)
-        -> EMSCRIPTEN_RESULT;
-}

src/platform/ios/ffi.rs

@@ -66,7 +66,7 @@ extern {
     pub fn longjmp(env: *mut libc::c_void, val: libc::c_int);
 }
 
-pub trait NSString: Sized {
+pub trait NSString {
     unsafe fn alloc(_: Self) -> id {
         msg_send![class("NSString"), alloc]
     }

src/platform/ios/mod.rs

@@ -51,12 +51,12 @@
 //!  - applicationWillResignActive is Focused(false)
 //!  - applicationDidEnterBackground is Suspended(true)
 //!  - applicationWillEnterForeground is Suspended(false)
-//!  - applicationWillTerminate is Destroyed
+//!  - applicationWillTerminate is Closed
 //!
-//! Keep in mind that after Destroyed event is received every attempt to draw with
+//! Keep in mind that after Closed event is received every attempt to draw with
 //! opengl will result in segfault.
 //!
-//! Also note that app will not receive Destroyed event if suspended, it will be SIGKILL'ed
+//! Also note that app will not receive Closed event if suspended, it will be SIGKILL'ed
 
 #![cfg(target_os = "ios")]
 
@@ -70,12 +70,10 @@ use libc::c_int;
 use objc::runtime::{Class, Object, Sel, BOOL, YES };
 use objc::declare::{ ClassDecl };
 
+use native_monitor::NativeMonitorId;
 use { CreationError, CursorState, MouseCursor, WindowAttributes };
-use WindowId as RootEventId;
-use WindowEvent;
-use Event;
+use WindowEvent as Event;
 use events::{ Touch, TouchPhase };
-use window::MonitorId as RootMonitorId;
 
 mod ffi;
 use self::ffi::{
@@ -96,7 +94,7 @@ use self::ffi::{
 
 static mut jmpbuf: [c_int;27] = [0;27];
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct MonitorId;
 
 pub struct Window {
@@ -106,6 +104,14 @@ pub struct Window {
 #[derive(Clone)]
 pub struct WindowProxy;
 
+pub struct PollEventsIterator<'a> {
+    window: &'a Window,
+}
+
+pub struct WaitEventsIterator<'a> {
+    window: &'a Window,
+}
+
 #[derive(Debug)]
 struct DelegateState {
     events_queue: VecDeque<Event>,
@@ -129,38 +135,44 @@ impl DelegateState {
     }
 }
 
+#[inline]
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    let mut rb = VecDeque::new();
+    rb.push_back(MonitorId);
+    rb
+}
+
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    MonitorId
+}
+
 impl MonitorId {
     #[inline]
     pub fn get_name(&self) -> Option<String> {
         Some("Primary".to_string())
     }
 
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Unavailable
+    }
+
     #[inline]
     pub fn get_dimensions(&self) -> (u32, u32) {
         unimplemented!()
     }
-
-    #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        // iOS assumes single screen
-        (0, 0)
-    }
-
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        1.0
-    }
 }
 
-pub struct EventsLoop {
-    delegate_state: *mut DelegateState
-}
+gen_api_transition!();
 
-#[derive(Clone)]
-pub struct EventsLoopProxy;
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes;
 
-impl EventsLoop {
-    pub fn new() -> EventsLoop {
+impl Window {
+
+    pub fn new(_: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes) -> Result<Window, CreationError>
+    {
         unsafe {
             if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
                 let app: id = msg_send![Class::get("UIApplication").unwrap(), sharedApplication];
@@ -168,109 +180,187 @@ impl EventsLoop {
                 let state: *mut c_void = *(&*delegate).get_ivar("glutinState");
                 let state = state as *mut DelegateState;
 
-                let events_loop = EventsLoop {
+                let window = Window {
                     delegate_state: state
                 };
 
-                return events_loop;
+                return Ok(window)
             }
         }
 
-        create_delegate_class();
-        create_view_class();
-        start_app();
+        Window::create_delegate_class();
+        Window::create_view_class();
+        Window::start_app();
 
-        panic!("Couldn't create UIApplication")
+        Err(CreationError::OsError(format!("Couldn't create UIApplication")))
     }
 
-    #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
-        let mut rb = VecDeque::new();
-        rb.push_back(MonitorId);
-        rb
-    }
+    fn create_delegate_class() {
+        extern fn did_finish_launching(this: &mut Object, _: Sel, _: id, _: id) -> BOOL {
+            unsafe {
+                let main_screen: id = msg_send![Class::get("UIScreen").unwrap(), mainScreen];
+                let bounds: CGRect = msg_send![main_screen, bounds];
+                let scale: CGFloat = msg_send![main_screen, nativeScale];
 
-    #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        MonitorId
-    }
+                let window: id = msg_send![Class::get("UIWindow").unwrap(), alloc];
+                let window: id = msg_send![window, initWithFrame:bounds.clone()];
+
+                let size = (bounds.size.width as u32, bounds.size.height as u32);
+
+                let view_controller: id = msg_send![Class::get("MainViewController").unwrap(), alloc];
+                let view_controller: id = msg_send![view_controller, init];
+
+                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_ptr: *mut DelegateState = mem::transmute(state);
+                this.set_ivar("glutinState", state_ptr as *mut c_void);
+
+
+                let _: () = msg_send![this, performSelector:sel!(postLaunch:) withObject:nil afterDelay:0.0];
+            }
+            YES
+        }
+
+        extern fn post_launch(_: &Object, _: Sel, _: id) {
+            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 *(state as *mut DelegateState);
+                state.events_queue.push_back(Event::Focused(true));
+            }
+        }
+
+        extern fn will_resign_active(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("glutinState");
+                let state = &mut *(state as *mut DelegateState);
+                state.events_queue.push_back(Event::Focused(false));
+            }
+        }
+
+        extern fn will_enter_foreground(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("glutinState");
+                let state = &mut *(state as *mut DelegateState);
+                state.events_queue.push_back(Event::Suspended(false));
+            }
+        }
+
+        extern fn did_enter_background(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("glutinState");
+                let state = &mut *(state as *mut DelegateState);
+                state.events_queue.push_back(Event::Suspended(true));
+            }
+        }
+
+        extern fn will_terminate(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("glutinState");
+                let state = &mut *(state as *mut DelegateState);
+                // push event to the front to garantee that we'll process it
+                // immidiatly after jump
+                state.events_queue.push_front(Event::Closed);
+                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 *(state as *mut DelegateState);
+
+                let touches_enum: id = msg_send![touches, objectEnumerator];
+
+                loop {
+                    let touch: id = msg_send![touches_enum, nextObject];
+                    if touch == nil {
+                        break
+                    }
+                    let location: CGPoint = msg_send![touch, locationInView:nil];
+                    let touch_id = touch as u64;
+                    let phase: i32 = msg_send![touch, phase];
+
+                    state.events_queue.push_back(Event::Touch(Touch {
+                        id: touch_id,
+                        location: (location.x as f64, location.y as f64),
+                        phase: match phase {
+                            0 => TouchPhase::Started,
+                            1 => TouchPhase::Moved,
+                            // 2 is UITouchPhaseStationary and is not expected here
+                            3 => TouchPhase::Ended,
+                            4 => TouchPhase::Cancelled,
+                            _ => panic!("unexpected touch phase: {:?}", phase)
+                        }
+                    }));
+                }
+            }
+        }
+
+        let ui_responder = Class::get("UIResponder").unwrap();
+        let mut decl = ClassDecl::new("AppDelegate", ui_responder).unwrap();
 
-    pub fn poll_events<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event)
-    {
         unsafe {
-            let state = &mut *self.delegate_state;
+            decl.add_method(sel!(application:didFinishLaunchingWithOptions:),
+                            did_finish_launching as extern fn(&mut Object, Sel, id, id) -> BOOL);
 
-            if let Some(event) = state.events_queue.pop_front() {
-                callback(event);
-                return;
-            }
+            decl.add_method(sel!(applicationDidBecomeActive:),
+                            did_become_active as extern fn(&Object, Sel, id));
 
-            // jump hack, so we won't quit on willTerminate event before processing it
-            if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
-                if let Some(event) = state.events_queue.pop_front() {
-                    callback(event);
-                    return;
-                }
-            }
+            decl.add_method(sel!(applicationWillResignActive:),
+                            will_resign_active as extern fn(&Object, Sel, id));
 
-            // run runloop
-            let seconds: CFTimeInterval = 0.000002;
-            while CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, 1) == kCFRunLoopRunHandledSource {}
+            decl.add_method(sel!(applicationWillEnterForeground:),
+                            will_enter_foreground as extern fn(&Object, Sel, id));
 
-            if let Some(event) = state.events_queue.pop_front() {
-                callback(event)
-            }
+            decl.add_method(sel!(applicationDidEnterBackground:),
+                            did_enter_background as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(applicationWillTerminate:),
+                            will_terminate as extern fn(&Object, Sel, id));
+
+
+            decl.add_method(sel!(touchesBegan:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesMoved:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesEnded:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesCancelled:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+
+            decl.add_method(sel!(postLaunch:),
+                            post_launch as extern fn(&Object, Sel, id));
+
+            decl.add_ivar::<*mut c_void>("glutinState");
+
+            decl.register();
         }
     }
 
-    pub fn run_forever<F>(&mut self, mut callback: F)
-        where F: FnMut(::Event) -> ::ControlFlow,
-    {
-        // Yeah that's a very bad implementation.
-        loop {
-            let mut control_flow = ::ControlFlow::Continue;
-            self.poll_events(|e| {
-                if let ::ControlFlow::Break = callback(e) {
-                    control_flow = ::ControlFlow::Break;
-                }
-            });
-            if let ::ControlFlow::Break = control_flow {
-                break;
-            }
-            ::std::thread::sleep(::std::time::Duration::from_millis(5));
+    fn create_view_class() {
+        let ui_view_controller = Class::get("UIViewController").unwrap();
+        let decl = ClassDecl::new("MainViewController", ui_view_controller).unwrap();
+
+        decl.register();
+    }
+
+    #[inline]
+    fn start_app() {
+        unsafe {
+            UIApplicationMain(0, ptr::null(), nil, NSString::alloc(nil).init_str("AppDelegate"));
         }
     }
 
-    pub fn create_proxy(&self) -> EventsLoopProxy {
-        EventsLoopProxy
-    }
-}
-
-impl EventsLoopProxy {
-    pub fn wakeup(&self) -> Result<(), ::EventsLoopClosed> {
-        unimplemented!()
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct WindowId;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId;
-
-#[derive(Clone, Default)]
-pub struct PlatformSpecificWindowBuilderAttributes;
-
-impl Window {
-    pub fn new(ev: &EventsLoop, _: WindowAttributes, _: PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window, CreationError>
-    {
-        Ok(Window {
-            delegate_state: ev.delegate_state,
-        })
-    }
-
     #[inline]
     pub fn set_title(&self, _: &str) {
     }
@@ -288,11 +378,6 @@ impl Window {
         None
     }
 
-    #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        None
-    }
-
     #[inline]
     pub fn set_position(&self, _x: i32, _y: i32) {
     }
@@ -312,10 +397,18 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_min_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
+    pub fn poll_events(&self) -> PollEventsIterator {
+        PollEventsIterator {
+            window: self
+        }
+    }
 
     #[inline]
-    pub fn set_max_dimensions(&self, _dimensions: Option<(u32, u32)>) { }
+    pub fn wait_events(&self) -> WaitEventsIterator {
+        WaitEventsIterator {
+            window: self
+        }
+    }
 
     #[inline]
     pub fn platform_display(&self) -> *mut libc::c_void {
@@ -355,225 +448,50 @@ impl Window {
         WindowProxy
     }
 
-    #[inline]
-    pub fn set_maximized(&self, _maximized: bool) {
-        // iOS has single screen maximized apps so nothing to do
-    }
+}
 
+impl WindowProxy {
     #[inline]
-    pub fn set_fullscreen(&self, _monitor: Option<RootMonitorId>) {
-        // iOS has single screen maximized apps so nothing to do
-    }
-
-    #[inline]
-    pub fn set_decorations(&self, _decorations: bool) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_always_on_top(&self, _always_on_top: bool) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_window_icon(&self, _icon: Option<::Icon>) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn set_ime_spot(&self, _x: i32, _y: i32) {
-        // N/A
-    }
-
-    #[inline]
-    pub fn get_current_monitor(&self) -> RootMonitorId {
-        RootMonitorId{inner: MonitorId}
-    }
-
-    #[inline]
-    pub fn id(&self) -> WindowId {
-        WindowId
+    pub fn wakeup_event_loop(&self) {
+        unimplemented!()
     }
 }
 
-fn create_delegate_class() {
-    extern fn did_finish_launching(this: &mut Object, _: Sel, _: id, _: id) -> BOOL {
-        unsafe {
-            let main_screen: id = msg_send![Class::get("UIScreen").unwrap(), 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, initWithFrame:bounds.clone()];
+impl<'a> Iterator for WaitEventsIterator<'a> {
+    type Item = Event;
 
-            let size = (bounds.size.width as u32, bounds.size.height as u32);
-
-            let view_controller: id = msg_send![Class::get("MainViewController").unwrap(), alloc];
-            let view_controller: id = msg_send![view_controller, init];
-
-            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_ptr: *mut DelegateState = mem::transmute(state);
-            this.set_ivar("glutinState", state_ptr as *mut c_void);
-
-
-            let _: () = msg_send![this, performSelector:sel!(postLaunch:) withObject:nil afterDelay:0.0];
-        }
-        YES
-    }
-
-    extern fn post_launch(_: &Object, _: Sel, _: id) {
-        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 *(state as *mut DelegateState);
-            state.events_queue.push_back(Event::WindowEvent {
-                window_id: RootEventId(WindowId),
-                event: WindowEvent::Focused(true),
-            });
-        }
-    }
-
-    extern fn will_resign_active(this: &Object, _: Sel, _: id) {
-        unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
-            let state = &mut *(state as *mut DelegateState);
-            state.events_queue.push_back(Event::WindowEvent {
-                window_id: RootEventId(WindowId),
-                event: WindowEvent::Focused(false),
-            });
-        }
-    }
-
-    extern fn will_enter_foreground(this: &Object, _: Sel, _: id) {
-        unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
-            let state = &mut *(state as *mut DelegateState);
-            state.events_queue.push_back(Event::Suspended(false));
-        }
-    }
-
-    extern fn did_enter_background(this: &Object, _: Sel, _: id) {
-        unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
-            let state = &mut *(state as *mut DelegateState);
-            state.events_queue.push_back(Event::Suspended(true));
-        }
-    }
-
-    extern fn will_terminate(this: &Object, _: Sel, _: id) {
-        unsafe {
-            let state: *mut c_void = *this.get_ivar("glutinState");
-            let state = &mut *(state as *mut DelegateState);
-            // push event to the front to garantee that we'll process it
-            // immidiatly after jump
-            state.events_queue.push_front(Event::WindowEvent {
-                window_id: RootEventId(WindowId),
-                event: WindowEvent::Destroyed,
-            });
-            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 *(state as *mut DelegateState);
-
-            let touches_enum: id = msg_send![touches, objectEnumerator];
-
-            loop {
-                let touch: id = msg_send![touches_enum, nextObject];
-                if touch == nil {
-                    break
-                }
-                let location: CGPoint = msg_send![touch, locationInView:nil];
-                let touch_id = touch as u64;
-                let phase: i32 = msg_send![touch, phase];
-
-                state.events_queue.push_back(Event::WindowEvent {
-                    window_id: RootEventId(WindowId),
-                    event: WindowEvent::Touch(Touch {
-                        device_id: DEVICE_ID,
-                        id: touch_id,
-                        location: (location.x as f64, location.y as f64),
-                        phase: match phase {
-                            0 => TouchPhase::Started,
-                            1 => TouchPhase::Moved,
-                            // 2 is UITouchPhaseStationary and is not expected here
-                            3 => TouchPhase::Ended,
-                            4 => TouchPhase::Cancelled,
-                            _ => panic!("unexpected touch phase: {:?}", phase)
-                        }
-                    }),
-                });
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        loop {
+            if let Some(ev) = self.window.poll_events().next() {
+                return Some(ev);
             }
         }
     }
+}
 
-    let ui_responder = Class::get("UIResponder").unwrap();
-    let mut decl = ClassDecl::new("AppDelegate", ui_responder).unwrap();
+impl<'a> Iterator for PollEventsIterator<'a> {
+    type Item = Event;
 
-    unsafe {
-        decl.add_method(sel!(application:didFinishLaunchingWithOptions:),
-                        did_finish_launching as extern fn(&mut Object, Sel, id, id) -> BOOL);
+    fn next(&mut self) -> Option<Event> {
+        unsafe {
+            let state = &mut *self.window.delegate_state;
 
-        decl.add_method(sel!(applicationDidBecomeActive:),
-                        did_become_active as extern fn(&Object, Sel, id));
+            if let Some(event) = state.events_queue.pop_front() {
+                return Some(event)
+            }
 
-        decl.add_method(sel!(applicationWillResignActive:),
-                        will_resign_active as extern fn(&Object, Sel, id));
+            // jump hack, so we won't quit on willTerminate event before processing it
+            if setjmp(mem::transmute(&mut jmpbuf)) != 0 {
+                return state.events_queue.pop_front()
+            }
 
-        decl.add_method(sel!(applicationWillEnterForeground:),
-                        will_enter_foreground as extern fn(&Object, Sel, id));
+            // run runloop
+            let seconds: CFTimeInterval = 0.000002;
+            while CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, 1) == kCFRunLoopRunHandledSource {}
 
-        decl.add_method(sel!(applicationDidEnterBackground:),
-                        did_enter_background as extern fn(&Object, Sel, id));
-
-        decl.add_method(sel!(applicationWillTerminate:),
-                        will_terminate as extern fn(&Object, Sel, id));
-
-
-        decl.add_method(sel!(touchesBegan:withEvent:),
-                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
-
-        decl.add_method(sel!(touchesMoved:withEvent:),
-                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
-
-        decl.add_method(sel!(touchesEnded:withEvent:),
-                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
-
-        decl.add_method(sel!(touchesCancelled:withEvent:),
-                        handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
-
-
-        decl.add_method(sel!(postLaunch:),
-                        post_launch as extern fn(&Object, Sel, id));
-
-        decl.add_ivar::<*mut c_void>("glutinState");
-
-        decl.register();
+            state.events_queue.pop_front()
+        }
     }
 }
-
-fn create_view_class() {
-    let ui_view_controller = Class::get("UIViewController").unwrap();
-    let decl = ClassDecl::new("MainViewController", ui_view_controller).unwrap();
-
-    decl.register();
-}
-
-#[inline]
-fn start_app() {
-    unsafe {
-        UIApplicationMain(0, ptr::null(), nil, NSString::alloc(nil).init_str("AppDelegate"));
-    }
-}
-
-// Constant device ID, to be removed when this backend is updated to report real device IDs.
-const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);

src/platform/linux/mod.rs

@@ -1,81 +1,95 @@
 #![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 sctk::reexports::client::ConnectError;
-
-// `std::os::raw::c_void` and `libc::c_void` are NOT interchangeable!
+use CreationError;
+use CursorState;
+use MouseCursor;
 use libc;
 
-use {
-    CreationError,
-    CursorState,
-    EventsLoopClosed,
-    Icon,
-    MouseCursor,
-    ControlFlow,
-    WindowAttributes,
-};
-use window::MonitorId as RootMonitorId;
-use self::x11::{XConnection, XError};
+use self::x11::XConnection;
+use self::x11::XError;
+use self::x11::XNotSupported;
 use self::x11::ffi::XVisualInfo;
-pub use self::x11::XNotSupported;
 
 mod dlopen;
 pub mod wayland;
 pub mod x11;
 
-/// Environment variable specifying which backend should be used on unix platform.
-///
-/// Legal values are x11 and wayland. If this variable is set only the named backend
-/// will be tried by winit. If it is not set, winit will try to connect to a wayland connection,
-/// and if it fails will fallback on x11.
-///
-/// If this variable is set with any other value, winit will panic.
-const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
-
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes {
     pub visual_infos: Option<XVisualInfo>,
     pub screen_id: Option<i32>,
-    pub resize_increments: Option<(u32, u32)>,
-    pub base_size: Option<(u32, u32)>,
-    pub class: Option<(String, String)>,
-    pub override_redirect: bool,
-    pub x11_window_type: x11::util::WindowType,
 }
 
+pub enum UnixBackend {
+    X(Arc<XConnection>),
+    Wayland(Arc<wayland::WaylandContext>),
+    Error(XNotSupported),
+} 
+
 lazy_static!(
-    pub static ref X11_BACKEND: Result<Arc<XConnection>, XNotSupported> = {
-        XConnection::new(Some(x_error_callback)).map(Arc::new)
+    pub static ref UNIX_BACKEND: UnixBackend = {
+        if let Some(ctxt) = wayland::WaylandContext::init() {
+            UnixBackend::Wayland(Arc::new(ctxt))
+        } else {
+            match XConnection::new(Some(x_error_callback)) {
+                Ok(x) => UnixBackend::X(Arc::new(x)),
+                Err(e) => UnixBackend::Error(e),
+            }
+        }
     };
 );
 
-pub enum Window {
-    X(x11::Window),
+
+pub enum Window2 {
+    #[doc(hidden)]
+    X(x11::Window2),
+    #[doc(hidden)]
     Wayland(wayland::Window)
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum WindowId {
+    #[doc(hidden)]
     X(x11::WindowId),
+    #[doc(hidden)]
     Wayland(wayland::WindowId)
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum DeviceId {
-    X(x11::DeviceId),
-    Wayland(wayland::DeviceId)
+#[derive(Clone)]
+pub enum MonitorId {
+    #[doc(hidden)]
+    X(x11::MonitorId),
+    #[doc(hidden)]
+    Wayland(wayland::MonitorId),
+    #[doc(hidden)]
+    None,
 }
 
-#[derive(Debug, Clone)]
-pub enum MonitorId {
-    X(x11::MonitorId),
-    Wayland(wayland::MonitorId),
+#[inline]
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    match *UNIX_BACKEND {
+        UnixBackend::Wayland(ref ctxt) => wayland::get_available_monitors(ctxt)
+                                .into_iter()
+                                .map(MonitorId::Wayland)
+                                .collect(),
+        UnixBackend::X(ref connec) => x11::get_available_monitors(connec)
+                                    .into_iter()
+                                    .map(MonitorId::X)
+                                    .collect(),
+        UnixBackend::Error(_) => { let mut d = VecDeque::new(); d.push_back(MonitorId::None); d},
+    }
+}
+
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    match *UNIX_BACKEND {
+        UnixBackend::Wayland(ref ctxt) => MonitorId::Wayland(wayland::get_primary_monitor(ctxt)),
+        UnixBackend::X(ref connec) => MonitorId::X(x11::get_primary_monitor(connec)),
+        UnixBackend::Error(_) => MonitorId::None,
+    }
 }
 
 impl MonitorId {
@@ -84,14 +98,16 @@ impl MonitorId {
         match self {
             &MonitorId::X(ref m) => m.get_name(),
             &MonitorId::Wayland(ref m) => m.get_name(),
+            &MonitorId::None => None,
         }
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> u32 {
+    pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
         match self {
             &MonitorId::X(ref m) => m.get_native_identifier(),
             &MonitorId::Wayland(ref m) => m.get_native_identifier(),
+            &MonitorId::None => unimplemented!()        // FIXME:
         }
     }
 
@@ -100,257 +116,170 @@ impl MonitorId {
         match self {
             &MonitorId::X(ref m) => m.get_dimensions(),
             &MonitorId::Wayland(ref m) => m.get_dimensions(),
-        }
-    }
-
-    #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        match self {
-            &MonitorId::X(ref m) => m.get_position(),
-            &MonitorId::Wayland(ref m) => m.get_position(),
-        }
-    }
-
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        match self {
-            &MonitorId::X(ref m) => m.get_hidpi_factor(),
-            &MonitorId::Wayland(ref m) => m.get_hidpi_factor(),
+            &MonitorId::None => (800, 600),     // FIXME:
         }
     }
 }
 
-impl Window {
+impl Window2 {
     #[inline]
-    pub fn new(
-        events_loop: &EventsLoop,
-        attribs: WindowAttributes,
-        pl_attribs: PlatformSpecificWindowBuilderAttributes,
-    ) -> Result<Self, CreationError> {
-        match *events_loop {
-            EventsLoop::Wayland(ref events_loop) => {
-                wayland::Window::new(events_loop, attribs).map(Window::Wayland)
+    pub fn new(events_loop: ::std::sync::Arc<EventsLoop>, window: &::WindowAttributes,
+               pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window2, CreationError>
+    {
+        match *UNIX_BACKEND {
+            UnixBackend::Wayland(ref ctxt) => {
+                if let EventsLoop::Wayland(ref evlp) = *events_loop {
+                    wayland::Window::new(evlp, ctxt.clone(), window).map(Window2::Wayland)
+                } else {
+                    // It is not possible to instanciate an EventsLoop not matching its backend
+                    unreachable!()
+                }
             },
-            EventsLoop::X(ref events_loop) => {
-                x11::Window::new(events_loop, attribs, pl_attribs).map(Window::X)
+
+            UnixBackend::X(ref connec) => {
+                x11::Window2::new(events_loop, connec, window, pl_attribs).map(Window2::X)
             },
+            UnixBackend::Error(_) => {
+                // If the Backend is Error(), it is not possible to instanciate an EventsLoop at all,
+                // thus this function cannot be called!
+                unreachable!()
+            }
         }
     }
 
     #[inline]
     pub fn id(&self) -> WindowId {
         match self {
-            &Window::X(ref w) => WindowId::X(w.id()),
-            &Window::Wayland(ref w) => WindowId::Wayland(w.id())
+            &Window2::X(ref w) => WindowId::X(w.id()),
+            &Window2::Wayland(ref w) => WindowId::Wayland(w.id())
         }
     }
 
     #[inline]
     pub fn set_title(&self, title: &str) {
         match self {
-            &Window::X(ref w) => w.set_title(title),
-            &Window::Wayland(ref w) => w.set_title(title)
+            &Window2::X(ref w) => w.set_title(title),
+            &Window2::Wayland(ref w) => w.set_title(title)
         }
     }
 
     #[inline]
     pub fn show(&self) {
         match self {
-            &Window::X(ref w) => w.show(),
-            &Window::Wayland(ref w) => w.show()
+            &Window2::X(ref w) => w.show(),
+            &Window2::Wayland(ref w) => w.show()
         }
     }
 
     #[inline]
     pub fn hide(&self) {
         match self {
-            &Window::X(ref w) => w.hide(),
-            &Window::Wayland(ref w) => w.hide()
+            &Window2::X(ref w) => w.hide(),
+            &Window2::Wayland(ref w) => w.hide()
         }
     }
 
     #[inline]
     pub fn get_position(&self) -> Option<(i32, i32)> {
         match self {
-            &Window::X(ref w) => w.get_position(),
-            &Window::Wayland(ref w) => w.get_position()
-        }
-    }
-
-    #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        match self {
-            &Window::X(ref m) => m.get_inner_position(),
-            &Window::Wayland(ref m) => m.get_inner_position(),
+            &Window2::X(ref w) => w.get_position(),
+            &Window2::Wayland(ref w) => w.get_position()
         }
     }
 
     #[inline]
     pub fn set_position(&self, x: i32, y: i32) {
         match self {
-            &Window::X(ref w) => w.set_position(x, y),
-            &Window::Wayland(ref w) => w.set_position(x, y)
+            &Window2::X(ref w) => w.set_position(x, y),
+            &Window2::Wayland(ref w) => w.set_position(x, y)
         }
     }
 
     #[inline]
     pub fn get_inner_size(&self) -> Option<(u32, u32)> {
         match self {
-            &Window::X(ref w) => w.get_inner_size(),
-            &Window::Wayland(ref w) => w.get_inner_size()
+            &Window2::X(ref w) => w.get_inner_size(),
+            &Window2::Wayland(ref w) => w.get_inner_size()
         }
     }
 
     #[inline]
     pub fn get_outer_size(&self) -> Option<(u32, u32)> {
         match self {
-            &Window::X(ref w) => w.get_outer_size(),
-            &Window::Wayland(ref w) => w.get_outer_size()
+            &Window2::X(ref w) => w.get_outer_size(),
+            &Window2::Wayland(ref w) => w.get_outer_size()
         }
     }
 
     #[inline]
     pub fn set_inner_size(&self, x: u32, y: u32) {
         match self {
-            &Window::X(ref w) => w.set_inner_size(x, y),
-            &Window::Wayland(ref w) => w.set_inner_size(x, y)
-        }
-    }
-
-    #[inline]
-    pub fn set_min_dimensions(&self, dimensions: Option<(u32, u32)>) {
-        match self {
-            &Window::X(ref w) => w.set_min_dimensions(dimensions),
-            &Window::Wayland(ref w) => w.set_min_dimensions(dimensions)
-        }
-    }
-
-    #[inline]
-    pub fn set_max_dimensions(&self, dimensions: Option<(u32, u32)>) {
-        match self {
-            &Window::X(ref w) => w.set_max_dimensions(dimensions),
-            &Window::Wayland(ref w) => w.set_max_dimensions(dimensions)
+            &Window2::X(ref w) => w.set_inner_size(x, y),
+            &Window2::Wayland(ref w) => w.set_inner_size(x, y)
         }
     }
 
     #[inline]
     pub fn set_cursor(&self, cursor: MouseCursor) {
         match self {
-            &Window::X(ref w) => w.set_cursor(cursor),
-            &Window::Wayland(ref w) => w.set_cursor(cursor)
+            &Window2::X(ref w) => w.set_cursor(cursor),
+            &Window2::Wayland(ref w) => w.set_cursor(cursor)
         }
     }
 
     #[inline]
     pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
         match self {
-            &Window::X(ref w) => w.set_cursor_state(state),
-            &Window::Wayland(ref w) => w.set_cursor_state(state)
+            &Window2::X(ref w) => w.set_cursor_state(state),
+            &Window2::Wayland(ref w) => w.set_cursor_state(state)
         }
     }
 
     #[inline]
     pub fn hidpi_factor(&self) -> f32 {
        match self {
-            &Window::X(ref w) => w.hidpi_factor(),
-            &Window::Wayland(ref w) => w.hidpi_factor()
+            &Window2::X(ref w) => w.hidpi_factor(),
+            &Window2::Wayland(ref w) => w.hidpi_factor()
         }
     }
 
     #[inline]
     pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
         match self {
-            &Window::X(ref w) => w.set_cursor_position(x, y),
-            &Window::Wayland(ref w) => w.set_cursor_position(x, y)
+            &Window2::X(ref w) => w.set_cursor_position(x, y),
+            &Window2::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().c_ptr() as *mut _
+            &Window2::X(ref w) => w.platform_display(),
+            &Window2::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().c_ptr() as *mut _
-        }
-    }
-
-    #[inline]
-    pub fn set_maximized(&self, maximized: bool) {
-        match self {
-            &Window::X(ref w) => w.set_maximized(maximized),
-            &Window::Wayland(ref w) => w.set_maximized(maximized),
-        }
-    }
-
-    #[inline]
-    pub fn set_fullscreen(&self, monitor: Option<RootMonitorId>) {
-        match self {
-            &Window::X(ref w) => w.set_fullscreen(monitor),
-            &Window::Wayland(ref w) => w.set_fullscreen(monitor)
-        }
-    }
-
-    #[inline]
-    pub fn set_decorations(&self, decorations: bool) {
-        match self {
-            &Window::X(ref w) => w.set_decorations(decorations),
-            &Window::Wayland(ref w) => w.set_decorations(decorations)
-        }
-    }
-
-    #[inline]
-    pub fn set_always_on_top(&self, always_on_top: bool) {
-        match self {
-            &Window::X(ref w) => w.set_always_on_top(always_on_top),
-            &Window::Wayland(_) => (),
-        }
-    }
-
-    #[inline]
-    pub fn set_window_icon(&self, window_icon: Option<Icon>) {
-        match self {
-            &Window::X(ref w) => w.set_window_icon(window_icon),
-            &Window::Wayland(_) => (),
-        }
-    }
-
-    #[inline]
-    pub fn set_ime_spot(&self, x: i32, y: i32) {
-        match self {
-            &Window::X(ref w) => w.send_xim_spot(x as i16, y as i16),
-            &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())},
+            &Window2::X(ref w) => w.platform_window(),
+            &Window2::Wayland(ref w) => w.get_surface().ptr() as *mut _
         }
     }
 }
 
-unsafe extern "C" fn x_error_callback(
-    display: *mut x11::ffi::Display,
-    event: *mut x11::ffi::XErrorEvent,
-) -> c_int {
-    if let Ok(ref xconn) = *X11_BACKEND {
-        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();
+unsafe extern "C" fn x_error_callback(dpy: *mut x11::ffi::Display, event: *mut x11::ffi::XErrorEvent)
+                                      -> libc::c_int
+{
+    use std::ffi::CStr;
+
+    if let UnixBackend::X(ref x) = *UNIX_BACKEND {
+        let mut buff: Vec<u8> = Vec::with_capacity(1024);
+        (x.xlib.XGetErrorText)(dpy, (*event).error_code as i32, buff.as_mut_ptr() as *mut libc::c_char, buff.capacity() as i32);
+        let description = CStr::from_ptr(buff.as_mut_ptr() as *const libc::c_char).to_string_lossy();
 
         let error = XError {
             description: description.into_owned(),
@@ -359,146 +288,58 @@ unsafe extern "C" fn x_error_callback(
             minor_code: (*event).minor_code,
         };
 
-        eprintln!("[winit X11 error] {:#?}", error);
-
-        *xconn.latest_error.lock() = Some(error);
+        *x.latest_error.lock().unwrap() = Some(error);
     }
-    // Fun fact: this return value is completely ignored.
+
     0
 }
 
 pub enum EventsLoop {
+    #[doc(hidden)]
     Wayland(wayland::EventsLoop),
+    #[doc(hidden)]
     X(x11::EventsLoop)
 }
 
-#[derive(Clone)]
-pub enum EventsLoopProxy {
-    X(x11::EventsLoopProxy),
-    Wayland(wayland::EventsLoopProxy),
-}
-
 impl EventsLoop {
     pub fn new() -> EventsLoop {
-        if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
-            match env_var.as_str() {
-                "x11" => {
-                    // TODO: propagate
-                    return EventsLoop::new_x11().expect("Failed to initialize X11 backend");
-                },
-                "wayland" => {
-                    return EventsLoop::new_wayland()
-                        .expect("Failed to initialize Wayland backend");
-                },
-                _ => panic!(
-                    "Unknown environment variable value for {}, try one of `x11`,`wayland`",
-                    BACKEND_PREFERENCE_ENV_VAR,
-                ),
+        match *UNIX_BACKEND {
+            UnixBackend::Wayland(ref ctxt) => {
+                EventsLoop::Wayland(wayland::EventsLoop::new(ctxt.clone()))
+            },
+
+            UnixBackend::X(_) => {
+                EventsLoop::X(x11::EventsLoop::new())
+            },
+
+            UnixBackend::Error(_) => {
+                panic!("Attempted to create an EventsLoop while no backend was available.")
             }
         }
-
-        let wayland_err = match EventsLoop::new_wayland() {
-            Ok(event_loop) => return event_loop,
-            Err(err) => err,
-        };
-
-        let x11_err = match EventsLoop::new_x11() {
-            Ok(event_loop) => return event_loop,
-            Err(err) => err,
-        };
-
-        let err_string = format!(
-r#"Failed to initialize any backend!
-    Wayland status: {:#?}
-    X11 status: {:#?}
-"#,
-            wayland_err,
-            x11_err,
-        );
-        panic!(err_string);
     }
 
-    pub fn new_wayland() -> Result<EventsLoop, ConnectError> {
-        wayland::EventsLoop::new()
-            .map(EventsLoop::Wayland)
-    }
-
-    pub fn new_x11() -> Result<EventsLoop, XNotSupported> {
-        match *X11_BACKEND {
-            Ok(ref x) => Ok(EventsLoop::X(x11::EventsLoop::new(x.clone()))),
-            Err(ref err) => Err(err.clone()),
-        }
-    }
-
-    #[inline]
-    pub fn get_available_monitors(&self) -> VecDeque<MonitorId> {
+    pub fn interrupt(&self) {
         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.interrupt(),
+            EventsLoop::X(ref evlp) => evlp.interrupt()
         }
     }
 
-    #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        match *self {
-            EventsLoop::Wayland(ref evlp) => MonitorId::Wayland(evlp.get_primary_monitor()),
-            EventsLoop::X(ref evlp) => MonitorId::X(x11::get_primary_monitor(evlp.x_connection())),
-        }
-    }
-
-    pub fn create_proxy(&self) -> EventsLoopProxy {
-        match *self {
-            EventsLoop::Wayland(ref evlp) => EventsLoopProxy::Wayland(evlp.create_proxy()),
-            EventsLoop::X(ref evlp) => EventsLoopProxy::X(evlp.create_proxy()),
-        }
-    }
-
-    pub fn poll_events<F>(&mut self, callback: F)
+    pub fn poll_events<F>(&self, callback: F)
         where F: FnMut(::Event)
     {
         match *self {
-            EventsLoop::Wayland(ref mut evlp) => evlp.poll_events(callback),
-            EventsLoop::X(ref mut evlp) => evlp.poll_events(callback)
+            EventsLoop::Wayland(ref evlp) => evlp.poll_events(callback),
+            EventsLoop::X(ref evlp) => evlp.poll_events(callback)
         }
     }
 
-    pub fn run_forever<F>(&mut self, callback: F)
-        where F: FnMut(::Event) -> ControlFlow
+    pub fn run_forever<F>(&self, callback: F)
+        where F: FnMut(::Event)
     {
         match *self {
-            EventsLoop::Wayland(ref mut evlp) => evlp.run_forever(callback),
-            EventsLoop::X(ref mut evlp) => evlp.run_forever(callback)
-        }
-    }
-
-    #[inline]
-    pub fn is_wayland(&self) -> bool {
-        match *self {
-            EventsLoop::Wayland(_) => true,
-            EventsLoop::X(_) => false,
-        }
-    }
-
-    #[inline]
-    pub fn x_connection(&self) -> Option<&Arc<XConnection>> {
-        match *self {
-            EventsLoop::Wayland(_) => None,
-            EventsLoop::X(ref ev) => Some(ev.x_connection()),
-        }
-    }
-}
-
-impl EventsLoopProxy {
-    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
-        match *self {
-            EventsLoopProxy::Wayland(ref proxy) => proxy.wakeup(),
-            EventsLoopProxy::X(ref proxy) => proxy.wakeup(),
+            EventsLoop::Wayland(ref evlp) => evlp.run_forever(callback),
+            EventsLoop::X(ref evlp) => evlp.run_forever(callback)
         }
     }
 }

src/platform/linux/wayland/context.rs

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

src/platform/linux/wayland/keyboard.rs

@@ -1,154 +1,87 @@
 use std::sync::{Arc, Mutex};
 
-use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
+use {VirtualKeyCode, ElementState, WindowEvent as Event};
 
-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;
+use events::ModifiersState;
 
-pub fn init_keyboard(
-    keyboard: NewProxy<wl_keyboard::WlKeyboard>,
+use super::{wayland_kbd, EventsLoopSink, WindowId};
+use wayland_client::EventQueueHandle;
+use wayland_client::protocol::wl_keyboard;
+
+pub struct KbdHandler {
     sink: Arc<Mutex<EventsLoopSink>>,
-) -> 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 = my_sink.lock().unwrap();
-                guard.send_event(
-                    WindowEvent::KeyboardInput {
-                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        input: KeyboardInput {
-                            state: state,
-                            scancode: rawkey,
-                            virtual_keycode: vkcode,
-                            modifiers: modifiers.into(),
-                        },
-                    },
-                    wid,
-                );
-                // send char event only on key press, not release
-                if let ElementState::Released = state {
-                    return;
-                }
-                if let Some(txt) = utf8 {
-                    for chr in txt.chars() {
-                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
+    pub target: Option<WindowId>
+}
+
+impl KbdHandler {
+    pub fn new(sink: Arc<Mutex<EventsLoopSink>>) -> KbdHandler {
+        KbdHandler { sink: sink, target: None }
+    }
+}
+
+impl wayland_kbd::Handler for KbdHandler {
+    fn key(&mut self,
+           _evqh: &mut EventQueueHandle,
+           _proxy: &wl_keyboard::WlKeyboard,
+           _serial: u32,
+           _time: u32,
+           mods: &wayland_kbd::ModifiersState,
+           rawkey: u32,
+           keysym: u32,
+           state: wl_keyboard::KeyState,
+           utf8: Option<String>)
+    {
+        if let Some(wid) = self.target {
+            let state = match state {
+                wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                wl_keyboard::KeyState::Released => ElementState::Released,
+            };
+            let vkcode = key_to_vkey(rawkey, keysym);
+            let mut guard = self.sink.lock().unwrap();
+            guard.send_event(
+                Event::KeyboardInput(
+                    state,
+                    rawkey as u8,
+                    vkcode,
+                    ModifiersState {
+                        shift: mods.shift,
+                        ctrl: mods.ctrl,
+                        alt: mods.alt,
+                        logo: mods.logo
                     }
+                ),
+                wid
+            );
+            // send char event only on key press, not release
+            if let ElementState::Released = state { return }
+            if let Some(txt) = utf8 {
+                for chr in txt.chars() {
+                    guard.send_event(Event::ReceivedCharacter(chr), wid);
                 }
             }
         }
-        KbEvent::RepeatInfo { .. } => { /* 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)
-
-            // { 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 sctk::keyboard::keysyms;
+    use super::wayland_kbd::keysyms;
     match keysym {
         // letters
         keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
@@ -178,15 +111,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),
@@ -280,7 +213,6 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         // => Some(VirtualKeyCode::Subtract),
         // => Some(VirtualKeyCode::Sysrq),
         keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
-        keysyms::XKB_KEY_ISO_Left_Tab => Some(VirtualKeyCode::Tab),
         // => Some(VirtualKeyCode::Underline),
         // => Some(VirtualKeyCode::Unlabeled),
         keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
@@ -294,21 +226,7 @@ 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,
-    }
-}
-
-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,
-        }
+        _ => None
     }
 }

src/platform/linux/wayland/mod.rs

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

src/platform/linux/wayland/pointer.rs

@@ -1,190 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use {ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent};
-use events::ModifiersState;
-
-use super::DeviceId;
-use super::event_loop::EventsLoopSink;
-use super::window::WindowStore;
-
-use sctk::reexports::client::{NewProxy, Proxy};
-use sctk::reexports::client::protocol::wl_pointer::{self, Event as PtrEvent, WlPointer};
-
-pub fn implement_pointer(
-    pointer: NewProxy<WlPointer>,
-    sink: Arc<Mutex<EventsLoopSink>>,
-    store: Arc<Mutex<WindowStore>>,
-) -> Proxy<WlPointer> {
-    let mut mouse_focus = None;
-    let mut axis_buffer = None;
-    let mut axis_discrete_buffer = None;
-    let mut axis_state = TouchPhase::Ended;
-
-    pointer.implement(move |evt, pointer: Proxy<_>| {
-        let mut sink = sink.lock().unwrap();
-        let store = store.lock().unwrap();
-        match evt {
-            PtrEvent::Enter {
-                surface,
-                surface_x,
-                surface_y,
-                ..
-            } => {
-                let wid = store.find_wid(&surface);
-                if let Some(wid) = wid {
-                    mouse_focus = Some(wid);
-                    sink.send_event(
-                        WindowEvent::CursorEntered {
-                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                        },
-                        wid,
-                    );
-                    sink.send_event(
-                        WindowEvent::CursorMoved {
-                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
-                            position: (surface_x, surface_y),
-                            // 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),
-                            // 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 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) = 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 f32, y as f32),
-                                phase: axis_state,
-                                // TODO: replace dummy value with actual modifier state
-                                modifiers: ModifiersState::default(),
-                            },
-                            wid,
-                        );
-                    }
-                }
-            }
-            PtrEvent::AxisSource { .. } => (),
-            PtrEvent::AxisStop { .. } => {
-                axis_state = TouchPhase::Ended;
-            }
-            PtrEvent::AxisDiscrete { axis, discrete } => {
-                let (mut x, mut y) = axis_discrete_buffer.unwrap_or((0, 0));
-                match axis {
-                    // wayland vertical sign convention is the inverse of winit
-                    wl_pointer::Axis::VerticalScroll => y -= discrete,
-                    wl_pointer::Axis::HorizontalScroll => x += discrete,
-                }
-                axis_discrete_buffer = Some((x, y));
-                axis_state = match axis_state {
-                    TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
-                    _ => TouchPhase::Started,
-                }
-            }
-        }
-    })
-}

src/platform/linux/wayland/touch.rs

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

src/platform/linux/wayland/window.rs

@@ -1,137 +1,87 @@
-use std::sync::{Arc, Mutex, Weak};
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::AtomicBool;
 
-use {CreationError, CursorState, MouseCursor, WindowAttributes};
+use wayland_client::{EventQueue, EventQueueHandle, Proxy};
+use wayland_client::protocol::{wl_display,wl_surface,wl_shell_surface};
+
+use {CreationError, MouseCursor, CursorState, WindowAttributes};
 use platform::MonitorId as PlatformMonitorId;
-use window::MonitorId as RootMonitorId;
 
-use sctk::window::{BasicFrame, Event as WEvent, Window as SWindow};
-use sctk::reexports::client::{Display, Proxy};
-use sctk::reexports::client::protocol::{wl_seat, wl_surface};
-use sctk::reexports::client::protocol::wl_compositor::RequestsTrait as CompositorRequests;
-use sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceRequests;
-
-use super::{make_wid, EventsLoop, MonitorId, WindowId};
+use super::{WaylandContext, EventsLoop};
+use super::wayland_window;
+use super::wayland_window::DecoratedSurface;
 
 pub struct Window {
-    surface: Proxy<wl_surface::WlSurface>,
-    frame: Arc<Mutex<SWindow<BasicFrame>>>,
-    monitors: Arc<Mutex<Vec<MonitorId>>>,
-    size: Arc<Mutex<(u32, u32)>>,
-    kill_switch: (Arc<Mutex<bool>>, Arc<Mutex<bool>>),
-    display: Arc<Display>,
-    need_frame_refresh: Arc<Mutex<bool>>,
+    // the global wayland context
+    ctxt: Arc<WaylandContext>,
+    // the EventQueue of our EventsLoop
+    evq: Arc<Mutex<EventQueue>>,
+    // signal to advertize the EventsLoop when we are destroyed
+    cleanup_signal: Arc<AtomicBool>,
+    // our wayland surface
+    surface: Arc<wl_surface::WlSurface>,
+    // our current inner dimensions
+    size: Mutex<(u32, u32)>,
+    // the id of our DecoratedHandler in the EventQueue
+    decorated_id: usize
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(usize);
+
+#[inline]
+pub fn make_wid(s: &wl_surface::WlSurface) -> WindowId {
+    WindowId(s.ptr() as usize)
 }
 
 impl Window {
-    pub fn new(evlp: &EventsLoop, attributes: WindowAttributes) -> Result<Window, CreationError> {
-        let (width, height) = attributes.dimensions.unwrap_or((800, 600));
-        // Create the window
-        let size = Arc::new(Mutex::new((width, height)));
+    pub fn new(evlp: &EventsLoop, ctxt: Arc<WaylandContext>, attributes: &WindowAttributes)  -> Result<Window, CreationError>
+    {
+        let (width, height) = attributes.dimensions.unwrap_or((800,600));
 
-        // monitor tracking
-        let monitor_list = Arc::new(Mutex::new(Vec::new()));
+        let (surface, decorated) = ctxt.create_window::<DecoratedHandler>();
 
-        let surface = evlp.env.compositor.create_surface().unwrap().implement({
-            let list = monitor_list.clone();
-            let omgr = evlp.env.outputs.clone();
-            move |event, _| match event {
-                wl_surface::Event::Enter { output } => list.lock().unwrap().push(MonitorId {
-                    proxy: output,
-                    mgr: omgr.clone(),
-                }),
-                wl_surface::Event::Leave { output } => {
-                    list.lock().unwrap().retain(|m| !m.proxy.equals(&output));
+        // init DecoratedSurface
+        let (evq, cleanup_signal) = evlp.get_window_init();
+        let decorated_id = {
+            let mut evq_guard = evq.lock().unwrap();
+            let decorated_id = evq_guard.add_handler_with_init(decorated);
+            {
+                // initialize the DecoratedHandler
+                let mut state = evq_guard.state();
+                let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(decorated_id);
+                *(decorated.handler()) = Some(DecoratedHandler::new());
+
+                // set fullscreen if necessary
+                if let Some(PlatformMonitorId::Wayland(ref monitor_id)) = attributes.monitor {
+                    ctxt.with_output(monitor_id.clone(), |output| {
+                        decorated.set_fullscreen(
+                            wl_shell_surface::FullscreenMethod::Default,
+                            0,
+                            Some(output)
+                        )
+                    });
+                } else if attributes.decorations {
+                    decorated.set_decorate(true);
                 }
+                // Finally, set the decorations size
+                decorated.resize(width as i32, height as i32);
             }
-        });
-
-        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.map(|(w, h)| (w as i32, h as i32));
-                            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();
-        }
-
-        // set decorations
-        frame.set_decorate(attributes.decorations);
-
-        // min-max dimensions
-        frame.set_min_size(attributes.min_dimensions);
-        frame.set_max_size(attributes.max_dimensions);
-
-        let kill_switch = Arc::new(Mutex::new(false));
-        let need_frame_refresh = Arc::new(Mutex::new(true));
-        let frame = Arc::new(Mutex::new(frame));
-
-        evlp.store.lock().unwrap().windows.push(InternalWindow {
-            closed: false,
-            newsize: None,
-            need_refresh: false,
-            need_frame_refresh: need_frame_refresh.clone(),
-            surface: surface.clone(),
-            kill_switch: kill_switch.clone(),
-            frame: Arc::downgrade(&frame),
-        });
-        evlp.evq.borrow_mut().sync_roundtrip().unwrap();
-
-        Ok(Window {
-            display: evlp.display.clone(),
+            decorated_id
+        };
+        let me = Window {
+            ctxt: ctxt,
+            evq: evq,
+            cleanup_signal: cleanup_signal,
             surface: surface,
-            frame: frame,
-            monitors: monitor_list,
-            size: size,
-            kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
-            need_frame_refresh: need_frame_refresh,
-        })
+            size: Mutex::new((width, height)),
+            decorated_id: decorated_id
+        };
+
+        // register ourselves to the EventsLoop
+        evlp.register_window(me.decorated_id, me.surface.clone());
+
+        Ok(me)
     }
 
     #[inline]
@@ -140,7 +90,10 @@ impl Window {
     }
 
     pub fn set_title(&self, title: &str) {
-        self.frame.lock().unwrap().set_title(title.into());
+        let mut guard = self.evq.lock().unwrap();
+        let mut state = guard.state();
+        let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(self.decorated_id);
+        decorated.set_title(title.into())
     }
 
     #[inline]
@@ -159,12 +112,6 @@ impl Window {
         None
     }
 
-    #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        // Not possible with wayland
-        None
-    }
-
     #[inline]
     pub fn set_position(&self, _x: i32, _y: i32) {
         // Not possible with wayland
@@ -177,25 +124,17 @@ impl Window {
     #[inline]
     pub fn get_outer_size(&self) -> Option<(u32, u32)> {
         let (w, h) = self.size.lock().unwrap().clone();
-        // let (w, h) = super::wayland_window::add_borders(w as i32, h as i32);
+        let (w, h) = super::wayland_window::add_borders(w as i32, h as i32);
         Some((w as u32, h as u32))
     }
 
     #[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, y);
-        *(self.size.lock().unwrap()) = (x, y);
-    }
-
-    #[inline]
-    pub fn set_min_dimensions(&self, dimensions: Option<(u32, u32)>) {
-        self.frame.lock().unwrap().set_min_size(dimensions);
-    }
-
-    #[inline]
-    pub fn set_max_dimensions(&self, dimensions: Option<(u32, u32)>) {
-        self.frame.lock().unwrap().set_max_size(dimensions);
+        let mut guard = self.evq.lock().unwrap();
+        let mut state = guard.state();
+        let mut decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(self.decorated_id);
+        decorated.resize(x as i32, y as i32);
     }
 
     #[inline]
@@ -205,51 +144,19 @@ impl Window {
 
     #[inline]
     pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
-        use CursorState::{Grab, Hide, Normal};
+        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(()),
+            Normal => Ok(())
         }
     }
 
     #[inline]
     pub fn hidpi_factor(&self) -> f32 {
-        let mut factor: f32 = 1.0;
-        let guard = self.monitors.lock().unwrap();
-        for monitor_id in guard.iter() {
-            let hidpif = monitor_id.get_hidpi_factor();
-            factor = factor.max(hidpif);
-        }
-        factor
-    }
-
-    pub fn set_decorations(&self, decorate: bool) {
-        self.frame.lock().unwrap().set_decorate(decorate);
-        *(self.need_frame_refresh.lock().unwrap()) = true;
-    }
-
-    pub fn set_maximized(&self, maximized: bool) {
-        if maximized {
-            self.frame.lock().unwrap().set_maximized();
-        } else {
-            self.frame.lock().unwrap().unset_maximized();
-        }
-    }
-
-    pub fn set_fullscreen(&self, monitor: Option<RootMonitorId>) {
-        if let Some(RootMonitorId {
-            inner: PlatformMonitorId::Wayland(ref monitor_id),
-        }) = monitor
-        {
-            self.frame
-                .lock()
-                .unwrap()
-                .set_fullscreen(Some(&monitor_id.proxy));
-        } else {
-            self.frame.lock().unwrap().unset_fullscreen();
-        }
+        // TODO
+        1.0
     }
 
     #[inline]
@@ -257,105 +164,42 @@ impl Window {
         // TODO: not yet possible on wayland
         Err(())
     }
-
-    pub fn get_display(&self) -> &Display {
-        &*self.display
+    
+    pub fn get_display(&self) -> &wl_display::WlDisplay {
+        &self.ctxt.display
     }
-
-    pub fn get_surface(&self) -> &Proxy<wl_surface::WlSurface> {
+    
+    pub fn get_surface(&self) -> &wl_surface::WlSurface {
         &self.surface
     }
-
-    pub fn get_current_monitor(&self) -> MonitorId {
-        // we don't know how much each monitor sees us so...
-        // just return the most recent one ?
-        let guard = self.monitors.lock().unwrap();
-        guard.last().unwrap().clone()
-    }
 }
 
 impl Drop for Window {
     fn drop(&mut self) {
-        *(self.kill_switch.0.lock().unwrap()) = true;
-        *(self.kill_switch.1.lock().unwrap()) = true;
+        self.surface.destroy();
+        self.cleanup_signal.store(true, ::std::sync::atomic::Ordering::Relaxed);
     }
 }
 
-/*
- * Internal store for windows
- */
-
-struct InternalWindow {
-    surface: Proxy<wl_surface::WlSurface>,
-    newsize: Option<(i32, i32)>,
-    need_refresh: bool,
-    need_frame_refresh: Arc<Mutex<bool>>,
-    closed: bool,
-    kill_switch: Arc<Mutex<bool>>,
-    frame: Weak<Mutex<SWindow<BasicFrame>>>,
+pub struct DecoratedHandler {
+    newsize: Option<(u32, u32)>
 }
 
-pub struct WindowStore {
-    windows: Vec<InternalWindow>,
+impl DecoratedHandler {
+    fn new() -> DecoratedHandler { DecoratedHandler { newsize: None }}
+
+    pub fn take_newsize(&mut self) -> Option<(u32, u32)> {
+        self.newsize.take()
+    }
 }
 
-impl WindowStore {
-    pub fn new() -> WindowStore {
-        WindowStore {
-            windows: Vec::new(),
-        }
-    }
-
-    pub fn find_wid(&self, surface: &Proxy<wl_surface::WlSurface>) -> Option<WindowId> {
-        for window in &self.windows {
-            if surface.equals(&window.surface) {
-                return Some(make_wid(surface));
-            }
-        }
-        None
-    }
-
-    pub fn cleanup(&mut self) -> Vec<WindowId> {
-        let mut pruned = Vec::new();
-        self.windows.retain(|w| {
-            if *w.kill_switch.lock().unwrap() {
-                // window is dead, cleanup
-                pruned.push(make_wid(&w.surface));
-                w.surface.destroy();
-                false
-            } else {
-                true
-            }
-        });
-        pruned
-    }
-
-    pub fn new_seat(&self, seat: &Proxy<wl_seat::WlSeat>) {
-        for window in &self.windows {
-            if let Some(w) = window.frame.upgrade() {
-                w.lock().unwrap().new_seat(seat);
-            }
-        }
-    }
-
-    pub fn for_each<F>(&mut self, mut f: F)
-    where
-        F: FnMut(Option<(i32, i32)>, bool, bool, bool, WindowId, Option<&mut SWindow<BasicFrame>>),
+impl wayland_window::Handler for DecoratedHandler {
+    fn configure(&mut self,
+                 _: &mut EventQueueHandle,
+                 _: wl_shell_surface::Resize,
+                 width: i32, height: i32)
     {
-        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(),
-                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),
-            );
-            window.need_refresh = false;
-            // avoid re-spamming the event
-            window.closed = false;
-        }
+        use std::cmp::max;
+        self.newsize = Some((max(width,1) as u32, max(height,1) as u32));
     }
 }

src/platform/linux/x11/dnd.rs

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

src/platform/linux/x11/events.rs

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

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

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

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

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

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

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

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

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

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

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

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

src/platform/linux/x11/input.rs

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

src/platform/linux/x11/monitor.rs

@@ -1,270 +1,44 @@
-use std::os::raw::*;
+use std::collections::VecDeque;
 use std::sync::Arc;
 
-use parking_lot::Mutex;
+use super::XConnection;
+use native_monitor::NativeMonitorId;
 
-use super::ffi::{
-    RRCrtcChangeNotifyMask,
-    RROutputPropertyNotifyMask,
-    RRScreenChangeNotifyMask,
-    True,
-    Window,
-    XRRScreenResources,
-};
-use super::{util, XConnection, XError};
+#[derive(Clone)]
+pub struct MonitorId(pub Arc<XConnection>, pub u32);
 
-// 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;
+pub fn get_available_monitors(x: &Arc<XConnection>) -> VecDeque<MonitorId> {
+    let nb_monitors = unsafe { (x.xlib.XScreenCount)(x.display) };
+    x.check_errors().expect("Failed to call XScreenCount");
 
-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,
-    /// The size of the monitor
-    dimensions: (u32, u32),
-    /// The position of the monitor in the X screen
-    position: (i32, i32),
-    /// If the monitor is the primary one
-    primary: bool,
-    /// The DPI scale factor
-    pub(crate) hidpi_factor: f32,
-    /// Used to determine which windows are on this monitor
-    pub(crate) rect: util::Rect,
-}
-
-impl MonitorId {
-    fn from_repr(
-        xconn: &Arc<XConnection>,
-        resources: *mut XRRScreenResources,
-        id: u32,
-        repr: util::MonitorRepr,
-        primary: bool,
-    ) -> Self {
-        let (name, hidpi_factor) = unsafe { util::get_output_info(xconn, resources, &repr) };
-        let (dimensions, position) = unsafe { (repr.get_dimensions(), repr.get_position()) };
-        let rect = util::Rect::new(position, dimensions);
-        MonitorId {
-            id,
-            name,
-            hidpi_factor,
-            dimensions,
-            position,
-            primary,
-            rect,
-        }
-    }
-
-    pub fn get_name(&self) -> Option<String> {
-        Some(self.name.clone())
-    }
-
-    #[inline]
-    pub fn get_native_identifier(&self) -> u32 {
-        self.id as u32
-    }
-
-    pub fn get_dimensions(&self) -> (u32, u32) {
-        self.dimensions
-    }
-
-    pub fn get_position(&self) -> (i32, i32) {
-        self.position
-    }
-
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        self.hidpi_factor
-    }
-}
-
-pub fn get_monitor_for_window(
-    xconn: &Arc<XConnection>,
-    window_rect: Option<util::Rect>,
-) -> MonitorId {
-    let monitors = get_available_monitors(xconn);
-    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(xconn: &Arc<XConnection>) -> Vec<MonitorId> {
-    unsafe {
-        let root = (xconn.xlib.XDefaultRootWindow)(xconn.display);
-        // WARNING: this function is supposedly very slow, on the order of hundreds of ms.
-        // Upon failure, `resources` will be null.
-        let resources = (xconn.xrandr.XRRGetScreenResources)(xconn.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 xconn.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 = xconn.xrandr_1_5.as_ref().unwrap();
-            let mut monitor_count = 0;
-            let monitors = (xrandr_1_5.XRRGetMonitors)(xconn.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(
-                    xconn,
-                    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 = (xconn.xrandr.XRRGetOutputPrimary)(xconn.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 = (xconn.xrandr.XRRGetCrtcInfo)(xconn.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(
-                        xconn,
-                        resources,
-                        crtc_id as u32,
-                        crtc,
-                        is_primary,
-                    ));
-                }
-                (xconn.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;
-            }
-        }
-
-        (xconn.xrandr.XRRFreeScreenResources)(resources);
-        available
-    }
-}
-
-pub fn get_available_monitors(xconn: &Arc<XConnection>) -> Vec<MonitorId> {
-    let mut monitors_lock = MONITORS.lock();
-    (*monitors_lock)
-        .as_ref()
-        .cloned()
-        .or_else(|| {
-            let monitors = Some(query_monitor_list(xconn));
-            if !DISABLE_MONITOR_LIST_CACHING {
-                (*monitors_lock) = monitors.clone();
-            }
-            monitors
-        })
-        .unwrap()
+    let mut monitors = VecDeque::new();
+    monitors.extend((0 .. nb_monitors).map(|i| MonitorId(x.clone(), i as u32)));
+    monitors
 }
 
 #[inline]
-pub fn get_primary_monitor(xconn: &Arc<XConnection>) -> MonitorId {
-    get_available_monitors(xconn)
-        .into_iter()
-        .find(|monitor| monitor.primary)
-        .expect("[winit] Failed to find any monitors using XRandR.")
+pub fn get_primary_monitor(x: &Arc<XConnection>) -> MonitorId {
+    let primary_monitor = unsafe { (x.xlib.XDefaultScreen)(x.display) };
+    x.check_errors().expect("Failed to call XDefaultScreen");
+    MonitorId(x.clone(), primary_monitor as u32)
 }
 
-pub fn select_input(xconn: &Arc<XConnection>, 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 {
-                (xconn.xrandr.XRRQueryVersion)(
-                    xconn.display,
-                    &mut major,
-                    &mut minor,
-                )
-            };
-            if has_extension != True {
-                panic!("[winit] XRandR extension not available.");
-            }
-            *version_lock = Some((major, minor));
-        }
+impl MonitorId {
+    pub fn get_name(&self) -> Option<String> {
+        let MonitorId(_, screen_num) = *self;
+        Some(format!("Monitor #{}", screen_num))
     }
 
-    let mut event_offset = 0;
-    let mut error_offset = 0;
-    let status = unsafe {
-        (xconn.xrandr.XRRQueryExtension)(
-            xconn.display,
-            &mut event_offset,
-            &mut error_offset,
-        )
-    };
-
-    if status != True {
-        xconn.check_errors()?;
-        unreachable!("[winit] `XRRQueryExtension` failed but no error was received.");
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Numeric(self.1)
     }
 
-    let mask = RRCrtcChangeNotifyMask
-        | RROutputPropertyNotifyMask
-        | RRScreenChangeNotifyMask;
-    unsafe { (xconn.xrandr.XRRSelectInput)(xconn.display, root, mask) };
-
-    Ok(event_offset)
+    pub fn get_dimensions(&self) -> (u32, u32) {
+        let screen = unsafe { (self.0.xlib.XScreenOfDisplay)(self.0.display, self.1 as i32) };
+        let width = unsafe { (self.0.xlib.XWidthOfScreen)(screen) };
+        let height = unsafe { (self.0.xlib.XHeightOfScreen)(screen) };
+        self.0.check_errors().expect("Failed to get monitor dimensions");
+        (width as u32, height as u32)
+    }
 }

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

@@ -1,59 +0,0 @@
-use std::collections::HashMap;
-use std::ffi::{CStr, CString};
-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));
-}
-
-pub unsafe fn get_atom(xconn: &Arc<XConnection>, name: &[u8]) -> Result<ffi::Atom, XError> {
-    let name = CStr::from_bytes_with_nul_unchecked(name); // I trust you. Don't let me down.
-    let mut atom_cache_lock = ATOM_CACHE.lock();
-    let cached_atom = (*atom_cache_lock).get(name).cloned();
-    if let Some(atom) = cached_atom {
-        Ok(atom)
-    } else {
-        let atom = (xconn.xlib.XInternAtom)(
-            xconn.display,
-            name.as_ptr() as *const c_char,
-            ffi::False,
-        );
-        /*println!(
-            "XInternAtom name:{:?} atom:{:?}",
-            name,
-            atom,
-        );*/
-        xconn.check_errors()?;
-        (*atom_cache_lock).insert(name.to_owned(), atom);
-        Ok(atom)
-    }
-}
-
-// 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(
-    xconn: &Arc<XConnection>,
-    names: &[*mut c_char],
-) -> Result<Vec<ffi::Atom>, XError> {
-    let mut atoms = Vec::with_capacity(names.len());
-    (xconn.xlib.XInternAtoms)(
-        xconn.display,
-        names.as_ptr() as *mut _,
-        names.len() as c_int,
-        ffi::False,
-        atoms.as_mut_ptr(),
-    );
-    xconn.check_errors()?;
-    atoms.set_len(names.len());
-    /*println!(
-        "XInternAtoms atoms:{:?}",
-        atoms,
-    );*/
-    Ok(atoms)
-}

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

@@ -1,385 +0,0 @@
-use std::cmp;
-
-use super::*;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Rect {
-    left: i64,
-    right: i64,
-    top: i64,
-    bottom: i64,
-}
-
-impl Rect {
-    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);
-        Rect {
-            left: x,
-            right: x + width,
-            top: y,
-            bottom: y + height,
-        }
-    }
-
-    pub fn get_overlapping_area(&self, other: &Self) -> i64 {
-        let x_overlap = cmp::max(
-            0,
-            cmp::min(self.right, other.right) - cmp::max(self.left, other.left),
-        );
-        let y_overlap = cmp::max(
-            0,
-            cmp::min(self.bottom, other.bottom) - cmp::max(self.top, other.top),
-        );
-        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,
-}
-
-// This is adequate for get_inner_position
-pub unsafe fn translate_coords(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-    root: ffi::Window,
-) -> Result<TranslatedCoords, XError> {
-    let mut translated_coords: TranslatedCoords = mem::uninitialized();
-
-    (xconn.xlib.XTranslateCoordinates)(
-        xconn.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);
-
-    xconn.check_errors().map(|_| translated_coords)
-}
-
-#[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,
-}
-
-// This is adequate for get_inner_size
-pub unsafe fn get_geometry(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-) -> Result<Geometry, XError> {
-    let mut geometry: Geometry = mem::uninitialized();
-
-    let _status = (xconn.xlib.XGetGeometry)(
-        xconn.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);
-
-    xconn.check_errors().map(|_| geometry)
-}
-
-#[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)
-    }
-}
-
-fn get_frame_extents(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-) -> Option<self::FrameExtents> {
-    let extents_atom = unsafe { self::get_atom(xconn, b"_NET_FRAME_EXTENTS\0") }
-        .expect("Failed to call XInternAtom (_NET_FRAME_EXTENTS)");
-
-    if !self::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>> = unsafe {
-        self::get_property(
-            xconn,
-            window,
-            extents_atom,
-            ffi::XA_CARDINAL,
-        )
-    }.ok();
-
-    extents.and_then(|extents| {
-        if extents.len() >= 4 {
-            Some(self::FrameExtents {
-                left: extents[0],
-                right: extents[1],
-                top: extents[2],
-                bottom: extents[3],
-            })
-        } else {
-            None
-        }
-    })
-}
-
-pub fn is_top_level(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-    root: ffi::Window,
-) -> Option<bool> {
-    let client_list_atom = unsafe { self::get_atom(xconn, b"_NET_CLIENT_LIST\0") }
-        .expect("Failed to call XInternAtom (_NET_CLIENT_LIST)");
-
-    if !self::hint_is_supported(client_list_atom) {
-        return None;
-    }
-
-    let client_list: Option<Vec<ffi::Window>> = unsafe {
-        self::get_property(
-            xconn,
-            root,
-            client_list_atom,
-            ffi::XA_WINDOW,
-        )
-    }.ok();
-
-    client_list.map(|client_list| client_list.contains(&window))
-}
-
-unsafe fn get_parent_window(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-) -> Result<ffi::Window, XError> {
-    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();
-
-    let _status = (xconn.xlib.XQueryTree)(
-        xconn.display,
-        window,
-        &mut root,
-        &mut parent,
-        &mut children,
-        &mut nchildren,
-    );
-
-    // The list of children isn't used
-    if children != ptr::null_mut() {
-        (xconn.xlib.XFree)(children as *mut _);
-    }
-
-    xconn.check_errors().map(|_| parent)
-}
-
-fn climb_hierarchy(
-    xconn: &Arc<XConnection>,
-    window: ffi::Window,
-    root: ffi::Window,
-) -> Result<ffi::Window, XError> {
-    let mut outer_window = window;
-    loop {
-        let candidate = unsafe { get_parent_window(xconn, outer_window) }?;
-        if candidate == root {
-            break;
-        }
-        outer_window = candidate;
-    }
-    Ok(outer_window)
-}
-
-#[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_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 get_frame_extents_heuristic(
-    xconn: &Arc<XConnection>,
-    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 = unsafe { translate_coords(xconn, window, root) }
-            .expect("Failed to translate window coordinates");
-        (
-            coords.y_rel_root,
-            coords.child,
-        )
-    };
-
-    let (width, height, border) = {
-        let inner_geometry = unsafe { get_geometry(xconn, 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 || is_top_level(xconn, 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) = get_frame_extents(xconn, 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 = climb_hierarchy(xconn, window, root)
-            .expect("Failed to climb window hierarchy");
-
-        let (outer_y, outer_width, outer_height) = {
-            let outer_geometry = unsafe { get_geometry(xconn, 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

@@ -1,68 +0,0 @@
-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(b: bool) -> Self {
-        if b {
-            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 { get_atom(xconn, atom_name) }
-            .expect("Failed to get atom for `WindowType`")
-    }
-}

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

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

@@ -1,187 +0,0 @@
-use super::*;
-use events::ModifiersState;
-
-pub unsafe fn select_xinput_events(
-    xconn: &Arc<XConnection>,
-    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,
-    };
-    (xconn.xinput2.XISelectEvents)(
-        xconn.display,
-        window,
-        &mut event_mask as *mut ffi::XIEventMask,
-        1, // number of masks to read from pointer above
-    );
-    Flusher::new(xconn)
-}
-
-#[allow(dead_code)]
-pub unsafe fn select_xkb_events(
-    xconn: &Arc<XConnection>,
-    device_id: c_uint,
-    mask: c_ulong,
-) -> Option<Flusher> {
-    let status = (xconn.xlib.XkbSelectEvents)(
-        xconn.display,
-        device_id,
-        mask,
-        mask,
-    );
-    if status == ffi::True {
-        Some(Flusher::new(xconn))
-    } else {
-        None
-    }
-}
-
-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 Arc<XConnection>,
-    _root: ffi::Window,
-    _child: ffi::Window,
-    _root_x: c_double,
-    _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) {
-        unsafe {
-            // This is why you need to read the docs carefully...
-            (self.xconn.xlib.XFree)(self._buttons.mask as _);
-        }
-    }
-}
-
-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 {
-        xconn,
-        _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: 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)
-}
-
-// 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;
-
-pub unsafe fn lookup_utf8(
-    xconn: &Arc<XConnection>,
-    ic: ffi::XIC,
-    key_event: &mut ffi::XKeyEvent,
-) -> String {
-    let mut buffer: [u8; TEXT_BUFFER_SIZE] = mem::uninitialized();
-    let (_, status, count) = lookup_utf8_inner(
-        xconn,
-        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);
-        buffer.set_len(count as usize);
-        let (_, _, new_count) = lookup_utf8_inner(
-            xconn,
-            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/mod.rs

@@ -1,181 +0,0 @@
-// Welcome to the util module, where we try to keep you from shooting yourself in the foot.
-// *results may vary
-
-mod atom;
-mod geometry;
-mod hint;
-mod icon;
-mod input;
-mod randr;
-mod window_property;
-mod wm;
-
-pub use self::atom::*;
-pub use self::geometry::*;
-pub use self::hint::*;
-pub use self::icon::*;
-pub use self::input::*;
-pub use self::randr::*;
-pub use self::window_property::*;
-pub use self::wm::*;
-
-use std::mem;
-use std::ptr;
-use std::str;
-use std::sync::Arc;
-use std::ops::{Deref, DerefMut};
-use std::os::raw::*;
-
-use super::{ffi, XConnection, XError};
-
-// 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)]
-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 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 _);
-        }
-    }
-}
-
-// 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 unsafe fn flush_requests(xconn: &Arc<XConnection>) -> Result<(), XError> {
-    (xconn.xlib.XFlush)(xconn.display);
-    //println!("XFlush");
-    // This isn't necessarily a useful time to check for errors (since our request hasn't
-    // necessarily been processed yet)
-    xconn.check_errors()
-}
-
-pub unsafe fn sync_with_server(xconn: &Arc<XConnection>) -> Result<(), XError> {
-    (xconn.xlib.XSync)(xconn.display, ffi::False);
-    //println!("XSync");
-    xconn.check_errors()
-}
-
-#[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 Arc<XConnection>,
-}
-
-impl<'a> Flusher<'a> {
-    pub fn new(xconn: &'a Arc<XConnection>) -> Self {
-        Flusher { xconn }
-    }
-
-    // "I want this request sent now!"
-    pub fn flush(self) -> Result<(), XError> {
-        unsafe { flush_requests(self.xconn) }
-    }
-
-    // "I'm aware that this request hasn't been sent, and I'm okay with waiting."
-    pub fn queue(self) {}
-}
-
-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),
-) -> Flusher {
-    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 = Format::Long as c_int;
-    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(),
-    );
-
-    Flusher::new(xconn)
-}

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

@@ -1,84 +0,0 @@
-use std::slice;
-
-use super::*;
-use super::ffi::{
-    RROutput,
-    XRRCrtcInfo,
-    XRRMonitorInfo,
-    XRRScreenResources,
-};
-
-pub enum MonitorRepr {
-    Monitor(*mut XRRMonitorInfo),
-    Crtc(*mut XRRCrtcInfo),
-}
-
-impl MonitorRepr {
-    pub unsafe fn get_output(&self) -> 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 XRRMonitorInfo> for MonitorRepr {
-    fn from(monitor: *mut XRRMonitorInfo) -> Self {
-        MonitorRepr::Monitor(monitor)
-    }
-}
-
-impl From<*mut XRRCrtcInfo> for MonitorRepr {
-    fn from(crtc: *mut XRRCrtcInfo) -> Self {
-        MonitorRepr::Crtc(crtc)
-    }
-}
-
-pub fn calc_dpi_factor(
-    (width_px, height_px): (u32, u32),
-    (width_mm, height_mm): (u64, u64),
-) -> f64 {
-    let ppmm = (
-        (width_px as f64 * height_px as f64) / (width_mm as f64 * height_mm as f64)
-    ).sqrt();
-    // Quantize 1/12 step size
-    ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0)
-}
-
-pub unsafe fn get_output_info(
-    xconn: &Arc<XConnection>,
-    resources: *mut XRRScreenResources,
-    repr: &MonitorRepr,
-) -> (String, f32) {
-    let output_info = (xconn.xrandr.XRRGetOutputInfo)(
-        xconn.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),
-    ) as f32;
-    (xconn.xrandr.XRRFreeOutputInfo)(output_info);
-    (name, hidpi_factor)
-}

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

@@ -1,163 +0,0 @@
-use std;
-use std::fmt::Debug;
-
-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!
-
-pub unsafe fn get_property<T: Debug + Clone>(
-    xconn: &Arc<XConnection>,
-    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 {
-        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();
-        (xconn.xlib.XGetWindowProperty)(
-            xconn.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) = xconn.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 _)
-            .map(|actual_format| !actual_format.is_same_size_as::<T>())
-            // This won't actually be reached; the XError condition above is triggered first.
-            .unwrap_or(true);
-
-        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.
-            (xconn.xlib.XFree)(buf as _); // Don't try to access new_data after this.
-        } else {
-            return Err(GetPropertyError::NothingAllocated);
-        }
-
-        done = bytes_after == 0;
-    }
-
-    Ok(data)
-}
-
-#[derive(Debug)]
-pub enum PropMode {
-    Replace = ffi::PropModeReplace as isize,
-    _Prepend = ffi::PropModePrepend as isize,
-    _Append = ffi::PropModeAppend as isize,
-}
-
-#[derive(Debug, Clone)]
-pub struct InvalidFormat {
-    format_used: Format,
-    size_passed: usize,
-    size_expected: usize,
-}
-
-pub unsafe fn change_property<'a, T: Debug>(
-    xconn: &'a Arc<XConnection>,
-    window: c_ulong,
-    property: ffi::Atom,
-    property_type: ffi::Atom,
-    format: Format,
-    mode: PropMode,
-    new_value: &[T],
-) -> Flusher<'a> {
-    if !format.is_same_size_as::<T>() {
-        panic!(format!(
-            "[winit developer error] Incorrect usage of `util::change_property`: {:#?}",
-            InvalidFormat {
-                format_used: format,
-                size_passed: mem::size_of::<T>() * 8,
-                size_expected: format.get_actual_size() * 8,
-            },
-        ));
-    }
-
-    (xconn.xlib.XChangeProperty)(
-        xconn.display,
-        window,
-        property,
-        property_type,
-        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(xconn)
-}

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

@@ -1,158 +0,0 @@
-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
-    }
-}
-
-pub fn update_cached_wm_info(xconn: &Arc<XConnection>, root: ffi::Window) {
-    *SUPPORTED_HINTS.lock() = self::get_supported_hints(xconn, root);
-    *WM_NAME.lock() = self::get_wm_name(xconn, root);
-}
-
-fn get_supported_hints(xconn: &Arc<XConnection>, root: ffi::Window) -> Vec<ffi::Atom> {
-    let supported_atom = unsafe { self::get_atom(xconn, b"_NET_SUPPORTED\0") }
-        .expect("Failed to call XInternAtom (_NET_SUPPORTED)");
-    unsafe {
-        self::get_property(
-            xconn,
-            root,
-            supported_atom,
-            ffi::XA_ATOM,
-        )
-    }.unwrap_or_else(|_| Vec::with_capacity(0))
-}
-
-fn get_wm_name(xconn: &Arc<XConnection>, root: ffi::Window) -> Option<String> {
-    let check_atom = unsafe { self::get_atom(xconn, b"_NET_SUPPORTING_WM_CHECK\0") }
-        .expect("Failed to call XInternAtom (_NET_SUPPORTING_WM_CHECK)");
-    let wm_name_atom = unsafe { self::get_atom(xconn, b"_NET_WM_NAME\0") }
-        .expect("Failed to call XInternAtom (_NET_WM_NAME)");
-
-    // 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 = unsafe {
-            self::get_property(
-                xconn,
-                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 = unsafe {
-            self::get_property(
-                xconn,
-                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(xconn, b"UTF8_STRING\0") }
-            .expect("Failed to call XInternAtom (UTF8_STRING)");
-
-        let result = unsafe {
-            self::get_property(
-                xconn,
-                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 {
-            unsafe {
-                self::get_property(
-                    xconn,
-                    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,19 +1,16 @@
 use std::ptr;
 use std::fmt;
 use std::error::Error;
+use std::sync::Mutex;
 
 use libc;
-use parking_lot::Mutex;
 
 use super::ffi;
 
 /// A connection to an X server.
 pub struct XConnection {
     pub xlib: ffi::Xlib,
-    /// Exposes XRandR functions from version < 1.5
-    pub xrandr: ffi::Xrandr_2_2_0,
-    /// Exposes XRandR functions from version = 1.5
-    pub xrandr_1_5: Option<ffi::Xrandr>,
+    pub xf86vmode: ffi::Xf86vmode,
     pub xcursor: ffi::Xcursor,
     pub xinput2: ffi::XInput2,
     pub xlib_xcb: ffi::Xlib_xcb,
@@ -29,12 +26,11 @@ 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 = ffi::Xlib::open()?;
-        let xcursor = ffi::Xcursor::open()?;
-        let xrandr = ffi::Xrandr_2_2_0::open()?;
-        let xrandr_1_5 = ffi::Xrandr::open().ok();
-        let xinput2 = ffi::XInput2::open()?;
-        let xlib_xcb = ffi::Xlib_xcb::open()?;
+        let xlib = try!(ffi::Xlib::open());
+        let xcursor = try!(ffi::Xcursor::open());
+        let xf86vmode = try!(ffi::Xf86vmode::open());
+        let xinput2 = try!(ffi::XInput2::open());
+        let xlib_xcb = try!(ffi::Xlib_xcb::open());
 
         unsafe { (xlib.XInitThreads)() };
         unsafe { (xlib.XSetErrorHandler)(error_handler) };
@@ -49,13 +45,12 @@ impl XConnection {
         };
 
         Ok(XConnection {
-            xlib,
-            xrandr,
-            xrandr_1_5,
-            xcursor,
-            xinput2,
-            xlib_xcb,
-            display,
+            xlib: xlib,
+            xf86vmode: xf86vmode,
+            xcursor: xcursor,
+            xinput2: xinput2,
+            xlib_xcb: xlib_xcb,
+            display: display,
             latest_error: Mutex::new(None),
         })
     }
@@ -63,7 +58,8 @@ 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().take();
+        let error = self.latest_error.lock().unwrap().take();
+
         if let Some(error) = error {
             Err(error)
         } else {
@@ -74,13 +70,7 @@ impl XConnection {
     /// Ignores any previous error.
     #[inline]
     pub fn ignore_error(&self) {
-        *self.latest_error.lock() = None;
-    }
-}
-
-impl fmt::Debug for XConnection {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.display.fmt(f)
+        *self.latest_error.lock().unwrap() = None;
     }
 }
 

src/platform/macos/events_loop.rs

@@ -1,24 +1,16 @@
-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 std::collections::VecDeque;
-use std::sync::{Arc, Mutex, Weak};
-use super::window::Window2;
+use cocoa::appkit::{NSApplication, NSEvent, NSView, NSWindow};
+use events::{self, ElementState, Event, MouseButton, TouchPhase, WindowEvent, ModifiersState};
+use super::window::Window;
 use std;
-use std::os::raw::*;
-use super::DeviceId;
 
 
 pub struct EventsLoop {
-    modifiers: Modifiers,
-    pub shared: Arc<Shared>,
-}
+    pub windows: std::sync::Mutex<Vec<std::sync::Weak<Window>>>,
+    pub pending_events: std::sync::Mutex<std::collections::VecDeque<Event>>,
+    modifiers: std::sync::Mutex<Modifiers>,
+    interrupted: std::sync::atomic::AtomicBool,
 
-// State shared between the `EventsLoop` and its registered windows.
-pub struct Shared {
-    pub windows: Mutex<Vec<Weak<Window2>>>,
-    pub pending_events: Mutex<VecDeque<Event>>,
     // The user event callback given via either of the `poll_events` or `run_forever` methods.
     //
     // We store the user's callback here so that it may be accessed by each of the window delegate
@@ -30,9 +22,6 @@ pub struct Shared {
     user_callback: UserCallback,
 }
 
-#[derive(Clone)]
-pub struct Proxy {}
-
 struct Modifiers {
     shift_pressed: bool,
     ctrl_pressed: bool,
@@ -44,76 +33,14 @@ struct Modifiers {
 //
 // - ensure the callback pointer is never accidentally cloned
 // - ensure that only the `EventsLoop` can `store` and `drop` the callback pointer
-// - Share access to the user callback with the NSWindow callbacks.
+// - `unsafe impl Send` and `Sync` so that `Send` and `Sync` can be implemented for `EventsLoop`.
 pub struct UserCallback {
-    mutex: Mutex<Option<*mut FnMut(Event)>>,
+    mutex: std::sync::Mutex<Option<*mut FnMut(Event)>>,
 }
 
 
-impl Shared {
-
-    pub fn new() -> Self {
-        Shared {
-            windows: Mutex::new(Vec::new()),
-            pending_events: Mutex::new(VecDeque::new()),
-            user_callback: UserCallback { mutex: Mutex::new(None) },
-        }
-    }
-
-    fn call_user_callback_with_pending_events(&self) {
-        loop {
-            let event = match self.pending_events.lock().unwrap().pop_front() {
-                Some(event) => event,
-                None => return,
-            };
-            unsafe {
-                self.user_callback.call_with_event(event);
-            }
-        }
-    }
-
-    // Calls the user callback if one exists.
-    //
-    // Otherwise, stores the event in the `pending_events` queue.
-    //
-    // This is necessary for the case when `WindowDelegate` callbacks are triggered during a call
-    // to the user's callback.
-    pub fn call_user_callback_with_event_or_store_in_pending(&self, event: Event) {
-        if self.user_callback.mutex.lock().unwrap().is_some() {
-            unsafe {
-                self.user_callback.call_with_event(event);
-            }
-        } else {
-            self.pending_events.lock().unwrap().push_back(event);
-        }
-    }
-
-    // Removes the window with the given `Id` from the `windows` list.
-    //
-    // This is called in response to `windowWillClose`.
-    pub fn find_and_remove_window(&self, id: super::window::Id) {
-        if let Ok(mut windows) = self.windows.lock() {
-            windows.retain(|w| match w.upgrade() {
-                Some(w) => w.id() != id,
-                None => false,
-            });
-        }
-    }
-
-}
-
-
-impl Modifiers {
-    pub fn new() -> Self {
-        Modifiers {
-            shift_pressed: false,
-            ctrl_pressed: false,
-            win_pressed: false,
-            alt_pressed: false,
-        }
-    }
-}
-
+unsafe impl Send for UserCallback {}
+unsafe impl Sync for UserCallback {}
 
 impl UserCallback {
 
@@ -164,20 +91,22 @@ impl UserCallback {
 impl EventsLoop {
 
     pub fn new() -> Self {
-        // Mark this thread as the main thread of the Cocoa event system.
-        //
-        // This must be done before any worker threads get a chance to call it
-        // (e.g., via `EventsLoopProxy::wakeup()`), causing a wrong thread to be
-        // marked as the main thread.
-        unsafe { appkit::NSApp(); }
-
+        let modifiers = Modifiers {
+            shift_pressed: false,
+            ctrl_pressed: false,
+            win_pressed: false,
+            alt_pressed: false,
+        };
         EventsLoop {
-            shared: Arc::new(Shared::new()),
-            modifiers: Modifiers::new(),
+            windows: std::sync::Mutex::new(Vec::new()),
+            pending_events: std::sync::Mutex::new(std::collections::VecDeque::new()),
+            modifiers: std::sync::Mutex::new(modifiers),
+            interrupted: std::sync::atomic::AtomicBool::new(false),
+            user_callback: UserCallback { mutex: std::sync::Mutex::new(None) },
         }
     }
 
-    pub fn poll_events<F>(&mut self, mut callback: F)
+    pub fn poll_events<F>(&self, mut callback: F)
         where F: FnMut(Event),
     {
         unsafe {
@@ -186,19 +115,19 @@ impl EventsLoop {
             }
         }
 
-        self.shared.user_callback.store(&mut callback);
+        self.user_callback.store(&mut callback);
 
         // Loop as long as we have pending events to return.
         loop {
             unsafe {
                 // First, yield all pending events.
-                self.shared.call_user_callback_with_pending_events();
+                self.call_user_callback_with_pending_events();
 
                 let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
 
                 // Poll for the next event, returning `nil` if there are none.
                 let ns_event = appkit::NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
-                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
+                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
                     foundation::NSDate::distantPast(cocoa::base::nil),
                     foundation::NSDefaultRunLoopMode,
                     cocoa::base::YES);
@@ -209,48 +138,38 @@ impl EventsLoop {
 
                 match event {
                     // Call the user's callback.
-                    Some(event) => self.shared.user_callback.call_with_event(event),
+                    Some(event) => self.user_callback.call_with_event(event),
                     None => break,
                 }
             }
         }
 
-        self.shared.user_callback.drop();
+        self.user_callback.drop();
     }
 
-    pub fn run_forever<F>(&mut self, mut callback: F)
-        where F: FnMut(Event) -> ControlFlow
+    pub fn run_forever<F>(&self, mut callback: F)
+        where F: FnMut(Event)
     {
+        self.interrupted.store(false, std::sync::atomic::Ordering::Relaxed);
+
         unsafe {
             if !msg_send![cocoa::base::class("NSThread"), isMainThread] {
                 panic!("Events can only be polled from the main thread on macOS");
             }
         }
 
-        // Track whether or not control flow has changed.
-        let control_flow = std::cell::Cell::new(ControlFlow::Continue);
-
-        let mut callback = |event| {
-            if let ControlFlow::Break = callback(event) {
-                control_flow.set(ControlFlow::Break);
-            }
-        };
-
-        self.shared.user_callback.store(&mut callback);
+        self.user_callback.store(&mut callback);
 
         loop {
             unsafe {
                 // First, yield all pending events.
-                self.shared.call_user_callback_with_pending_events();
-                if let ControlFlow::Break = control_flow.get() {
-                    break;
-                }
+                self.call_user_callback_with_pending_events();
 
                 let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
 
                 // Wait for the next event. Note that this function blocks during resize.
                 let ns_event = appkit::NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
-                    NSEventMask::NSAnyEventMask.bits() | NSEventMask::NSEventMaskPressure.bits(),
+                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
                     foundation::NSDate::distantFuture(cocoa::base::nil),
                     foundation::NSDefaultRunLoopMode,
                     cocoa::base::YES);
@@ -262,19 +181,84 @@ impl EventsLoop {
                 let _: () = msg_send![pool, release];
 
                 if let Some(event) = maybe_event {
-                    self.shared.user_callback.call_with_event(event);
-                    if let ControlFlow::Break = control_flow.get() {
-                        break;
-                    }
+                    self.user_callback.call_with_event(event);
                 }
             }
+
+            if self.interrupted.load(std::sync::atomic::Ordering::Relaxed) {
+                self.interrupted.store(false, std::sync::atomic::Ordering::Relaxed);
+                break;
+            }
         }
 
-        self.shared.user_callback.drop();
+        self.user_callback.drop();
+    }
+
+    pub fn interrupt(&self) {
+        self.interrupted.store(true, std::sync::atomic::Ordering::Relaxed);
+
+        // Awaken the event loop by triggering `NSApplicationActivatedEventType`.
+        unsafe {
+            let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
+            let event =
+                NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_(
+                    cocoa::base::nil,
+                    appkit::NSApplicationDefined,
+                    foundation::NSPoint::new(0.0, 0.0),
+                    appkit::NSEventModifierFlags::empty(),
+                    0.0,
+                    0,
+                    cocoa::base::nil,
+                    appkit::NSEventSubtype::NSApplicationActivatedEventType,
+                    0,
+                    0);
+            appkit::NSApp().postEvent_atStart_(event, cocoa::base::NO);
+            foundation::NSAutoreleasePool::drain(pool);
+        }
+    }
+
+    // Removes the window with the given `Id` from the `windows` list.
+    //
+    // This is called when a window is either `Closed` or `Drop`ped.
+    pub fn find_and_remove_window(&self, id: super::window::Id) {
+        if let Ok(mut windows) = self.windows.lock() {
+            windows.retain(|w| match w.upgrade() {
+                Some(w) => w.id() != id,
+                None => true,
+            });
+        }
+    }
+
+    fn call_user_callback_with_pending_events(&self) {
+        loop {
+            let event = match self.pending_events.lock().unwrap().pop_front() {
+                Some(event) => event,
+                None => return,
+            };
+            unsafe {
+                self.user_callback.call_with_event(event);
+            }
+        }
+    }
+
+    // Calls the user callback if one exists.
+    //
+    // Otherwise, stores the event in the `pending_events` queue.
+    //
+    // This is necessary for the case when `WindowDelegate` callbacks are triggered during a call
+    // to the user's callback.
+    pub fn call_user_callback_with_event_or_store_in_pending(&self, event: Event) {
+        if self.user_callback.mutex.lock().unwrap().is_some() {
+            unsafe {
+                self.user_callback.call_with_event(event);
+            }
+        } else {
+            self.pending_events.lock().unwrap().push_back(event);
+        }
     }
 
     // Convert some given `NSEvent` into a winit `Event`.
-    unsafe fn ns_event_to_event(&mut self, ns_event: cocoa::base::id) -> Option<Event> {
+    unsafe fn ns_event_to_event(&self, ns_event: cocoa::base::id) -> Option<Event> {
         if ns_event == cocoa::base::nil {
             return None;
         }
@@ -295,11 +279,14 @@ 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.
-        appkit::NSApp().sendEvent_(ns_event);
+        match event_type {
+            appkit::NSKeyDown => (),
+            _ => appkit::NSApp().sendEvent_(ns_event),
+        }
 
-        let windows = self.shared.windows.lock().unwrap();
+        let windows = self.windows.lock().unwrap();
         let maybe_window = windows.iter()
-            .filter_map(Weak::upgrade)
+            .filter_map(std::sync::Weak::upgrade)
             .find(|window| window_id == window.id());
 
         let into_event = |window_event| Event::WindowEvent {
@@ -309,94 +296,118 @@ impl EventsLoop {
 
         // Returns `Some` window if one of our windows is the key window.
         let maybe_key_window = || windows.iter()
-            .filter_map(Weak::upgrade)
+            .filter_map(std::sync::Weak::upgrade)
             .find(|window| {
                 let is_key_window: cocoa::base::BOOL = msg_send![*window.window, isKeyWindow];
                 is_key_window == cocoa::base::YES
             });
 
         match event_type {
-            appkit::NSFlagsChanged => {
+
+            appkit::NSKeyDown => {
                 let mut events = std::collections::VecDeque::new();
-
-                if let Some(window_event) = modifier_event(
-                    ns_event,
-                    NSEventModifierFlags::NSShiftKeyMask,
-                    self.modifiers.shift_pressed,
-                ) {
-                    self.modifiers.shift_pressed = !self.modifiers.shift_pressed;
+                let received_c_str = foundation::NSString::UTF8String(ns_event.characters());
+                let received_str = std::ffi::CStr::from_ptr(received_c_str);
+                for received_char in std::str::from_utf8(received_str.to_bytes()).unwrap().chars() {
+                    let window_event = WindowEvent::ReceivedCharacter(received_char);
                     events.push_back(into_event(window_event));
                 }
 
-                if let Some(window_event) = modifier_event(
-                    ns_event,
-                    NSEventModifierFlags::NSControlKeyMask,
-                    self.modifiers.ctrl_pressed,
-                ) {
-                    self.modifiers.ctrl_pressed = !self.modifiers.ctrl_pressed;
+                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
+                let state = ElementState::Pressed;
+                let code = NSEvent::keyCode(ns_event) as u8;
+                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
+                events.push_back(into_event(window_event));
+                let event = events.pop_front();
+                self.pending_events.lock().unwrap().extend(events.into_iter());
+                event
+            },
+
+            appkit::NSKeyUp => {
+                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
+
+                let state = ElementState::Released;
+                let code = NSEvent::keyCode(ns_event) as u8;
+                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
+                Some(into_event(window_event))
+            },
+
+            appkit::NSFlagsChanged => {
+                let mut modifiers = self.modifiers.lock().unwrap();
+
+                unsafe fn modifier_event(event: cocoa::base::id,
+                                         keymask: appkit::NSEventModifierFlags,
+                                         key: events::VirtualKeyCode,
+                                         key_pressed: bool) -> Option<WindowEvent>
+                {
+                    if !key_pressed && NSEvent::modifierFlags(event).contains(keymask) {
+                        let state = ElementState::Pressed;
+                        let code = NSEvent::keyCode(event) as u8;
+                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
+                        Some(window_event)
+
+                    } else if key_pressed && !NSEvent::modifierFlags(event).contains(keymask) {
+                        let state = ElementState::Released;
+                        let code = NSEvent::keyCode(event) as u8;
+                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
+                        Some(window_event)
+
+                    } else {
+                        None
+                    }
+                }
+
+                let mut events = std::collections::VecDeque::new();
+                if let Some(window_event) = modifier_event(ns_event,
+                                                           appkit::NSShiftKeyMask,
+                                                           events::VirtualKeyCode::LShift,
+                                                           modifiers.shift_pressed)
+                {
+                    modifiers.shift_pressed = !modifiers.shift_pressed;
                     events.push_back(into_event(window_event));
                 }
 
-                if let Some(window_event) = modifier_event(
-                    ns_event,
-                    NSEventModifierFlags::NSCommandKeyMask,
-                    self.modifiers.win_pressed,
-                ) {
-                    self.modifiers.win_pressed = !self.modifiers.win_pressed;
+                if let Some(window_event) = modifier_event(ns_event,
+                                                           appkit::NSControlKeyMask,
+                                                           events::VirtualKeyCode::LControl,
+                                                           modifiers.ctrl_pressed)
+                {
+                    modifiers.ctrl_pressed = !modifiers.ctrl_pressed;
                     events.push_back(into_event(window_event));
                 }
 
-                if let Some(window_event) = modifier_event(
-                    ns_event,
-                    NSEventModifierFlags::NSAlternateKeyMask,
-                    self.modifiers.alt_pressed,
-                ) {
-                    self.modifiers.alt_pressed = !self.modifiers.alt_pressed;
+                if let Some(window_event) = modifier_event(ns_event,
+                                                           appkit::NSCommandKeyMask,
+                                                           events::VirtualKeyCode::LWin,
+                                                           modifiers.win_pressed)
+                {
+                    modifiers.win_pressed = !modifiers.win_pressed;
+                    events.push_back(into_event(window_event));
+                }
+
+                if let Some(window_event) = modifier_event(ns_event,
+                                                           appkit::NSAlternateKeyMask,
+                                                           events::VirtualKeyCode::LAlt,
+                                                           modifiers.alt_pressed)
+                {
+                    modifiers.alt_pressed = !modifiers.alt_pressed;
                     events.push_back(into_event(window_event));
                 }
 
                 let event = events.pop_front();
-                self.shared.pending_events
-                    .lock()
-                    .unwrap()
-                    .extend(events.into_iter());
+                self.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::NSLeftMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Left))) },
+            appkit::NSLeftMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Left))) },
+            appkit::NSRightMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Right))) },
+            appkit::NSRightMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Right))) },
+            appkit::NSOtherMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Middle))) },
+            appkit::NSOtherMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Middle))) },
 
-            appkit::NSMouseEntered => {
-                let window = match maybe_window.or_else(maybe_key_window) {
-                    Some(window) => window,
-                    None => return None,
-                };
-
-                let window_point = ns_event.locationInWindow();
-                let view_point = if ns_window == cocoa::base::nil {
-                    let ns_size = foundation::NSSize::new(0.0, 0.0);
-                    let ns_rect = foundation::NSRect::new(window_point, ns_size);
-                    let window_rect = window.window.convertRectFromScreen_(ns_rect);
-                    window.view.convertPoint_fromView_(window_rect.origin, cocoa::base::nil)
-                } else {
-                    window.view.convertPoint_fromView_(window_point, cocoa::base::nil)
-                };
-                let view_rect = NSView::frame(*window.view);
-                let 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 event = Event::WindowEvent { window_id: ::WindowId(window.id()), event: window_event };
-
-                self.shared.pending_events.lock().unwrap().push_back(event);
-                Some(into_event(WindowEvent::CursorEntered { device_id: DEVICE_ID }))
-            },
-            appkit::NSMouseExited => { Some(into_event(WindowEvent::CursorLeft { device_id: DEVICE_ID })) },
+            appkit::NSMouseEntered => { Some(into_event(WindowEvent::MouseEntered)) },
+            appkit::NSMouseExited => { Some(into_event(WindowEvent::MouseLeft)) },
 
             appkit::NSMouseMoved |
             appkit::NSLeftMouseDragged |
@@ -422,39 +433,11 @@ impl EventsLoop {
                 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;
-                if delta_x != 0.0 {
-                    let motion_event = DeviceEvent::Motion { axis: 0, value: delta_x };
-                    let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event };
-                    events.push_back(event);
-                }
-
-                let delta_y = (scale_factor * ns_event.deltaY() as f32) as f64;
-                if delta_y != 0.0 {
-                    let motion_event = DeviceEvent::Motion { axis: 1, value: delta_y };
-                    let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event };
-                    events.push_back(event);
-                }
-
-                if delta_x != 0.0 || delta_y != 0.0 {
-                    let motion_event = DeviceEvent::MouseMotion { delta: (delta_x, delta_y) };
-                    let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event };
-                    events.push_back(event);
-                }
-
-                let event = events.pop_front();
-                self.shared.pending_events.lock().unwrap().extend(events.into_iter());
-                event
+                let x = (scale_factor * view_point.x as f32) as i32;
+                let y = (scale_factor * (view_rect.size.height - view_point.y) as f32) as i32;
+                let window_event = WindowEvent::MouseMoved(x, y);
+                let event = Event::WindowEvent { window_id: ::WindowId(window.id()), event: window_event };
+                Some(event)
             },
 
             appkit::NSScrollWheel => {
@@ -474,36 +457,24 @@ impl EventsLoop {
                               scale_factor * ns_event.scrollingDeltaY() as f32)
                 };
                 let phase = match ns_event.phase() {
-                    NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => TouchPhase::Started,
-                    NSEventPhase::NSEventPhaseEnded => TouchPhase::Ended,
+                    appkit::NSEventPhaseMayBegin | appkit::NSEventPhaseBegan => TouchPhase::Started,
+                    appkit::NSEventPhaseEnded => TouchPhase::Ended,
                     _ => TouchPhase::Moved,
                 };
-                self.shared.pending_events.lock().unwrap().push_back(Event::DeviceEvent {
-                    device_id: DEVICE_ID,
-                    event: DeviceEvent::MouseWheel {
-                        delta: if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
-                            PixelDelta(ns_event.scrollingDeltaX() as f32,
-                                       ns_event.scrollingDeltaY() as f32)
-                        } else {
-                            LineDelta(ns_event.scrollingDeltaX() as f32,
-                                      ns_event.scrollingDeltaY() as f32)
-                        },
-                    }
-                });
-                let window_event = WindowEvent::MouseWheel { device_id: DEVICE_ID, delta: delta, phase: phase, modifiers: event_mods(ns_event) };
+                let window_event = WindowEvent::MouseWheel(delta, phase);
                 Some(into_event(window_event))
             },
 
             appkit::NSEventTypePressure => {
                 let pressure = ns_event.pressure();
                 let stage = ns_event.stage();
-                let window_event = WindowEvent::TouchpadPressure { device_id: DEVICE_ID, pressure: pressure, stage: stage };
+                let window_event = WindowEvent::TouchpadPressure(pressure, stage);
                 Some(into_event(window_event))
             },
 
             appkit::NSApplicationDefined => match ns_event.subtype() {
                 appkit::NSEventSubtype::NSApplicationActivatedEventType => {
-                    Some(Event::Awakened)
+                    Some(into_event(WindowEvent::Awakened))
                 },
                 _ => None,
             },
@@ -512,37 +483,10 @@ impl EventsLoop {
         }
     }
 
-    pub fn create_proxy(&self) -> Proxy {
-        Proxy {}
-    }
-
 }
 
-impl Proxy {
-    pub fn wakeup(&self) -> Result<(), EventsLoopClosed> {
-        // Awaken the event loop by triggering `NSApplicationActivatedEventType`.
-        unsafe {
-            let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
-            let event =
-                NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_(
-                    cocoa::base::nil,
-                    appkit::NSApplicationDefined,
-                    foundation::NSPoint::new(0.0, 0.0),
-                    appkit::NSEventModifierFlags::empty(),
-                    0.0,
-                    0,
-                    cocoa::base::nil,
-                    appkit::NSEventSubtype::NSApplicationActivatedEventType,
-                    0,
-                    0);
-            appkit::NSApp().postEvent_atStart_(event, cocoa::base::NO);
-            foundation::NSAutoreleasePool::drain(pool);
-        }
-        Ok(())
-    }
-}
 
-pub fn to_virtual_key_code(code: c_ushort) -> Option<events::VirtualKeyCode> {
+fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
     Some(match code {
         0x00 => events::VirtualKeyCode::A,
         0x01 => events::VirtualKeyCode::S,
@@ -673,47 +617,18 @@ pub fn to_virtual_key_code(code: c_ushort) -> Option<events::VirtualKeyCode> {
         0x7e => events::VirtualKeyCode::Up,
         //0x7f =>  unkown,
 
-        0xa => events::VirtualKeyCode::Caret,
         _ => return None,
     })
 }
 
-pub fn event_mods(event: cocoa::base::id) -> ModifiersState {
+fn event_mods(event: cocoa::base::id) -> ModifiersState {
     let flags = unsafe {
         NSEvent::modifierFlags(event)
     };
     ModifiersState {
-        shift: flags.contains(NSEventModifierFlags::NSShiftKeyMask),
-        ctrl: flags.contains(NSEventModifierFlags::NSControlKeyMask),
-        alt: flags.contains(NSEventModifierFlags::NSAlternateKeyMask),
-        logo: flags.contains(NSEventModifierFlags::NSCommandKeyMask),
+        shift: flags.contains(appkit::NSShiftKeyMask),
+        ctrl: flags.contains(appkit::NSControlKeyMask),
+        alt: flags.contains(appkit::NSAlternateKeyMask),
+        logo: flags.contains(appkit::NSCommandKeyMask),
     }
 }
-
-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.
-pub const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);

src/platform/macos/ffi.rs

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

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

src/platform/macos/monitor.rs

@@ -1,119 +1,50 @@
-use cocoa::appkit::NSScreen;
-use cocoa::base::{id, nil};
-use cocoa::foundation::{NSString, NSUInteger};
-use core_graphics::display::{CGDirectDisplayID, CGDisplay, CGDisplayBounds};
+use core_graphics::display;
 use std::collections::VecDeque;
-use std::fmt;
-use super::EventsLoop;
-use super::window::IdRef;
+use native_monitor::NativeMonitorId;
 
-#[derive(Clone, PartialEq)]
-pub struct MonitorId(CGDirectDisplayID);
+#[derive(Clone)]
+pub struct MonitorId(u32);
 
-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));
-            }
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    let mut monitors = VecDeque::new();
+    unsafe {
+        let max_displays = 10u32;
+        let mut active_displays = [0u32; 10];
+        let mut display_count = 0;
+        display::CGGetActiveDisplayList(max_displays, &mut active_displays[0], &mut display_count);
+        for i in 0..display_count as usize {
+            monitors.push_back(MonitorId(active_displays[i]));
         }
-        monitors
-    }
-
-    #[inline]
-    pub fn get_primary_monitor(&self) -> MonitorId {
-        let id = MonitorId(CGDisplay::main().id);
-        id
-    }
-
-    pub fn make_monitor_from_display(id: CGDirectDisplayID) -> MonitorId {
-        let id = MonitorId(id);
-        id
     }
+    monitors
 }
 
-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: (u32, u32),
-            position: (i32, i32),
-            hidpi_factor: f32,
-        }
-
-        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)
-    }
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    let id = unsafe { MonitorId(display::CGMainDisplayID()) };
+    id
 }
 
 impl MonitorId {
     pub fn get_name(&self) -> Option<String> {
         let MonitorId(display_id) = *self;
-        let screen_num = CGDisplay::new(display_id).model_number();
+        let screen_num = unsafe { display::CGDisplayModelNumber(display_id) };
         Some(format!("Monitor #{}", screen_num))
     }
 
     #[inline]
-    pub fn get_native_identifier(&self) -> u32 {
-        self.0
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        let MonitorId(display_id) = *self;
+        NativeMonitorId::Numeric(display_id)
     }
 
     pub fn get_dimensions(&self) -> (u32, u32) {
         let MonitorId(display_id) = *self;
-        let display = CGDisplay::new(display_id);
-        let dimension = {
-            let height = display.pixels_high();
-            let width = display.pixels_wide();
+        let dimension = unsafe {
+            let height = display::CGDisplayPixelsHigh(display_id);
+            let width = display::CGDisplayPixelsWide(display_id);
             (width as u32, height as u32)
         };
         dimension
     }
-
-    #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        let bounds = unsafe { CGDisplayBounds(self.get_native_identifier()) };
-        (bounds.origin.x as i32, bounds.origin.y as i32)
-    }
-
-    pub fn get_hidpi_factor(&self) -> f32 {
-        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 }
-    }
-
-    pub(crate) fn get_nsscreen(&self) -> Option<id> {
-        unsafe {
-            let native_id = self.get_native_identifier();
-            let screens = NSScreen::screens(nil);
-            let count: NSUInteger = msg_send![screens, count];
-            let key = IdRef::new(NSString::alloc(nil).init_str("NSScreenNumber"));
-            let mut matching_screen: Option<id> = None;
-            for i in 0..count {
-                let screen = msg_send![screens, objectAtIndex: i as NSUInteger];
-                let device_description = NSScreen::deviceDescription(screen);
-                let value: id = msg_send![device_description, objectForKey:*key];
-                if value != nil {
-                    let screen_number: NSUInteger = msg_send![value, unsignedIntegerValue];
-                    if screen_number as u32 == native_id {
-                        matching_screen = Some(screen);
-                        break;
-                    }
-                }
-            }
-            matching_screen
-        }
-    }
 }

src/platform/macos/util.rs

@@ -1,38 +0,0 @@
-use cocoa::appkit::NSWindowStyleMask;
-use cocoa::base::{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) -> i32 {
-    (CGDisplay::main().pixels_high() as f64 - (rect.origin.y + rect.size.height)) as _
-}
-
-pub unsafe fn set_style_mask(window: id, view: id, mask: NSWindowStyleMask) {
-    use cocoa::appkit::NSWindow;
-    window.setStyleMask_(mask);
-    // If we don't do this, key handling will break. Therefore, never call `setStyleMask` directly!
-    window.makeFirstResponder_(view);
-}
-
-pub unsafe fn create_input_context(view: id) -> IdRef {
-    let input_context: id = msg_send![class("NSTextInputContext"), alloc];
-    let input_context: id = msg_send![input_context, initWithClient:view];
-    IdRef::new(input_context)
-}
-
-#[allow(dead_code)]
-pub unsafe fn open_emoji_picker() {
-    let app: id = msg_send![class("NSApplication"), sharedApplication];
-    let _: () = msg_send![app, orderFrontCharacterPalette:nil];
-}

src/platform/macos/view.rs

@@ -1,450 +0,0 @@
-// This is a pretty close port of the implementation in GLFW:
-// https://github.com/glfw/glfw/blob/7ef34eb06de54dd9186d3d21a401b2ef819b59e7/src/cocoa_window.m
-
-use std::{slice, str};
-use std::boxed::Box;
-use std::collections::VecDeque;
-use std::os::raw::*;
-use std::sync::Weak;
-
-use cocoa::base::{class, id, nil};
-use cocoa::appkit::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, 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<(i32, i32)>,
-    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: i32, y: i32) {
-    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 i32;
-        let base_y = (content_rect.origin.y + content_rect.size.height) as i32;
-        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_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 as i32, y as i32)
-        });
-
-        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);
-                }
-            }
-        }
-
-        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];
-        }
-    }
-}

src/platform/mod.rs

@@ -15,11 +15,8 @@ mod platform;
 #[cfg(target_os = "ios")]
 #[path="ios/mod.rs"]
 mod platform;
-#[cfg(target_os = "emscripten")]
-#[path="emscripten/mod.rs"]
-mod platform;
 
 #[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
   not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
-  not(target_os = "freebsd"), not(target_os = "openbsd"), not(target_os = "emscripten")))]
-compile_error!("The platform you're compiling for is not supported by winit");
+  not(target_os = "freebsd"), not(target_os = "openbsd")))]
+use this_platform_is_not_supported;

src/platform/windows/callback.rs

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

src/platform/windows/event.rs

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

src/platform/windows/icon.rs

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

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

src/platform/windows/mod.rs

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

src/platform/windows/monitor.rs

@@ -1,165 +1,186 @@
-use winapi::ctypes::wchar_t;
-use winapi::shared::minwindef::{DWORD, LPARAM, BOOL, TRUE};
-use winapi::shared::windef::{HMONITOR, HDC, LPRECT, HWND};
-use winapi::um::winuser;
+use winapi;
+use user32;
 
 use std::collections::VecDeque;
-use std::{mem, ptr};
+use std::mem;
 
-use super::{EventsLoop, util};
+use native_monitor::NativeMonitorId;
 
 /// Win32 implementation of the main `MonitorId` object.
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct MonitorId {
     /// The system name of the adapter.
-    adapter_name: [wchar_t; 32],
-
-    /// Monitor handle.
-    hmonitor: HMonitor,
+    adapter_name: [winapi::WCHAR; 32],
 
     /// The system name of the monitor.
     monitor_name: String,
 
+    /// Name to give to the user.
+    readable_name: String,
+
+    /// See the `StateFlags` element here:
+    /// http://msdn.microsoft.com/en-us/library/dd183569(v=vs.85).aspx
+    flags: winapi::DWORD,
+
     /// True if this is the primary monitor.
     primary: bool,
 
     /// The position of the monitor in pixels on the desktop.
     ///
-    /// A window that is positioned at these coordinates will overlap the monitor.
-    position: (i32, i32),
+    /// A window that is positionned at these coordinates will overlap the monitor.
+    position: (u32, u32),
 
     /// The current resolution in pixels on the monitor.
     dimensions: (u32, u32),
-
-    /// DPI scaling factor.
-    hidpi_factor: f32,
 }
 
-// Send is not implemented for HMONITOR, we have to wrap it and implement it manually.
-// For more info see:
-// https://github.com/retep998/winapi-rs/issues/360
-// https://github.com/retep998/winapi-rs/issues/396
-#[derive(Debug, Clone)]
-struct HMonitor(HMONITOR);
-
-unsafe impl Send for HMonitor {}
-
-unsafe extern "system" fn monitor_enum_proc(hmonitor: HMONITOR, _: HDC, 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;
-    }
-
-    (*monitors).push_back(MonitorId {
-        adapter_name: monitor_info.szDevice,
-        hmonitor: HMonitor(hmonitor),
-        monitor_name: util::wchar_to_string(&monitor_info.szDevice),
-        primary: monitor_info.dwFlags & winuser::MONITORINFOF_PRIMARY != 0,
-        position,
-        dimensions,
-        hidpi_factor: 1.0,
-    });
-
-    // TRUE means continue enumeration.
-    TRUE
+struct DeviceEnumerator {
+    parent_device: *const winapi::WCHAR,
+    current_index: u32,
 }
 
-impl EventsLoop {
-    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
+impl DeviceEnumerator {
+    fn adapters() -> DeviceEnumerator {
+        use std::ptr;
+        DeviceEnumerator {
+            parent_device: ptr::null(),
+            current_index: 0
         }
     }
 
-    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;
+    fn monitors(adapter_name: *const winapi::WCHAR) -> DeviceEnumerator {
+        DeviceEnumerator {
+            parent_device: adapter_name,
+            current_index: 0
+        }
+    }
+}
 
-            let hmonitor = winuser::MonitorFromWindow(handle, winuser::MONITOR_DEFAULTTONEAREST);
+impl Iterator for DeviceEnumerator {
+    type Item = winapi::DISPLAY_DEVICEW;
+    fn next(&mut self) -> Option<winapi::DISPLAY_DEVICEW> {
+        use std::mem;
+        loop {
+            let mut output: winapi::DISPLAY_DEVICEW = unsafe { mem::zeroed() };
+            output.cb = mem::size_of::<winapi::DISPLAY_DEVICEW>() as winapi::DWORD;
 
-            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: util::wchar_to_string(&monitor_info.szDevice),
-                primary: monitor_info.dwFlags & winuser::MONITORINFOF_PRIMARY != 0,
-                position,
-                dimensions,
-                hidpi_factor: 1.0,
+            if unsafe { user32::EnumDisplayDevicesW(self.parent_device,
+                self.current_index as winapi::DWORD, &mut output, 0) } == 0
+            {
+                // the device doesn't exist, which means we have finished enumerating
+                break;
             }
-        }
-    }
+            self.current_index += 1;
 
-    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;
+            if  (output.StateFlags & winapi::DISPLAY_DEVICE_ACTIVE) == 0 ||
+                (output.StateFlags & winapi::DISPLAY_DEVICE_MIRRORING_DRIVER) != 0
+            {
+                // the device is not active
+                // the Win32 api usually returns a lot of inactive devices
+                continue;
             }
-        }
 
-        panic!("Failed to find the primary monitor")
+            return Some(output);
+        }
+        None
     }
 }
 
+fn wchar_as_string(wchar: &[winapi::WCHAR]) -> String {
+    String::from_utf16_lossy(wchar)
+        .trim_right_matches(0 as char)
+        .to_string()
+}
+
+/// Win32 implementation of the main `get_available_monitors` function.
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    // return value
+    let mut result = VecDeque::new();
+
+    for adapter in DeviceEnumerator::adapters() {
+        // getting the position
+        let (position, dimensions) = unsafe {
+            let mut dev: winapi::DEVMODEW = mem::zeroed();
+            dev.dmSize = mem::size_of::<winapi::DEVMODEW>() as winapi::WORD;
+
+            if user32::EnumDisplaySettingsExW(adapter.DeviceName.as_ptr(), 
+                winapi::ENUM_CURRENT_SETTINGS,
+                &mut dev, 0) == 0
+            {
+                continue;
+            }
+
+            let point: &winapi::POINTL = mem::transmute(&dev.union1);
+            let position = (point.x as u32, point.y as u32);
+
+            let dimensions = (dev.dmPelsWidth as u32, dev.dmPelsHeight as u32);
+
+            (position, dimensions)
+        };
+
+        for (num, monitor) in DeviceEnumerator::monitors(adapter.DeviceName.as_ptr()).enumerate() {
+            // adding to the resulting list
+            result.push_back(MonitorId {
+                adapter_name: adapter.DeviceName,
+                monitor_name: wchar_as_string(&monitor.DeviceName),
+                readable_name: wchar_as_string(&monitor.DeviceString),
+                flags: monitor.StateFlags,
+                primary: (adapter.StateFlags & winapi::DISPLAY_DEVICE_PRIMARY_DEVICE) != 0 &&
+                         num == 0,
+                position: position,
+                dimensions: dimensions,
+            });
+        }
+    }
+    result
+}
+
+/// Win32 implementation of the main `get_primary_monitor` function.
+pub fn get_primary_monitor() -> MonitorId {
+    // we simply get all available monitors and return the one with the `PRIMARY_DEVICE` flag
+    // TODO: it is possible to query the win32 API for the primary monitor, this should be done
+    //  instead
+    for monitor in get_available_monitors().into_iter() {
+        if monitor.primary {
+            return monitor;
+        }
+    }
+
+    panic!("Failed to find the primary monitor")
+}
+
 impl MonitorId {
     /// See the docs if the crate root file.
     #[inline]
     pub fn get_name(&self) -> Option<String> {
-        Some(self.monitor_name.clone())
+        Some(self.readable_name.clone())
     }
 
     /// See the docs of the crate root file.
     #[inline]
-    pub fn get_native_identifier(&self) -> String {
-        self.monitor_name.clone()
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Name(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.
+    /// See the docs if the crate root file.
     #[inline]
     pub fn get_dimensions(&self) -> (u32, u32) {
-        // TODO: retrieve the dimensions every time this is called
+        // TODO: retreive the dimensions every time this is called
         self.dimensions
     }
 
-    /// A window that is positioned at these coordinates will overlap the monitor.
+    /// This is a Win32-only function for `MonitorId` that returns the system name of the adapter
+    /// device.
     #[inline]
-    pub fn get_position(&self) -> (i32, i32) {
-        self.position
+    pub fn get_adapter_name(&self) -> &[winapi::WCHAR] {
+        &self.adapter_name
     }
 
+    /// This is a Win32-only function for `MonitorId` that returns the position of the
+    ///  monitor on the desktop.
+    /// A window that is positionned at these coordinates will overlap the monitor.
     #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        self.hidpi_factor
+    pub fn get_position(&self) -> (u32, u32) {
+        self.position
     }
 }

src/platform/windows/raw_input.rs

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

@@ -1,82 +0,0 @@
-use std::{self, mem, ptr};
-use std::ops::BitAnd;
-
-use winapi::ctypes::wchar_t;
-use winapi::shared::minwindef::DWORD;
-use winapi::shared::windef::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,
-};
-
-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)
-        .trim_right_matches(0 as char)
-        .to_string()
-}
-
-// 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

@@ -3,11 +3,11 @@ use std::collections::vec_deque::IntoIter as VecDequeIter;
 use CreationError;
 use CursorState;
 use EventsLoop;
-use Icon;
 use MouseCursor;
 use Window;
 use WindowBuilder;
 use WindowId;
+use native_monitor::NativeMonitorId;
 
 use libc;
 use platform;
@@ -30,7 +30,7 @@ impl WindowBuilder {
         self.window.dimensions = Some((width, height));
         self
     }
-
+    
     /// Sets a minimum dimension size for the window
     ///
     /// Width and height are in pixels.
@@ -56,18 +56,13 @@ impl WindowBuilder {
         self
     }
 
-    /// Sets the window fullscreen state. None means a normal window, Some(MonitorId)
-    /// means a fullscreen window on that specific monitor
+    /// Requests fullscreen mode.
+    ///
+    /// If you don't specify dimensions for the window, it will match the monitor's.
     #[inline]
-    pub fn with_fullscreen(mut self, monitor: Option<MonitorId>) -> WindowBuilder {
-        self.window.fullscreen = monitor;
-        self
-    }
-
-    /// Requests maximized mode.
-    #[inline]
-    pub fn with_maximized(mut self, maximized: bool) -> WindowBuilder {
-        self.window.maximized = maximized;
+    pub fn with_fullscreen(mut self, monitor: MonitorId) -> WindowBuilder {
+        let MonitorId(monitor) = monitor;
+        self.window.monitor = Some(monitor);
         self
     }
 
@@ -92,32 +87,7 @@ 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.
+    /// Enables multitouch
     #[inline]
     pub fn with_multitouch(mut self) -> WindowBuilder {
         self.window.multitouch = true;
@@ -129,27 +99,25 @@ impl WindowBuilder {
     /// Error should be very rare and only occur in case of permission denied, incompatible system,
     /// out of memory, etc.
     pub fn build(mut self, events_loop: &EventsLoop) -> Result<Window, CreationError> {
-        self.window.dimensions = Some(self.window.dimensions.unwrap_or_else(|| {
-            if let Some(ref monitor) = self.window.fullscreen {
-                // resizing the window to the dimensions of the monitor when fullscreen
-                monitor.get_dimensions()
-            } else {
-                // default dimensions
-                (1024, 768)
-            }
-        }));
+        // resizing the window to the dimensions of the monitor when fullscreen
+        if self.window.dimensions.is_none() && self.window.monitor.is_some() {
+            self.window.dimensions = Some(self.window.monitor.as_ref().unwrap().get_dimensions())
+        }
+
+        // default dimensions
+        if self.window.dimensions.is_none() {
+            self.window.dimensions = Some((1024, 768));
+        }
 
         // building
-        platform::Window::new(
-            &events_loop.events_loop,
-            self.window,
-            self.platform_specific,
-        ).map(|window| Window { window })
+        let w = try!(platform::Window2::new(events_loop.events_loop.clone(), &self.window, &self.platform_specific));
+
+        Ok(Window { window: w })
     }
 }
 
 impl Window {
-    /// Creates a new Window for platforms where this is appropriate.
+    /// Creates a new OpenGL context, and a Window for platforms where this is appropriate.
     ///
     /// This function is equivalent to `WindowBuilder::new().build(events_loop)`.
     ///
@@ -207,18 +175,9 @@ impl Window {
         self.window.get_position()
     }
 
-    /// Returns the position of the top-left hand corner of the window's client area relative to the
-    /// top-left hand corner of the desktop.
-    ///
-    /// The same conditions that apply to `get_position` apply to this method.
-    #[inline]
-    pub fn get_inner_position(&self) -> Option<(i32, i32)> {
-        self.window.get_inner_position()
-    }
-
     /// Modifies the position of the window.
     ///
-    /// See `get_position` for more information about the coordinates.
+    /// See `get_position` for more informations about the coordinates.
     ///
     /// This is a no-op if the window has already been closed.
     #[inline]
@@ -226,17 +185,6 @@ impl Window {
         self.window.set_position(x, y)
     }
 
-    /// 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 that need to be supplied to `glViewport`.
-    ///
-    /// Returns `None` if the window no longer exists.
-    #[inline]
-    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
-        self.window.get_inner_size()
-    }
-
     /// Returns the size in points of the client area of the window.
     ///
     /// The client area is the content of the window, excluding the title bar and borders.
@@ -246,13 +194,21 @@ impl Window {
     ///
     /// 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)
-        })
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        self.window.get_inner_size()
     }
+    
+    /// Returns the size in points of the client area of the window.
+    ///
+    /// The client area is the content of the window, excluding the title bar and borders.
+    /// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
+    ///
+    /// Returns `None` if the window no longer exists.
+    #[inline]
+    pub fn get_inner_size_points(&self) -> Option<(u32, u32)> {
+        self.window.get_inner_size()
+    }
+
 
     /// Returns the size in pixels of the client area of the window.
     ///
@@ -261,12 +217,12 @@ impl Window {
     ///  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()
+        self.window.get_inner_size().map(|(x, y)| {
+            let hidpi = self.hidpi_factor();
+            ((x as f32 * hidpi) as u32, (y as f32 * hidpi) as u32)
+        })
     }
 
     /// Returns the size in pixels of the window.
@@ -282,7 +238,7 @@ impl Window {
 
     /// Modifies the inner size of the window.
     ///
-    /// See `get_inner_size` for more information about the values.
+    /// See `get_inner_size` for more informations about the values.
     ///
     /// This is a no-op if the window has already been closed.
     #[inline]
@@ -290,22 +246,6 @@ impl Window {
         self.window.set_inner_size(x, y)
     }
 
-    /// 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)>) {
-        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)>) {
-        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.
@@ -344,7 +284,7 @@ impl Window {
         self.window.set_cursor_position(x, y)
     }
 
-    /// Sets how winit handles the cursor. See the documentation of `CursorState` for details.
+    /// Sets how glutin handles the cursor. See the documentation of `CursorState` for details.
     ///
     /// Has no effect on Android.
     #[inline]
@@ -352,54 +292,6 @@ impl Window {
         self.window.set_cursor_state(state)
     }
 
-    /// Sets the window to maximized or back
-    #[inline]
-    pub fn set_maximized(&self, maximized: bool) {
-        self.window.set_maximized(maximized)
-    }
-
-    /// Sets the window to fullscreen or back
-    #[inline]
-    pub fn set_fullscreen(&self, monitor: Option<MonitorId>) {
-        self.window.set_fullscreen(monitor)
-    }
-
-    /// Turn window decorations on or off.
-    #[inline]
-    pub fn set_decorations(&self, decorations: bool) {
-        self.window.set_decorations(decorations)
-    }
-
-    /// Change whether or not the window will always be on top of other windows.
-    #[inline]
-    pub fn set_always_on_top(&self, always_on_top: bool) {
-        self.window.set_always_on_top(always_on_top)
-    }
-
-    /// Sets the window icon. On Windows and X11, this is typically the small icon in the top-left
-    /// corner of the titlebar.
-    ///
-    /// For more usage notes, see `WindowBuilder::with_window_icon`.
-    ///
-    /// ## Platform-specific
-    ///
-    /// This only has an effect on Windows and X11.
-    #[inline]
-    pub fn set_window_icon(&self, window_icon: Option<Icon>) {
-        self.window.set_window_icon(window_icon)
-    }
-
-    /// Sets location of IME candidate box in client area coordinates relative to the top left.
-    #[inline]
-    pub fn set_ime_spot(&self, x: i32, y: i32) {
-        self.window.set_ime_spot(x, y)
-    }
-
-    /// Returns the monitor on which the window currently resides
-    pub fn get_current_monitor(&self) -> MonitorId {
-        self.window.get_current_monitor()
-    }
-
     #[inline]
     pub fn id(&self) -> WindowId {
         WindowId(self.window.id())
@@ -407,10 +299,10 @@ 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.
+// Implementation note: we retreive the list once, then serve each element by one by one.
 // This may change in the future.
 pub struct AvailableMonitorsIter {
-    pub(crate) data: VecDequeIter<platform::MonitorId>,
+    data: VecDequeIter<platform::MonitorId>,
 }
 
 impl Iterator for AvailableMonitorsIter {
@@ -418,7 +310,7 @@ impl Iterator for AvailableMonitorsIter {
 
     #[inline]
     fn next(&mut self) -> Option<MonitorId> {
-        self.data.next().map(|id| MonitorId { inner: id })
+        self.data.next().map(|id| MonitorId(id))
     }
 
     #[inline]
@@ -427,37 +319,41 @@ impl Iterator for AvailableMonitorsIter {
     }
 }
 
-/// Identifier for a monitor.
-#[derive(Debug, Clone)]
-pub struct MonitorId {
-    pub(crate) inner: platform::MonitorId
+/// Returns the list of all available monitors.
+#[inline]
+pub fn get_available_monitors() -> AvailableMonitorsIter {
+    let data = platform::get_available_monitors();
+    AvailableMonitorsIter{ data: data.into_iter() }
 }
 
+/// Returns the primary monitor of the system.
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    MonitorId(platform::get_primary_monitor())
+}
+
+/// Identifier for a monitor.
+pub struct MonitorId(platform::MonitorId);
+
 impl MonitorId {
     /// Returns a human-readable name of the monitor.
-    ///
-    /// Returns `None` if the monitor doesn't exist anymore.
     #[inline]
     pub fn get_name(&self) -> Option<String> {
-        self.inner.get_name()
+        let &MonitorId(ref id) = self;
+        id.get_name()
+    }
+
+    /// Returns the native platform identifier for this monitor.
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        let &MonitorId(ref id) = self;
+        id.get_native_identifier()
     }
 
     /// Returns the number of pixels currently displayed on the monitor.
     #[inline]
     pub fn get_dimensions(&self) -> (u32, u32) {
-        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) {
-        self.inner.get_position()
-    }
-
-    /// Returns the ratio between the monitor's physical pixels and logical pixels.
-    #[inline]
-    pub fn get_hidpi_factor(&self) -> f32 {
-        self.inner.get_hidpi_factor()
+        let &MonitorId(ref id) = self;
+        id.get_dimensions()
     }
 }

tests/events_loop.rs

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

tests/send_objects.rs

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

tests/sync_object.rs

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

tests/window_proxy_send.rs

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