Publish 0.6.4

Set WM_CLASS and WM_NAME before mapping window
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.
2026-06-27 07:03:15 -04:00 · 2017-05-07 20:36:22 +02:00 · 2017-05-07 20:34:50 +02:00
336 changed files with 10131 additions and 64993 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,9 +0,0 @@
-# Allow rust-analyzer and local `cargo doc` invocations to pick up unreleased changelog entries
-#
-# Note that these flags are (intentionally) not included when building from the downloaded crate.
-[build]
-rustdocflags = ["--cfg=unreleased_changelogs"]
-rustflags = ["--cfg=unreleased_changelogs"]
-
-[target.wasm32-unknown-unknown]
-runner = "wasm-bindgen-test-runner"
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,8 +0,0 @@
-# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-# chore(rustfmt): use nightly
-7b0c7b6cb2c62767ca0c73c857b299883f55a883
-# Rustfmt: use `group_imports`
-2665c120981af548433645c6383b3580dd8f8fc4
-# Use Taplo for TOML formatting
-3398ebe467c43ccfd91916c5b81ff3c68f598556
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,26 +0,0 @@
-# Android
-/winit-android                      @MarijnS95
-
-# Apple (AppKit + UIKit)
-/winit-appkit                       @madsmtm
-/winit-uikit                        @madsmtm
-/winit-common/src/core_foundation   @madsmtm
-/winit-common/src/event_handler.rs  @madsmtm
-
-# XKB
-/winit-common/src/xkb               @kchibisov
-
-# Wayland
-/winit-wayland                      @kchibisov
-
-# X11
-/winit-x11                          @kchibisov
-
-# Web
-/winit-web                          @daxpedda
-
-# Windows (Win32) (UNOWNED)
-#/winit-win32                       
-
-# Orbital (Redox OS)
-/winit-orbital                      @jackpot51
--- a/.github/ISSUE_TEMPLATE/blank_issue.md
+++ b/.github/ISSUE_TEMPLATE/blank_issue.md
@@ -1,4 +0,0 @@
---
-name: Blank Issue
-about: Create a blank issue.
---
--- a/.github/ISSUE_TEMPLATE/bug_android.yml
+++ b/.github/ISSUE_TEMPLATE/bug_android.yml
@@ -1,36 +0,0 @@
-name: Android bug
-description: Create an Android-specific bug report
-labels:
-  - B - bug
-  - DS - android
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: device
-    attributes:
-      label: Device and Android version
-      description: Which devices and Android versions are you seeing the problem on?
-      placeholder: |
-        Samsung Galaxy Z running Android Pie (API level 28),
-        Samsung Galaxy Z running Android 14 (API level 34),
-        Pixel 8 running Android 14 (API level 34)
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_ios.yml
+++ b/.github/ISSUE_TEMPLATE/bug_ios.yml
@@ -1,37 +0,0 @@
-name: iOS bug
-description: Create an iOS-specific bug report
-labels:
-  - B - bug
-  - DS - ios
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: device
-    attributes:
-      label: Device and iOS version
-      description: Which devices and iOS versions are you seeing the problem on?
-      placeholder: |
-        iPhone 15 running iOS 14.0,
-        iPhone 15 running iOS 17.0,
-        MacBook Pro M2 Mac Catalyst running macOS 14.2,
-        iPhone simulator running iOS 17.0
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_macos.yml
+++ b/.github/ISSUE_TEMPLATE/bug_macos.yml
@@ -1,37 +0,0 @@
-name: MacOS bug
-description: Create a macOS-specific bug report
-labels:
-  - B - bug
-  - DS - macos
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: os-version
-    attributes:
-      label: macOS version
-      description: What version of macOS are you using? Please paste in the output of `sw_vers`.
-      placeholder: |
-        ProductName:            macOS
-        ProductVersion:         14.2.1
-        BuildVersion:           23C71
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_wayland.yml
+++ b/.github/ISSUE_TEMPLATE/bug_wayland.yml
@@ -1,41 +0,0 @@
-name: Wayland bug
-description: Create a Wayland-specific bug report
-labels:
-  - B - bug
-  - DS - wayland
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: debug
-    attributes:
-      label: Debugging output
-      description: Output of a binary run with `WAYLAND_DEBUG=1`
-      placeholder: |
-        [1234.5678]  -> wl_display@1.get_registry(new id wl_registry@2)
-        [1234.5678]  -> wl_display@1.sync(new id wl_callback@3)
-        ...
-      render: shell
-  - type: checkboxes
-    attributes:
-      label: Window isn't shown unless you draw
-      options:
-        - label: I understand that windows aren't shown on Wayland unless I draw and present to them.
-          required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_web.yml
+++ b/.github/ISSUE_TEMPLATE/bug_web.yml
@@ -1,51 +0,0 @@
-name: Web bug
-description: Create a Web-specific bug report
-labels:
-  - B - bug
-  - DS - web
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: Tested browsers
-      description: What browsers are you seeing the problem on?
-      options:
-        - Firefox
-        - Chrome
-        - Microsoft Edge
-        - Safari 13
-        - Safari 14
-        - Safari 15
-        - Safari 16
-        - Safari 17
-        - Safari (newer than listed)
-      multiple: true
-    validations:
-      required: true
-  - type: textarea
-    id: device
-    attributes:
-      label: Tested devices
-      description: Which device(s) are you using?
-      placeholder: 'iPhone 15, Lenovo ThinkPad X1, MacBook Pro M2, Samsung Galaxy Z, ...'
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_windows.yml
+++ b/.github/ISSUE_TEMPLATE/bug_windows.yml
@@ -1,35 +0,0 @@
-name: Windows bug
-description: Create a Windows-specific bug report
-labels:
-  - B - bug
-  - DS - windows
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: os-version
-    attributes:
-      label: Windows version
-      description: What version of Windows are you using? Please paste in the output of the `ver` command.
-      placeholder: |
-        Microsoft Windows [Version 10.0.19042.2251]
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/bug_x11.yml
+++ b/.github/ISSUE_TEMPLATE/bug_x11.yml
@@ -1,32 +0,0 @@
-name: X11 bug
-description: Create a X11-specific bug report
-labels:
-  - B - bug
-  - DS - x11
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem you're having
-    validations:
-      required: true
-  - type: textarea
-    id: os-info
-    attributes:
-      label: OS and window mananger
-      description: Which operating system and window manager are you using?
-    validations:
-      required: true
-  - type: textarea
-    id: winit-version
-    attributes:
-      label: Winit version
-      description: What version of Winit are you using?
-      placeholder: 0.29.11
-    validations:
-      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Question
-    url: https://matrix.to/#/#rust-windowing:matrix.org
-    about: Please ask questions on the Matrix channel.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,26 +0,0 @@
-name: Feature request
-description: Propose a new feature
-labels:
-  - S - enhancement
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the problem does this solve or what need does it fill? Please be mindful of the [scope](https://github.com/rust-windowing/winit/blob/master/FEATURES.md) of Winit.
-    validations:
-      required: true
-  - type: dropdown
-    id: platforms
-    attributes:
-      label: Relevant platforms
-      description: On which platforms is this feature relevant?
-      options:
-        - Windows
-        - macOS
-        - Wayland
-        - X11
-        - Web
-        - iOS
-        - Android
-      multiple: true
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +0,0 @@
- [ ] Tested on all platforms changed
- [ ] Added an entry to the `changelog` module if knowledge of this change could be valuable to users
- [ ] Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
- [ ] Created or updated an example program if it would help users understand this functionality
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -1,22 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-        interval: daily
-    groups:
-        github-actions:
-            patterns:
-                - "*"
-
-  - package-ecosystem: npm
-    directory: src/platform_impl/web/script
-    schedule:
-        interval: daily
-    groups:
-        github-actions:
-            patterns:
-                - '*'
-    labels:
-        - "DS - web"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,351 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-    branches: [master]
-
-jobs:
-  fmt:
-    name: Check formatting
-    runs-on: ubuntu-latest
-    steps:
-    - uses: taiki-e/checkout-action@v1
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        components: rustfmt
-    - name: Check Formatting
-      run: cargo fmt -- --check
-
-  taplo:
-    name: Taplo
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: taiki-e/checkout-action@v1
-      - name: Install Taplo
-        uses: taiki-e/install-action@v2
-        with:
-          tool: taplo-cli
-      - name: Run Taplo
-        run: taplo fmt --check
-
-  typos:
-    name: Check for typos
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: taiki-e/checkout-action@v1
-      - uses: taiki-e/install-action@v2
-        with:
-          tool: typos-cli
-      - name: run typos
-        run: typos
-      - name: Typos info
-        if: failure()
-        run: |
-          echo 'To fix typos, please run `typos -w`'
-          echo 'To check for a diff, run `typos`'
-          echo 'You can find typos here: https://crates.io/crates/typos'
-
-  tests:
-    name: Test ${{ matrix.toolchain }} ${{ matrix.platform.name }}
-    runs-on: ${{ matrix.platform.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain: [stable, nightly, '1.80']
-        platform:
-          # Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml!
-          - { name: 'Windows 64bit MSVC', target: x86_64-pc-windows-msvc,   os: windows-latest,  }
-          - { name: 'Windows 32bit MSVC', target: i686-pc-windows-msvc,     os: windows-latest,  }
-          - { name: 'Windows 64bit GNU',  target: x86_64-pc-windows-gnu,    os: windows-latest, host: -x86_64-pc-windows-gnu }
-          - { name: 'Windows 32bit GNU',  target: i686-pc-windows-gnu,      os: windows-latest, host: -i686-pc-windows-gnu }
-          - { name: 'Linux 32bit',        target: i686-unknown-linux-gnu,   os: ubuntu-latest,   }
-          - { name: 'Linux 64bit',        target: x86_64-unknown-linux-gnu, os: ubuntu-latest,   }
-          - { name: 'X11',                target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=x11' }
-          - { name: 'Wayland',            target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' }
-          - { name: 'Android',            target: aarch64-linux-android,    os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' }
-          - { name: 'Redox OS',           target: x86_64-unknown-redox,     os: ubuntu-latest,   }
-          - { name: 'macOS x86_64',       target: x86_64-apple-darwin,      os: macos-latest,    }
-          - { name: 'macOS Aarch64',      target: aarch64-apple-darwin,     os: macos-latest,    }
-          - { name: 'iOS x86_64',         target: x86_64-apple-ios,         os: macos-latest,    }
-          - { name: 'iOS Aarch64',        target: aarch64-apple-ios,        os: macos-latest,    }
-          - { name: 'Web',                target: wasm32-unknown-unknown,   os: ubuntu-latest,   }
-        exclude:
-              # Web on nightly needs extra arguments
-
-          - toolchain: nightly
-            platform: { name: 'Web' }
-            # Rustup is broken.
-          - toolchain: nightly
-            platform: { name: 'Windows 32bit GNU' }
-          # Android is tested on stable-3
-          - toolchain: '1.80'
-            platform: { name: 'Android' }
-          # Redox OS doesn't follow MSRV
-          - toolchain: '1.80'
-            platform: { name: 'Redox OS' }
-        include:
-          - toolchain: '1.80'
-            platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package winit --features=android-native-activity', cmd: 'apk -- ' }
-          - toolchain: 'nightly'
-            platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile }
-          - toolchain: 'nightly'
-            platform: {
-              name:         'Web Atomic',
-              target:       wasm32-unknown-unknown,
-              os:           ubuntu-latest,
-              options:      '-Zbuild-std=panic_abort,std',
-              test-options: -Zdoctest-xcompile,
-              rustflags:    '-Ctarget-feature=+atomics,+bulk-memory',
-              components:   rust-src,
-            }
-
-    env:
-      # Set more verbose terminal output
-      CARGO_TERM_VERBOSE: true
-      RUST_BACKTRACE: 1
-
-      # Faster compilation and error on warnings
-      RUSTFLAGS: '--codegen=debuginfo=0 --deny=warnings ${{ matrix.platform.rustflags }}'
-      RUSTDOCFLAGS: ${{ matrix.platform.rustflags }}
-
-      OPTIONS: --target=${{ matrix.platform.target }} ${{ matrix.platform.options }}
-      TEST_OPTIONS: ${{ matrix.platform.test-options }}
-      CMD: ${{ matrix.platform.cmd }}
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-
-    - name: Restore cache of cargo folder
-      # We use `restore` and later `save`, so that we can create the key after
-      # the cache has been downloaded.
-      #
-      # This could be avoided if we added Cargo.lock to the repository.
-      uses: actions/cache/restore@v4
-      with:
-        # https://doc.rust-lang.org/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci
-        path: |
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-        key: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}-never-intended-to-be-found
-        restore-keys: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}
-
-    - name: Generate lockfile
-      # Also updates the crates.io index
-      run: cargo generate-lockfile && cargo update -p ahash --precise 0.8.7 && cargo update -p bumpalo --precise 3.14.0
-
-    - name: Install GCC Multilib
-      if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
-      run: sudo apt-get update && sudo apt-get install gcc-multilib
-
-    - name: Cache cargo-apk
-      if: contains(matrix.platform.target, 'android')
-      id: cargo-apk-cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.cargo/bin/cargo-apk
-        # Change this key if we update the required cargo-apk version
-        key: cargo-apk-v0-9-7
-
-    - uses: dtolnay/rust-toolchain@master
-      if: contains(matrix.platform.target, 'android') && (steps.cargo-apk-cache.outputs.cache-hit != 'true')
-      with:
-        toolchain: stable
-
-    - name: Install cargo-apk
-      if: contains(matrix.platform.target, 'android') && (steps.cargo-apk-cache.outputs.cache-hit != 'true')
-      run: cargo install cargo-apk --version=^0.9.7 --locked
-
-    - uses: taiki-e/cache-cargo-install-action@v2
-      if: contains(matrix.platform.target, 'wasm32') && matrix.toolchain == 'nightly'
-      with:
-        tool: wasm-bindgen-cli
-
-    - uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ matrix.toolchain }}${{ matrix.platform.host }}
-        targets: ${{ matrix.platform.target }}
-        components: clippy, ${{ matrix.platform.components }}
-
-    - name: Check documentation
-      run: cargo doc --no-deps $OPTIONS --document-private-items
-      env:
-        RUSTDOCFLAGS: '--deny=warnings ${{ matrix.platform.rustflags }}'
-
-    - name: Build crate
-      run: cargo $CMD build $OPTIONS
-
-    - name: Test winit core
-      run: cargo test -p winit-core
-
-    - name: Test winit Android
-      if: contains(matrix.platform.target, 'android')
-      run: cargo $CMD test -p winit-android --features native-activity --no-run
-
-    - name: Test winit Common (EventHandler)
-      run: cargo $CMD test -p winit-common --features event-handler --no-run
-
-    - name: Test winit Common (CF)
-      if: contains(matrix.platform.target, 'apple')
-      run: cargo $CMD test -p winit-common --features core-foundation --no-run
-
-    - name: Test winit Common (XKB)
-      if: contains(matrix.platform.target, 'linux-gnu')
-      run: cargo $CMD test -p winit-common --features xkb,x11,wayland --no-run
-
-    - name: Test winit AppKit
-      if: contains(matrix.platform.target, 'macos')
-      run: cargo $CMD test -p winit-appkit $OPTIONS
-
-    - name: Test winit Orbital
-      if: contains(matrix.platform.target, 'redox')
-      run: cargo test -p winit-orbital
-
-    - name: Test winit UIKit
-      if: contains(matrix.platform.target, 'ios')
-      # TODO: Run on Simulator
-      run: cargo $CMD test -p winit-uikit $OPTIONS --no-run
-
-    - name: Test winit Web
-      if: contains(matrix.platform.target, 'wasm')
-      run: cargo $CMD test -p winit-web $OPTIONS --no-run
-
-    - name: Test winit Win32
-      if: contains(matrix.platform.target, 'windows')
-      run: cargo $CMD test -p winit-win32 $OPTIONS
-
-    - name: Test winit X11
-      if: contains(matrix.platform.target, 'linux-gnu')
-      run: cargo $CMD test -p winit-x11 --target=${{ matrix.platform.target }}
-
-    - name: Test winit Wayland
-      if: contains(matrix.platform.target, 'linux-gnu')
-      run: cargo $CMD test -p winit-wayland --target=${{ matrix.platform.target }}
-
-    # Test only on Linux x86_64, so we avoid spending unnecessary CI hours.
-    - name: Test dpi crate
-      if: >
-        contains(matrix.platform.name, 'Linux 64bit') &&
-        matrix.toolchain != '1.80'
-      run: cargo test -p dpi
-
-    - name: Check dpi crate (no_std)
-      if: >
-        contains(matrix.platform.name, 'Linux 64bit') &&
-        matrix.toolchain != '1.80'
-      run: cargo check -p dpi --no-default-features
-
-    - name: Build tests
-      if: >
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.80'
-      run: cargo $CMD test --no-run $OPTIONS
-
-    - name: Run tests
-      if: >
-        !contains(matrix.platform.target, 'android') &&
-        !contains(matrix.platform.target, 'ios') &&
-        (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') &&
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.80'
-      run: cargo $CMD test $OPTIONS
-
-    - name: Lint with clippy
-      if: (matrix.toolchain == 'stable') && !contains(matrix.platform.options, '--no-default-features')
-      run: cargo clippy --all-targets $OPTIONS $TEST_OPTIONS -- -Dwarnings
-
-    - name: Build tests with serde enabled
-      if: >
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.80'
-      run: cargo $CMD test --no-run $OPTIONS $TEST_OPTIONS --features serde
-
-    - name: Run tests with serde enabled
-      if: >
-        !contains(matrix.platform.target, 'android') &&
-        !contains(matrix.platform.target, 'ios') &&
-        (!contains(matrix.platform.target, 'wasm32') || matrix.toolchain == 'nightly') &&
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.80'
-      run: cargo $CMD test $OPTIONS $TEST_OPTIONS --features serde
-
-    - name: Check docs.rs documentation
-      if: matrix.toolchain == 'nightly'
-      run: cargo doc --no-deps $OPTIONS --features=serde,mint,android-native-activity
-      env:
-        RUSTDOCFLAGS: '--deny=warnings ${{ matrix.platform.rustflags }} --cfg=docsrs --cfg=unreleased_changelogs'
-
-    # See restore step above
-    - name: Save cache of cargo folder
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-        key: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}-${{ hashFiles('Cargo.lock') }}
-
-  cargo-deny:
-    name: Run cargo-deny on ${{ matrix.platform.name }}
-    runs-on: ubuntu-latest
-
-    # TODO: remove this matrix when https://github.com/EmbarkStudios/cargo-deny/issues/324 is resolved
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - { name: 'Android', target: aarch64-linux-android }
-          - { name: 'iOS', target: aarch64-apple-ios }
-          - { name: 'Linux', target: x86_64-unknown-linux-gnu }
-          - { name: 'macOS', target: aarch64-apple-darwin }
-          - { name: 'Redox OS', target: x86_64-unknown-redox }
-          - { name: 'Web', target: wasm32-unknown-unknown }
-          - { name: 'Windows GNU', target: x86_64-pc-windows-gnu }
-          - { name: 'Windows MSVC', target: x86_64-pc-windows-msvc }
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-    - uses: EmbarkStudios/cargo-deny-action@v2
-      with:
-        command: check
-        log-level: error
-        manifest-path: winit/Cargo.toml
-        arguments: --all-features --target ${{ matrix.platform.target }}
-
-  eslint:
-    name: ESLint
-
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./winit-web/src/script
-
-    steps:
-      - uses: taiki-e/checkout-action@v1
-      - name: Setup NPM
-        run: npm install
-      - name: Run ESLint
-        run: npx eslint
-
-  swc:
-    name: Minimize JavaScript
-
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./winit-web/src/script
-
-    steps:
-      - uses: taiki-e/checkout-action@v1
-      - name: Install SWC
-        run: sudo npm i -g @swc/cli
-      - name: Run SWC
-        run: |
-          swc . --ignore node_modules,**/*.d.ts --only **/*.ts -d . --out-file-extension min.js
-      - name: Check for diff
-        run: |
-          [[ -z $(git status -s) ]]
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,50 +0,0 @@
-name: Docs
-
-on:
-  push:
-    branches: [master]
-
-jobs:
-  docs:
-    name: Documentation
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}winit
-
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-
-    steps:
-      - uses: actions/checkout@v5
-
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly
-
-      - name: Run Rustdoc
-        env:
-          RUSTDOCFLAGS: --crate-version master --cfg=docsrs --cfg=unreleased_changelogs
-        run: |
-          cargo doc --no-deps -Z rustdoc-map -Z rustdoc-scrape-examples --features=serde,mint,android-native-activity
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-
-      - name: Fix permissions
-        run: |
-          chmod -c -R +rX "target/doc" | while read line; do
-            echo "::warning title=Invalid file permissions automatically fixed::$line"
-          done
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
-        with:
-          path: target/doc
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
 Cargo.lock
 target/
-rls/
-.vscode/
 *~
 #*#
-.DS_Store
-# NPM package used to run ESLint.
-/src/platform_impl/web/script/node_modules
-/src/platform_impl/web/script/package-lock.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "deps/apk-builder"]
+	path = deps/apk-builder
+	url = https://github.com/tomaka/android-rs-glue
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: rust
+
+rust:
+  - nightly
+  - stable
+
+cache: cargo
+
+addons:
+  apt:
+    packages:
+    - libxxf86vm-dev
+
+install:
+  - |
+      if [ $TRAVIS_OS_NAME = osx ]; then
+        rustup target add x86_64-apple-ios
+      fi
+
+script:
+  - cargo build --verbose
+  - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
+  - cargo test --verbose
+
+os:
+  - linux
+  - osx
+
+after_success:
+  - |
+      [ $TRAVIS_BRANCH = master ] &&
+      [ $TRAVIS_PULL_REQUEST = false ] &&
+      cargo publish --token ${CRATESIO_TOKEN}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +0,0 @@
-Changelog entries should be put in the [`changelog::unreleased`].
-
-The changelog can also be viewed [on docs.rs][docs_rs] or [on the current
-master docs][master_docs].
-
-[`changelog::unreleased`]: winit/src/changelog/unreleased.md
-[docs_rs]: https://docs.rs/winit/latest/winit/changelog/index.html
-[master_docs]: https://rust-windowing.github.io/winit/winit/changelog/index.html
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,6 +0,0 @@
-# Code of Conduct
-
-The `rust-windowing` project adheres to the [Rust Code of Conduct]. This
-describes the minimum behavior expected from all contributors.
-
-[Rust Code of Conduct]: https://www.rust-lang.org/policies/code-of-conduct
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,162 +0,0 @@
-# Contribution Guidelines
-
-This document contains guidelines for contributing code to winit. It has to be
-followed in order for your patch to be approved and applied.
-
-## Contributing
-
-Anyone can contribute to winit, however given that it's a cross platform
-windowing toolkit getting certain changes incorporated could be challenging.
-
-To save your time it's wise to check already opened [pull requests][prs] and
-[issues][issues]. In general, bug fixes and missing implementations are always
-accepted, however larger new API proposals should go into the issue first. When
-in doubt contact us on [Matrix][matrix] or via opening an issue.
-
-### Windows
-
-To run the examples on Windows, you must have symlinks enabled, see
-[this][git-windows-symlinks].
-
-[git-windows-symlinks]: https://gitforwindows.org/symbolic-links.html
-
-### Submitting your work and handling review
-
-All patches have to be sent on Github as [pull requests][prs]. To simplify your
-life during review it's recommended to check the "give contributors write access
-to the branch" checkbox.
-
-We use unstable Rustfmt options across the project, so please run
-`cargo +nightly fmt` before submitting your work. If you are unable to do so,
-the maintainers can do it for you before merging, just state so in your pull
-request description. For details on how to use nightly, consult [the
-documentation][toolchains].
-
-When editing markdown files (`.md`) they must be wrapped at 80 characters.
-
-[toolchains]: https://rust-lang.github.io/rustup/concepts/toolchains.html
-
-#### Handling review
-
-During the review process certain events could require an action from your side,
-common patterns and reactions are described below.
-
-_Event:_ The CI fails to build, but it looks like it is not your fault. Not
-communicating so could result in maintainers not looking into your patch,
-since they may assume that you're still working on it.\
-_Desired behaviour:_ Write a message saying roughly the following "The CI
-failure is unrelated", so that the maintainers will fix it for you.
-
-_Event:_ Maintainer requested changes to your PR.\
-_Desired behavior:_ Once you address the request, you should re-request a review
-with GitHub's UI. If you don't agree with what maintainer suggested, you
-should state your objections and re-request the review. That will indicate that
-the ball is on maintainer's side.
-
-_Event:_ You've opened a PR, but maintainer shortly after commented that they
-want to work on that themselves.\
-_Desired behavior:_ Discuss with the maintainer regarding their plans if they
-were not outlined in the initial response, because such response means that they
-are not interested in reviewing your code. Such thing could happen when
-underestimating complexity of the task you're solving or when your patch
-mandate certain downstream designs. In general, the maintainer will likely
-close your PR in order to prevent work being done on it.
-
-[prs]: https://github.com/rust-windowing/winit/pulls
-[issues]: https://github.com/rust-windowing/winit/issues
-[matrix]: https://matrix.to/#/#rust-windowing:matrix.org
-
-## Maintainers
-
-Winit has plenty of maintainers with different backgrounds, different time
-available to work on Winit, and reasons to be winit maintainer in the first
-place. To ensure that Winit's code quality does not decrease over time and to
-make it easier to teach new maintainers the "winit way of doing things" the
-common policies and routines are defined in this section.
-
-The current maintainers for each platform are listed in [this file][CODEOWNERS].
-
-### Contributions handling
-
-The maintainers must ensure that the external contributions meet Winit's
-quality standards. If it's not, it **is the maintainer's responsibility** to
-bring it on par, which includes:
-
-  - Ensure that formatting is consistent and `CHANGELOG` messages are clear
-    for the end users.
-  - Improve the commit message, so it'll be easier for other maintainers to
-    understand the motivation without going through all the discussions on the
-    particular patch/PR.
-  - Ensure that the proposed patch doesn't break platform parity. If the
-    breakage is desired by contributor, an issue should be opened to discuss
-    with other maintainers before merging.
-  - Always fix CI issues before merging if they don't originate from the
-    submitted work.
-
-However, maintainers should give some leeway for external contributors, so they
-don't feel discouraged contributing, for example:
-
-  - Suggest a patch to resolve style issues, if it's the only issue with the
-    submitted work. Keep in mind that pushing the resolution yourself is not
-    desired, because the contributor might not agree with what you did.
-  - Be more explicit on how things should be done if you don't like the
-    approach.
-  - Suggest to finish the PR for them if they're absent for a while and you need
-    the proposed changes to move forward with something. In such cases the
-    maintainer must preserve attribution with `Co-authored-by`, `Suggested-by`,
-    or keep the original committer.
-  - Rebase their work for them when massive changes to the Winit codebase were
-    introduced.
-
-When reviewing code of other maintainers all of the above is on the maintainer
-who submitted the patch. Interested maintainers could help push the work over
-the finish line, but teaching other maintainers should be preferred.
-
-For a _regular_ contributor to winit, the maintainer should slowly start
-requiring contributor to match *maintainer* quality standards when writing
-patches and commit messages.
-
-### Contributing
-
-When submitting a patch, the maintainer should follow the general contributing
-guidelines, however greater attention to detail is expected in this case.
-
-To make life simpler for other maintainers it's suggested to create your branch
-under the project repository instead of your own fork. The naming scheme is
-`github_user_name/branch_name`. Doing so will make your work easier to rebase
-for other maintainers when you're absent.
-
-### Administrative Actions
-
-Some things (such as changing required CI steps, adding contributors, ...)
-require administrative permissions. If you don't have those, ask about the
-change in an issue. If you have the permissions, discuss it with at least one
-other admin before making the change.
-
-### Release process
-
-Given that winit is a widely used library, we should be able to make a patch
-releases at any time we want without blocking the development of new features.
-
-To achieve these goals, a new branch is created for every new release. Releases
-and later patch releases are committed and tagged in this branch.
-
-The exact steps for an exemplary `0.2.0` release might look like this:
-  1. Initially, the version on the latest master is `0.1.0`
-  2. A new `v0.2.x` branch is created for the release
-  3. Update released `cfg_attr` in `src/changelog/mod.rs` to `v0.2.md`
-  4. Move entries from `src/changelog/unreleased.md` into
-     `src/changelog/v0.2.md`
-  5. In the branch, the version is bumped to `v0.2.0`
-  6. The new commit in the branch is tagged `v0.2.0`
-  7. The version is pushed to crates.io
-  8. A GitHub release is created for the `v0.2.0` tag
-  9. On master, the version is bumped to `0.2.0`, and the changelog is updated
-
-When doing a patch release, the process is similar:
-  1. Initially, the version of the latest release is `0.2.0`
-  2. Checkout the `v0.2.x` branch
-  3. Cherry-pick the required non-breaking changes into the `v0.2.x`
-  4. Follow steps 4-9 of the regular release example
-
-[CODEOWNERS]: .github/CODEOWNERS
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,104 +1,43 @@
-[workspace]
-default-members = ["winit"]
-members = ["dpi", "winit*"]
-resolver = "2"
-
-[workspace.package]
-edition = "2021"
+[package]
+name = "winit"
+version = "0.6.4"
+authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
+description = "Cross-platform window creation library."
+keywords = ["windowing"]
 license = "Apache-2.0"
-repository = "https://github.com/rust-windowing/winit"
-rust-version = "1.80"
-version = "0.30.12"
+readme = "README.md"
+repository = "https://github.com/tomaka/winit"
+documentation = "https://docs.rs/winit"
+categories = ["gui"]

-[workspace.dependencies]
-# Workspace dependencies.
-# `winit` has no version here to allow using it in dev deps for docs.
-winit = { path = "winit" }
-winit-android = { version = "0.30.12", path = "winit-android" }
-winit-appkit = { version = "0.30.12", path = "winit-appkit" }
-winit-common = { version = "0.30.12", path = "winit-common" }
-winit-core = { version = "0.30.12", path = "winit-core" }
-winit-orbital = { version = "0.30.12", path = "winit-orbital" }
-winit-uikit = { version = "0.30.12", path = "winit-uikit" }
-winit-wayland = { version = "0.30.12", path = "winit-wayland", default-features = false }
-winit-web = { version = "0.30.12", path = "winit-web" }
-winit-win32 = { version = "0.30.12", path = "winit-win32" }
-winit-x11 = { version = "0.30.12", path = "winit-x11" }
+[dependencies]
+lazy_static = "0.2.2"
+libc = "0.2"
+shared_library = "0.1.5"

-# Core dependencies.
-bitflags = "2"
-cfg_aliases = "0.2.1"
-cursor-icon = "1.1.0"
-dpi = { version = "0.1.2", path = "dpi" }
-keyboard-types = "0.8.0"
-mint = "0.5.6"
-rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"] }
-serde = { version = "1", features = ["serde_derive"] }
-smol_str = "0.3"
-tracing = { version = "0.1.40", default-features = false }
+[target.'cfg(target_os = "android")'.dependencies.android_glue]
+version = "0.2"

-# Dev dependencies.
-image = { version = "0.25.0", default-features = false }
-softbuffer = { version = "0.4.6", default-features = false, features = [
-    "x11",
-    "x11-dlopen",
-    "wayland",
-    "wayland-dlopen",
-] }
-tracing-subscriber = "0.3.18"
+[target.'cfg(target_os = "ios")'.dependencies]
+objc = "0.2"

-# Android dependencies.
-android-activity = "0.6.0"
-ndk = { version = "0.9.0", features = ["rwh_06"], default-features = false }
+[target.'cfg(target_os = "macos")'.dependencies]
+objc = "0.2"
+cgl = "0.2"
+cocoa = "=0.5.2"
+core-foundation = "0.2"
+core-graphics = "0.4"

-# Apple dependencies.
-block2 = "0.6.1"
-dispatch2 = { version = "0.3.0", default-features = false, features = ["std", "objc2"] }
-objc2 = { version = "0.6.1", features = ["relax-sign-encoding"] }
-objc2-app-kit = { version = "0.3.1", default-features = false }
-objc2-core-foundation = { version = "0.3.1", default-features = false }
-objc2-core-graphics = { version = "0.3.1", default-features = false }
-objc2-core-video = { version = "0.3.1", default-features = false }
-objc2-foundation = { version = "0.3.1", default-features = false }
-objc2-ui-kit = { version = "0.3.1", default-features = false }
+[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"

-# Windows dependencies.
-unicode-segmentation = "1.7.1"
-windows-sys = "0.59.0"
-
-# Linux dependencies.
-ahash = { version = "0.8.7", features = ["no-rng"] }
-bytemuck = { version = "1.13.1", default-features = false }
-calloop = "0.13.0"
-libc = "0.2.64"
-memmap2 = "0.9.0"
-percent-encoding = "2.0"
-rustix = { version = "1.0.7", default-features = false }
-sctk = { package = "smithay-client-toolkit", version = "0.19.2", default-features = false, features = [
-    "calloop",
-] }
-sctk-adwaita = { version = "0.10.1", default-features = false }
-wayland-backend = { version = "0.3.10", default-features = false, features = ["client_system"] }
-wayland-client = "0.31.10"
-wayland-protocols = { version = "0.32.8", features = ["staging"] }
-wayland-protocols-plasma = { version = "0.3.8", features = ["client"] }
-x11-dl = "2.19.1"
-x11rb = { version = "0.13.0", default-features = false }
-xkbcommon-dl = "0.4.2"
-
-# Orbital dependencies.
-orbclient = { version = "0.3.47", default-features = false }
-redox_syscall = "0.5.7"
-
-# Web dependencies.
-atomic-waker = "1"
-concurrent-queue = { version = "2", default-features = false }
-console_error_panic_hook = "0.1"
-js-sys = "0.3.70"
-pin-project = "1"
-tracing-web = "0.1"
-wasm-bindgen = "0.2.93"
-wasm-bindgen-futures = "0.4.43"
-wasm-bindgen-test = "0.3"
-web-time = "1"
-web_sys = { package = "web-sys", version = "0.3.70" }
+[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
+wayland-client = { version = "0.8.6", features = ["dlopen"] }
+wayland-kbd = "0.8.0"
+wayland-window = "0.5.0"
+x11-dl = "2.8"
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -1,49 +0,0 @@
-# Winit Scope
-
-Winit aims to expose an interface that abstracts over window creation and input handling and can
-be used to create both games and applications. It supports the following main graphical platforms:
- Desktop
-  - Windows
-  - macOS
-  - Unix
-    - via X11
-    - via Wayland
-  - Redox OS, via Orbital
- Mobile
-  - iOS
-  - Android
- Web
-
-Most platforms expose capabilities that cannot be meaningfully transposed onto others. Winit does not
-aim to support every single feature of every platform, but rather to abstract over the common features
-available everywhere. In this context, APIs exposed in winit can be split into different "support tiers":
-
- **Core:** Features that are essential to providing a well-formed abstraction over each platform's
-  windowing and input APIs.
- **Platform:** Platform-specific features that can't be meaningfully exposed through a common API and
-  cannot be implemented outside of Winit without exposing a significant amount of Winit's internals
-  or interfering with Winit's abstractions.
- **Usability:** Features that are not strictly essential to Winit's functionality, but provide meaningful
-  usability improvements and cannot be reasonably implemented in an external crate. These are
-  generally optional and exposed through Cargo features.
-
-Core features are taken care of by the core Winit maintainers. Platform features are not.
-When a platform feature is submitted, the submitter is considered the expert in the
-feature and may be asked to support the feature should it break in the future.
-
-Winit ***does not*** directly expose functionality for drawing inside windows or creating native
-menus, but ***does*** commit to providing APIs that higher-level crates can use to implement that
-functionality.
-
-## `1.0` and stability
-
-When all core features are implemented to the satisfaction of the Winit maintainers, Winit 1.0 will
-be released and the library will enter maintenance mode. For the most part, new core features will not
-be added past this point. New platform features may be accepted and exposed through point releases.
-
-### Tier upgrades
-Some platform features could, in theory, be exposed across multiple platforms, but have not gone
-through the implementation work necessary to function on all platforms. When one of these features
-gets implemented across all platforms, a PR can be opened to upgrade the feature to a core feature.
-If that gets accepted, the platform-specific functions get deprecated and become permanently
-exposed through the core, cross-platform API.
--- a/HALL_OF_CHAMPIONS.md
+++ b/HALL_OF_CHAMPIONS.md
@@ -1,25 +0,0 @@
-# Hall of Champions
-
-The winit maintainers would like to recognize the following former winit
-contributors, without whom winit would not exist in its current form. We thank
-them deeply for their time and efforts and wish them the best of luck in their
-future endeavors:
-
-* [@tomaka]: For creating the winit project and guiding it through its early
-  years of existence.
-* [@vberger]: For diligently creating the Wayland backend and being its
-  extremely helpful and benevolent maintainer for years.
-* [@francesca64]: For taking over the responsibility of maintaining almost every
-  winit backend and standardizing HiDPI support across all of them.
-* [@Osspial]: For heroically landing EventLoop 2.0 and valiantly ushering in a
-  vastly more sustainable era of winit.
-* [@goddessfreya]: For selflessly taking over maintainership of glutin and her
-  stellar dedication to improving both winit and glutin.
-* [@ArturKovacs]: For consistently maintaining the macOS backend and for his immense involvement in designing and implementing the new keyboard API.
-
-[@tomaka]: https://github.com/tomaka
-[@vberger]: https://github.com/vberger
-[@francesca64]: https://github.com/francesca64
-[@Osspial]: https://github.com/Osspial
-[@goddessfreya]: https://github.com/goddessfreya
-[@ArturKovacs]: https://github.com/ArturKovacs
--- a/README.md
+++ b/README.md
@@ -1,79 +1,40 @@
 # winit - Cross-platform window creation and management in Rust

-[![Crates.io](https://img.shields.io/crates/v/winit.svg)](https://crates.io/crates/winit)
+[![](http://meritbadge.herokuapp.com/winit)](https://crates.io/crates/winit)
+
 [![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
-[![UNSTABLE docs](https://img.shields.io/github/actions/workflow/status/rust-windowing/winit/docs.yml?branch=master&label=UNSTABLE%20docs
-)](https://rust-windowing.github.io/winit/winit/index.html)
-[![CI Status](https://github.com/rust-windowing/winit/workflows/CI/badge.svg)](https://github.com/rust-windowing/winit/actions)
+
+[![Build Status](https://travis-ci.org/tomaka/winit.png?branch=master)](https://travis-ci.org/tomaka/winit)
+[![Build status](https://ci.appveyor.com/api/projects/status/5h87hj0g4q2xe3j9/branch/master?svg=true)](https://ci.appveyor.com/project/tomaka/winit/branch/master)

 ```toml
 [dependencies]
-winit = "0.30.12"
+winit = "0.5"
 ```

 ## [Documentation](https://docs.rs/winit)

-For features _within_ the scope of winit, see [FEATURES.md](FEATURES.md).
-
-For features _outside_ the scope of winit, see [Are we GUI Yet?](https://areweguiyet.com/) and [Are we game yet?](https://arewegameyet.rs/), depending on what kind of project you're looking to do.
-
-## Contact Us
-
-Join us in our [![Matrix](https://img.shields.io/badge/Matrix-%23rust--windowing%3Amatrix.org-blueviolet.svg)](https://matrix.to/#/#rust-windowing:matrix.org) room.
-
-The maintainers have a meeting every friday at UTC 15. The meeting notes can be found [here](https://hackmd.io/@winit-meetings).
-
 ## 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.)
-produced by the window.
+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
 show something on the window you need to use the platform-specific getters provided by winit, or
 another library.

-## CONTRIBUTING
+```rust
+extern crate winit;

-For contributing guidelines see [CONTRIBUTING.md](./CONTRIBUTING.md).
-
-## MSRV Policy
-
-This crate's Minimum Supported Rust Version (MSRV) is **1.80**. Changes to
-the MSRV will be accompanied by a minor version bump.
-
-As a **tentative** policy, the upper bound of the MSRV is given by the following
-formula:
+fn main() {
+    let window = winit::Window::new().unwrap();

+    for event in window.wait_events() {
+        match event {
+            winit::Event::Closed => break,
+            _ => ()
+        }
+    }
+}
 ```
-min(sid, stable - 3)
-```
-
-Where `sid` is the current version of `rustc` provided by [Debian Sid], and
-`stable` is the latest stable version of Rust. This bound may be broken in case of a major ecosystem shift or a security vulnerability.
-
-[Debian Sid]: https://packages.debian.org/sid/rustc
-
-An exception is made for the Android platform, where a higher Rust version
-must be used for certain Android features. In this case, the MSRV will be
-capped at the latest stable version of Rust minus three. This inconsistency is
-not reflected in Cargo metadata, as it is not powerful enough to expose this
-restriction.
-
-Redox OS is also not covered by this MSRV policy, as it requires a Rust nightly
-toolchain to compile.
-
-All crates in the [`rust-windowing`] organizations have the
-same MSRV policy.
-
-[`rust-windowing`]: https://github.com/rust-windowing
-
-### Platform-specific usage
-
-Check out the [`winit::platform`](https://docs.rs/winit/latest/winit/platform/index.html) module for platform-specific usage.
-
-### Repository License
-
-Note that the license in `LICENSE` doesn't apply in full to the DPI package [./dpi](./dpi).
-Full details can be found in that folder's README.
-<!-- This doesn't apply to users of the Winit crate, but this is also the repository level README -->
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,17 @@
+environment:
+  matrix:
+  - TARGET: x86_64-pc-windows-msvc
+  - TARGET: i686-pc-windows-msvc
+  - TARGET: i686-pc-windows-gnu
+install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
+  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+  - SET PATH=%PATH%;C:\MinGW\bin
+  - rustc -V
+  - cargo -V
+
+build: false
+
+test_script:
+  - cargo test --verbose
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,17 +0,0 @@
-# Using allow-invalid because this is platform-specific code
-disallowed-methods = [
-    { allow-invalid = true, path = "objc2_app_kit::NSView::visibleRect", reason = "We expose a render target to the user, and visibility is not really relevant to that (and can break if you don't use the rectangle position as well). Use `frame` instead." },
-    { allow-invalid = true, path = "objc2_app_kit::NSWindow::setFrameTopLeftPoint", reason = "Not sufficient when working with Winit's coordinate system, use `flip_window_screen_coordinates` instead" },
-    { allow-invalid = true, path = "web_sys::Document::exit_fullscreen", reason = "Doesn't account for compatibility with Safari" },
-    { allow-invalid = true, path = "web_sys::Document::fullscreen_element", reason = "Doesn't account for compatibility with Safari" },
-    { allow-invalid = true, path = "web_sys::Element::request_fullscreen", reason = "Doesn't account for compatibility with Safari" },
-    { allow-invalid = true, path = "web_sys::HtmlCanvasElement::height", reason = "Winit shouldn't touch the internal canvas size" },
-    { allow-invalid = true, path = "web_sys::HtmlCanvasElement::set_height", reason = "Winit shouldn't touch the internal canvas size" },
-    { allow-invalid = true, path = "web_sys::HtmlCanvasElement::set_width", reason = "Winit shouldn't touch the internal canvas size" },
-    { allow-invalid = true, path = "web_sys::HtmlCanvasElement::width", reason = "Winit shouldn't touch the internal canvas size" },
-    { allow-invalid = true, path = "web_sys::HtmlElement::style", reason = "cache this to reduce calls to JS" },
-    { allow-invalid = true, path = "web_sys::Window::document", reason = "cache this to reduce calls to JS" },
-    { allow-invalid = true, path = "web_sys::Window::get_computed_style", reason = "cache this to reduce calls to JS" },
-    { allow-invalid = true, path = "web_sys::Window::navigator", reason = "cache this to reduce calls to JS" },
-    { allow-invalid = true, path = "web_sys::window", reason = "is not available in every context" },
-]
--- a/deny.toml
+++ b/deny.toml
@@ -1,80 +0,0 @@
-# https://embarkstudios.github.io/cargo-deny
-# cargo install cargo-deny
-# cargo update && cargo deny --target aarch64-apple-ios check
-# Note: running just `cargo deny check` without a `--target` will result in
-# false positives due to https://github.com/EmbarkStudios/cargo-deny/issues/324
-[graph]
-all-features = true
-exclude-dev = true
-targets = [
-    { triple = "aarch64-apple-darwin" },
-    { triple = "aarch64-apple-ios" },
-    { triple = "aarch64-linux-android" },
-    { triple = "i686-pc-windows-gnu" },
-    { triple = "i686-pc-windows-msvc" },
-    { triple = "i686-unknown-linux-gnu" },
-    { triple = "wasm32-unknown-unknown", features = [
-        "atomics",
-    ] },
-    { triple = "x86_64-apple-darwin" },
-    { triple = "x86_64-apple-ios" },
-    { triple = "x86_64-pc-windows-gnu" },
-    { triple = "x86_64-pc-windows-msvc" },
-    { triple = "x86_64-unknown-linux-gnu" },
-    { triple = "x86_64-unknown-redox" },
-]
-
-[licenses]
-allow = [
-    "Apache-2.0",   # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
-    "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
-    "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
-    "ISC",          # https://tldrlegal.com/license/isc-license
-    "MIT",          # https://tldrlegal.com/license/mit-license
-    "Unicode-3.0",  # https://spdx.org/licenses/Unicode-3.0.html
-]
-confidence-threshold = 1.0
-private = { ignore = true }
-
-[bans]
-multiple-versions = "deny"
-skip = [
-    { crate = "bitflags@1", reason = "the ecosystem is in the process of migrating" },
-    { crate = "rustix@0.38", reason = "the ecosystem is in the process of migrating" },
-    { crate = "linux-raw-sys@0.4", reason = "the ecosystem is in the process of migrating" },
-]
-wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny/issues/241 is fixed
-
-[bans.build]
-include-archives = true
-interpreted = "deny"
-
-[[bans.build.bypass]]
-allow = [
-    { path = "generate-bindings.sh", checksum = "268ec23248218d779e33853cdc60e2985e70214ff004716cd734270de1f6b561" },
-]
-crate = "android-activity"
-
-[[bans.build.bypass]]
-allow-globs = ["ci/*", "githooks/*"]
-crate = "zerocopy"
-
-[[bans.build.bypass]]
-allow-globs = ["freetype2/*"]
-crate = "freetype-sys"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.a"]
-crate = "windows_i686_gnu"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.lib"]
-crate = "windows_i686_msvc"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.a"]
-crate = "windows_x86_64_gnu"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.lib"]
-crate = "windows_x86_64_msvc"
--- a/dpi/CHANGELOG.md
+++ b/dpi/CHANGELOG.md
@@ -1,25 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-Please keep one empty line before and after all headers. (This is required for
-`git` to produce a conflict when a release is made while a PR is open and the
-PR's changelog entry would go into the wrong section).
-
-And please only add new entries to the top of this list, right below the `#
-Unreleased` header.
-
-## Unreleased
-
-## 0.1.2
-
- Added `Insets`, `LogicalInsets` and `PhysicalInsets` types.
- Make `no_std` compatible. If you use this functionality, DPI's license has changed.
-
-## 0.1.1
-
- Derive `Debug`, `Copy`, `Clone`, `PartialEq`, `Serialize`, `Deserialize` traits for `PixelUnit`.
-
-## 0.1.0
-
- Add `LogicalUnit`, `PhysicalUnit` and `PixelUnit` types and related functions.
--- a/dpi/Cargo.toml
+++ b/dpi/Cargo.toml
@@ -1,46 +0,0 @@
-[package]
-categories = ["gui"]
-description = "Types for handling UI scaling"
-edition.workspace = true
-keywords = ["DPI", "HiDPI", "scale-factor"]
-# N.B. This is "AND", because of the imported libm code.
-license = "Apache-2.0 AND MIT"
-name = "dpi"
-repository.workspace = true
-rust-version.workspace = true
-version = "0.1.2"
-
-[features]
-default = ["std"]
-
-mint = ["dep:mint"]
-serde = ["dep:serde"]
-
-# Access mathematical functions using the standard library implementations
-std = []
-
-[dependencies]
-mint = { workspace = true, optional = true }
-serde = { workspace = true, optional = true }
-
-[package.metadata.docs.rs]
-features = ["mint", "serde"]
-# These are all tested in CI
-rustdoc-args = ["--cfg", "docsrs"]
-targets = [
-    # Windows
-    "i686-pc-windows-msvc",
-    "x86_64-pc-windows-msvc",
-    # macOS
-    "aarch64-apple-darwin",
-    "x86_64-apple-darwin",
-    # Unix (X11 & Wayland)
-    "i686-unknown-linux-gnu",
-    "x86_64-unknown-linux-gnu",
-    # iOS
-    "aarch64-apple-ios",
-    # Android
-    "aarch64-linux-android",
-    # Web
-    "wasm32-unknown-unknown",
-]
--- a/dpi/LICENSE
+++ b/dpi/LICENSE
@@ -1 +0,0 @@
-../LICENSE
--- a/dpi/LICENSE-LIBM-MIT
+++ b/dpi/LICENSE-LIBM-MIT
@@ -1,51 +0,0 @@
-rust-lang/libm as a whole is available for use under the MIT license:
-
------------------------------------------------------------------------------
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
------------------------------------------------------------------------------
-
-This Rust library contains the following copyrights:
-
-    Copyright (c) 2018 Jorge Aparicio
-
-Portions of this software are derived from third-party works licensed under
-terms compatible with the above MIT license:
-
-* musl libc https://www.musl-libc.org/. This library contains the following
-  copyright:
-
-      Copyright © 2005-2020 Rich Felker, et al.
-
-* The CORE-MATH project https://core-math.gitlabpages.inria.fr/. CORE-MATH
-  routines are available under the MIT license on a per-file basis.
-
-The musl libc COPYRIGHT file also includes the following notice relevant to
-math portions of the library:
-
------------------------------------------------------------------------------
-Much of the math library code (src/math/* and src/complex/*) is
-Copyright © 1993,2004 Sun Microsystems or
-Copyright © 2003-2011 David Schultz or
-Copyright © 2003-2009 Steven G. Kargl or
-Copyright © 2003-2009 Bruce D. Evans or
-Copyright © 2008 Stephen L. Moshier or
-Copyright © 2017-2018 Arm Limited
-and labelled as such in comments in the individual source files. All
-have been licensed under extremely permissive terms.
------------------------------------------------------------------------------
--- a/dpi/README.md
+++ b/dpi/README.md
@@ -1,18 +0,0 @@
-# DPI
-
-Full docs can be found on docs.rs.
-
-## License
-
-Most of DPI is licensed under the Apache License, Version 2.0 ([LICENSE](LICENSE)).
-All files except for `src/libm.rs` (and `LICENSE-LIBM-MIT`) are available solely under that license.
-
-For its `no_std` support, DPI uses code from the [libm](https://crates.io/crates/libm) crate.
-This is in the `libm.rs` file, and is licensed solely under the MIT Licence ([LICENSE-LIBM-MIT](LICENSE-LIBM-MIT)).
-That file contains details of all potentially applicable copyright notices.
-This is feature gated to only be included if you disable the `std` feature, otherwise it will not be compiled into your final binary
-(and so these license terms will not apply).
-
-Overall, this means that the license for this crate depends on what features you have enabled.
-If you enable the `std` feature, then DPI uses only code available under the Apache-2.0 license, and so can be used under the terms of that license.
-However, if you disable the `std` feature, then both these licenses must be followed to use the crate as a whole.
--- a/dpi/src/lib.rs
+++ b/dpi/src/lib.rs
--- a/dpi/src/libm.rs
+++ b/dpi/src/libm.rs
@@ -1,56 +0,0 @@
-// Copyright (c) 2018 Jorge Aparicio
-// Copyright © 2005-2020 Rich Felker, et al.
-// Copyright © 1993,2004 Sun Microsystems or
-// Copyright © 2003-2011 David Schultz or
-// Copyright © 2003-2009 Steven G. Kargl or
-// Copyright © 2003-2009 Bruce D. Evans or
-// Copyright © 2008 Stephen L. Moshier or
-// Copyright © 2017-2018 Arm Limited
-// SPDX-License-Identifier: MIT
-// This file is licensed solely under the terms discussed in LICENSE-LIBM-MIT at the crate root.
-// See the package-level README for full details.
-
-// Taken from https://github.com/rust-lang/libm/blob/master/src/math/mod.rs#L1
-macro_rules! force_eval {
-    ($e:expr) => {
-        unsafe { ::core::ptr::read_volatile(&$e) }
-    };
-}
-
-// Taken from https://github.com/rust-lang/libm/blob/libm-v0.2.11/src/math/round.rs
-pub(crate) fn round(x: f64) -> f64 {
-    trunc(x + copysign(0.5 - 0.25 * f64::EPSILON, x))
-}
-
-// Adapted from: https://github.com/rust-lang/libm/blob/libm-v0.2.11/src/math/trunc.rs#L8-L12
-#[allow(clippy::needless_late_init /*, reason = "The original libm code uses this style" */)]
-fn trunc(x: f64) -> f64 {
-    let x1p120 = f64::from_bits(0x4770000000000000); // 0x1p120f === 2 ^ 120
-
-    let mut i: u64 = x.to_bits();
-    let mut e: i64 = ((i >> 52) & 0x7ff) as i64 - 0x3ff + 12;
-    let m: u64;
-
-    if e >= 52 + 12 {
-        return x;
-    }
-    if e < 12 {
-        e = 1;
-    }
-    m = -1i64 as u64 >> e;
-    if (i & m) == 0 {
-        return x;
-    }
-    force_eval!(x + x1p120);
-    i &= !m;
-    f64::from_bits(i)
-}
-
-// Taken from https://github.com/rust-lang/libm/blob/libm-v0.2.11/src/math/copysign.rs
-fn copysign(x: f64, y: f64) -> f64 {
-    let mut ux = x.to_bits();
-    let uy = y.to_bits();
-    ux &= (!0) >> 1;
-    ux |= uy & (1 << 63);
-    f64::from_bits(ux)
-}
--- a/examples/application.rs
+++ b/examples/application.rs
--- a/examples/child_window.rs
+++ b/examples/child_window.rs
@@ -1,129 +0,0 @@
-#[cfg(any(x11_platform, macos_platform, windows_platform))]
-#[allow(deprecated)]
-fn main() -> Result<(), impl std::error::Error> {
-    use std::collections::HashMap;
-
-    use winit::application::ApplicationHandler;
-    use winit::dpi::{LogicalPosition, LogicalSize, Position};
-    use winit::event::{ElementState, KeyEvent, WindowEvent};
-    use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::raw_window_handle::HasRawWindowHandle;
-    use winit::window::{Window, WindowAttributes, WindowId};
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    #[derive(Debug)]
-    struct WindowData {
-        window: Box<dyn Window>,
-        color: u32,
-    }
-
-    impl WindowData {
-        fn new(window: Box<dyn Window>, color: u32) -> Self {
-            Self { window, color }
-        }
-    }
-
-    #[derive(Default, Debug)]
-    struct Application {
-        parent_window_id: Option<WindowId>,
-        windows: HashMap<WindowId, WindowData>,
-    }
-
-    impl ApplicationHandler for Application {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-            let attributes = WindowAttributes::default()
-                .with_title("parent window")
-                .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
-                .with_surface_size(LogicalSize::new(640.0f32, 480.0f32));
-            let window = event_loop.create_window(attributes).unwrap();
-            println!("Parent window id: {:?})", window.id());
-            self.parent_window_id = Some(window.id());
-
-            self.windows.insert(window.id(), WindowData::new(window, 0xffbbbbbb));
-        }
-
-        fn window_event(
-            &mut self,
-            event_loop: &dyn ActiveEventLoop,
-            window_id: winit::window::WindowId,
-            event: WindowEvent,
-        ) {
-            match event {
-                WindowEvent::CloseRequested => {
-                    self.windows.clear();
-                    event_loop.exit();
-                },
-                WindowEvent::PointerEntered { device_id: _, .. } => {
-                    // On x11, println when the cursor entered in a window even if the child window
-                    // is created by some key inputs.
-                    // the child windows are always placed at (0, 0) with size (200, 200) in the
-                    // parent window, so we also can see this log when we move
-                    // the cursor around (200, 200) in parent window.
-                    println!("cursor entered in the window {window_id:?}");
-                },
-                WindowEvent::KeyboardInput {
-                    event: KeyEvent { state: ElementState::Pressed, .. },
-                    ..
-                } => {
-                    let child_index = self.windows.len() - 1;
-                    let child_color =
-                        0xff000000 + 3_u32.pow((child_index + 2).rem_euclid(16) as u32);
-
-                    let parent_window = self.windows.get(&self.parent_window_id.unwrap()).unwrap();
-                    let child_window =
-                        spawn_child_window(parent_window.window.as_ref(), event_loop, child_index);
-                    let child_id = child_window.id();
-                    println!("Child window created with id: {child_id:?}");
-                    self.windows.insert(child_id, WindowData::new(child_window, child_color));
-                },
-                WindowEvent::RedrawRequested => {
-                    if let Some(window) = self.windows.get(&window_id) {
-                        if window_id == self.parent_window_id.unwrap() {
-                            fill::fill_window(window.window.as_ref());
-                        } else {
-                            fill::fill_window_with_color(window.window.as_ref(), window.color);
-                        }
-                    }
-                },
-                _ => (),
-            }
-        }
-    }
-
-    fn spawn_child_window(
-        parent: &dyn Window,
-        event_loop: &dyn ActiveEventLoop,
-        child_count: usize,
-    ) -> Box<dyn Window> {
-        let parent = parent.raw_window_handle().unwrap();
-
-        // As child count increases, x goes from 0*128 to 5*128 and then repeats
-        let x: f64 = child_count.rem_euclid(5) as f64 * 128.0;
-
-        // After 5 windows have been put side by side horizontally, a new row starts
-        let y: f64 = (child_count / 5) as f64 * 96.0;
-
-        let mut window_attributes = WindowAttributes::default()
-            .with_title("child window")
-            .with_surface_size(LogicalSize::new(128.0f32, 96.0))
-            .with_position(Position::Logical(LogicalPosition::new(x, y)))
-            .with_visible(true);
-        // `with_parent_window` is unsafe. Parent window must be a valid window.
-        window_attributes = unsafe { window_attributes.with_parent_window(Some(parent)) };
-
-        event_loop.create_window(window_attributes).unwrap()
-    }
-
-    let event_loop = EventLoop::new().unwrap();
-    event_loop.run_app(Application::default())
-}
-
-#[cfg(not(any(x11_platform, macos_platform, windows_platform)))]
-fn main() {
-    panic!(
-        "This example is supported only on x11, macOS, and Windows, with the `rwh_06` feature \
-         enabled."
-    );
-}
--- a/examples/control_flow.rs
+++ b/examples/control_flow.rs
@@ -1,146 +0,0 @@
-#![allow(clippy::single_match)]
-
-use std::thread;
-#[cfg(not(web_platform))]
-use std::time;
-
-use ::tracing::{info, warn};
-#[cfg(web_platform)]
-use web_time as time;
-use winit::application::ApplicationHandler;
-use winit::event::{ElementState, KeyEvent, StartCause, WindowEvent};
-use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
-use winit::keyboard::{Key, NamedKey};
-use winit::window::{Window, WindowAttributes, WindowId};
-
-#[path = "util/fill.rs"]
-mod fill;
-#[path = "util/tracing.rs"]
-mod tracing;
-
-const WAIT_TIME: time::Duration = time::Duration::from_millis(100);
-const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(100);
-
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
-enum Mode {
-    #[default]
-    Wait,
-    WaitUntil,
-    Poll,
-}
-
-fn main() -> Result<(), impl std::error::Error> {
-    #[cfg(web_platform)]
-    console_error_panic_hook::set_once();
-
-    tracing::init();
-
-    info!("Press '1' to switch to Wait mode.");
-    info!("Press '2' to switch to WaitUntil mode.");
-    info!("Press '3' to switch to Poll mode.");
-    info!("Press 'R' to toggle request_redraw() calls.");
-    info!("Press 'Esc' to close the window.");
-
-    let event_loop = EventLoop::new().unwrap();
-
-    event_loop.run_app(ControlFlowDemo::default())
-}
-
-#[derive(Default, Debug)]
-struct ControlFlowDemo {
-    mode: Mode,
-    request_redraw: bool,
-    wait_cancelled: bool,
-    close_requested: bool,
-    window: Option<Box<dyn Window>>,
-}
-
-impl ApplicationHandler for ControlFlowDemo {
-    fn new_events(&mut self, _event_loop: &dyn ActiveEventLoop, cause: StartCause) {
-        info!("new_events: {cause:?}");
-
-        self.wait_cancelled = match cause {
-            StartCause::WaitCancelled { .. } => self.mode == Mode::WaitUntil,
-            _ => false,
-        }
-    }
-
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        let window_attributes = WindowAttributes::default().with_title(
-            "Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.",
-        );
-        self.window = Some(event_loop.create_window(window_attributes).unwrap());
-    }
-
-    fn window_event(
-        &mut self,
-        _event_loop: &dyn ActiveEventLoop,
-        _window_id: WindowId,
-        event: WindowEvent,
-    ) {
-        info!("{event:?}");
-
-        match event {
-            WindowEvent::CloseRequested => {
-                self.close_requested = true;
-            },
-            WindowEvent::KeyboardInput {
-                event: KeyEvent { logical_key: key, state: ElementState::Pressed, .. },
-                ..
-            } => match key.as_ref() {
-                // WARNING: Consider using `key_without_modifiers()` if available on your platform.
-                // See the `key_binding` example
-                Key::Character("1") => {
-                    self.mode = Mode::Wait;
-                    warn!("mode: {:?}", self.mode);
-                },
-                Key::Character("2") => {
-                    self.mode = Mode::WaitUntil;
-                    warn!("mode: {:?}", self.mode);
-                },
-                Key::Character("3") => {
-                    self.mode = Mode::Poll;
-                    warn!("mode: {:?}", self.mode);
-                },
-                Key::Character("r") => {
-                    self.request_redraw = !self.request_redraw;
-                    warn!("request_redraw: {}", self.request_redraw);
-                },
-                Key::Named(NamedKey::Escape) => {
-                    self.close_requested = true;
-                },
-                _ => (),
-            },
-            WindowEvent::RedrawRequested => {
-                let window = self.window.as_ref().unwrap();
-                window.pre_present_notify();
-                fill::fill_window(window.as_ref());
-            },
-            _ => (),
-        }
-    }
-
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
-        if self.request_redraw && !self.wait_cancelled && !self.close_requested {
-            self.window.as_ref().unwrap().request_redraw();
-        }
-
-        match self.mode {
-            Mode::Wait => event_loop.set_control_flow(ControlFlow::Wait),
-            Mode::WaitUntil => {
-                if !self.wait_cancelled {
-                    event_loop
-                        .set_control_flow(ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME));
-                }
-            },
-            Mode::Poll => {
-                thread::sleep(POLL_SLEEP_TIME);
-                event_loop.set_control_flow(ControlFlow::Poll);
-            },
-        };
-
-        if self.close_requested {
-            event_loop.exit();
-        }
-    }
-}
--- a/examples/cursor.rs
+++ b/examples/cursor.rs
@@ -0,0 +1,31 @@
+extern crate winit;
+
+use winit::{Event, ElementState, MouseCursor, WindowEvent};
+
+fn main() {
+    let events_loop = winit::EventsLoop::new();
+
+    let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
+    window.set_title("A fantastic window!");
+
+    let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::NoneCursor, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize];
+    let mut cursor_idx = 0;
+
+    events_loop.run_forever(|event| {
+        match event {
+            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 {
+                    cursor_idx += 1;
+                } else {
+                    cursor_idx = 0;
+                }
+            },
+            Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+                events_loop.interrupt()
+            },
+            _ => ()
+        }
+    });
+}
--- a/examples/data/cross.png
+++ b/examples/data/cross.png
--- a/examples/data/cross2.png
+++ b/examples/data/cross2.png
--- a/examples/data/gradient.png
+++ b/examples/data/gradient.png
--- a/examples/data/icon.png
+++ b/examples/data/icon.png
--- a/examples/dnd.rs
+++ b/examples/dnd.rs
@@ -1,65 +0,0 @@
-use std::error::Error;
-
-use winit::application::ApplicationHandler;
-use winit::event::WindowEvent;
-use winit::event_loop::{ActiveEventLoop, EventLoop};
-use winit::window::{Window, WindowAttributes, WindowId};
-
-#[path = "util/fill.rs"]
-mod fill;
-#[path = "util/tracing.rs"]
-mod tracing;
-
-fn main() -> Result<(), Box<dyn Error>> {
-    tracing::init();
-
-    let event_loop = EventLoop::new()?;
-
-    let app = Application::new();
-    Ok(event_loop.run_app(app)?)
-}
-
-/// Application state and event handling.
-#[derive(Debug)]
-struct Application {
-    window: Option<Box<dyn Window>>,
-}
-
-impl Application {
-    fn new() -> Self {
-        Self { window: None }
-    }
-}
-
-impl ApplicationHandler for Application {
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        let window_attributes =
-            WindowAttributes::default().with_title("Drag and drop files on me!");
-        self.window = Some(event_loop.create_window(window_attributes).unwrap());
-    }
-
-    fn window_event(
-        &mut self,
-        event_loop: &dyn ActiveEventLoop,
-        _window_id: WindowId,
-        event: WindowEvent,
-    ) {
-        match event {
-            WindowEvent::DragLeft { .. }
-            | WindowEvent::DragEntered { .. }
-            | WindowEvent::DragMoved { .. }
-            | WindowEvent::DragDropped { .. } => {
-                println!("{event:?}");
-            },
-            WindowEvent::RedrawRequested => {
-                let window = self.window.as_ref().unwrap();
-                window.pre_present_notify();
-                fill::fill_window(window.as_ref());
-            },
-            WindowEvent::CloseRequested => {
-                event_loop.exit();
-            },
-            _ => {},
-        }
-    }
-}
--- a/examples/fullscreen.rs
+++ b/examples/fullscreen.rs
@@ -0,0 +1,46 @@
+extern crate winit;
+
+use std::io::{self, Write};
+
+fn main() {
+    // enumerating monitors
+    let monitor = {
+        for (num, monitor) in winit::get_available_monitors().enumerate() {
+            println!("Monitor #{}: {:?}", num, monitor.get_name());
+        }
+
+        print!("Please write the number of the monitor to use: ");
+        io::stdout().flush().unwrap();
+
+        let mut num = String::new();
+        io::stdin().read_line(&mut num).unwrap();
+        let num = num.trim().parse().ok().expect("Please enter a number");
+        let monitor = winit::get_available_monitors().nth(num).expect("Please enter a valid ID");
+
+        println!("Using {:?}", monitor.get_name());
+
+        monitor
+    };
+
+    let events_loop = winit::EventsLoop::new();
+
+    let _window = winit::WindowBuilder::new()
+        .with_title("Hello world!")
+        .with_fullscreen(monitor)
+        .build(&events_loop)
+        .unwrap();
+
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);
+
+        match event {
+            winit::Event::WindowEvent { event, .. } => {
+                match event {
+                    winit::WindowEvent::Closed => events_loop.interrupt(),
+                    winit::WindowEvent::KeyboardInput(_, _, Some(winit::VirtualKeyCode::Escape), _) => events_loop.interrupt(),
+                    _ => ()
+                }
+            },
+        }
+    });
+}
--- a/examples/grabbing.rs
+++ b/examples/grabbing.rs
@@ -0,0 +1,42 @@
+extern crate winit;
+
+use winit::{WindowEvent, ElementState};
+
+fn main() {
+    let events_loop = winit::EventsLoop::new();
+
+    let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
+    window.set_title("winit - Cursor grabbing test");
+
+    let mut grabbed = false;
+
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);
+
+        match event {
+            winit::Event::WindowEvent { event, .. } => {
+                match event {
+                    WindowEvent::KeyboardInput(ElementState::Pressed, _, _, _) => {
+                        if grabbed {
+                            grabbed = false;
+                            window.set_cursor_state(winit::CursorState::Normal)
+                                .ok().expect("could not ungrab mouse cursor");
+                        } else {
+                            grabbed = true;
+                            window.set_cursor_state(winit::CursorState::Grab)
+                                .ok().expect("could not grab mouse cursor");
+                        }
+                    },
+
+                    WindowEvent::Closed => events_loop.interrupt(),
+
+                    a @ WindowEvent::MouseMoved(_, _) => {
+                        println!("{:?}", a);
+                    },
+
+                    _ => (),
+                }
+            },
+        }
+    });
+}
--- a/examples/min_max_size.rs
+++ b/examples/min_max_size.rs
@@ -0,0 +1,20 @@
+extern crate winit;
+
+fn main() {
+    let events_loop = winit::EventsLoop::new();
+
+    let _window = winit::WindowBuilder::new()
+        .with_min_dimensions(400, 200)
+        .with_max_dimensions(800, 400)
+        .build(&events_loop)
+        .unwrap();
+
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);
+
+        match event {
+            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
+            _ => ()
+        }
+    });
+}
--- a/examples/multiwindow.rs
+++ b/examples/multiwindow.rs
@@ -0,0 +1,33 @@
+extern crate winit;
+
+fn main() {
+    let events_loop = winit::EventsLoop::new();
+
+    let window1 = winit::Window::new(&events_loop).unwrap();
+    let window2 = winit::Window::new(&events_loop).unwrap();
+    let window3 = winit::Window::new(&events_loop).unwrap();
+
+    let mut num_windows = 3;
+
+    events_loop.run_forever(|event| {
+        match event {
+            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, window_id } => {
+                if window_id == window1.id() {
+                    println!("Window 1 has been closed")
+                } else if window_id == window2.id() {
+                    println!("Window 2 has been closed")
+                } else if window_id == window3.id() {
+                    println!("Window 3 has been closed");
+                } else {
+                    unreachable!()
+                }
+
+                num_windows -= 1;
+                if num_windows == 0 {
+                    events_loop.interrupt();
+                }
+            },
+            _ => (),
+        }
+    })
+}
--- a/examples/pump_events.rs
+++ b/examples/pump_events.rs
@@ -1,80 +0,0 @@
-#![allow(clippy::single_match)]
-
-// Limit this example to only compatible platforms.
-#[cfg(any(windows_platform, macos_platform, x11_platform, wayland_platform, android_platform,))]
-fn main() -> std::process::ExitCode {
-    use std::process::ExitCode;
-    use std::thread::sleep;
-    use std::time::Duration;
-
-    use winit::application::ApplicationHandler;
-    use winit::event::WindowEvent;
-    use winit::event_loop::pump_events::{EventLoopExtPumpEvents, PumpStatus};
-    use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::window::{Window, WindowAttributes, WindowId};
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    #[derive(Default, Debug)]
-    struct PumpDemo {
-        window: Option<Box<dyn Window>>,
-    }
-
-    impl ApplicationHandler for PumpDemo {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-            let window_attributes = WindowAttributes::default().with_title("A fantastic window!");
-            self.window = Some(event_loop.create_window(window_attributes).unwrap());
-        }
-
-        fn window_event(
-            &mut self,
-            event_loop: &dyn ActiveEventLoop,
-            _window_id: WindowId,
-            event: WindowEvent,
-        ) {
-            println!("{event:?}");
-
-            let window = match self.window.as_ref() {
-                Some(window) => window,
-                None => return,
-            };
-
-            match event {
-                WindowEvent::CloseRequested => event_loop.exit(),
-                WindowEvent::RedrawRequested => {
-                    fill::fill_window(window.as_ref());
-                    window.request_redraw();
-                },
-                _ => (),
-            }
-        }
-    }
-
-    let mut event_loop = EventLoop::new().unwrap();
-
-    tracing_subscriber::fmt::init();
-
-    let mut app = PumpDemo::default();
-
-    loop {
-        let timeout = Some(Duration::ZERO);
-        let status = event_loop.pump_app_events(timeout, &mut app);
-
-        if let PumpStatus::Exit(exit_code) = status {
-            break ExitCode::from(exit_code as u8);
-        }
-
-        // Sleep for 1/60 second to simulate application work
-        //
-        // Since `pump_events` doesn't block it will be important to
-        // throttle the loop in the app somehow.
-        println!("Update()");
-        sleep(Duration::from_millis(16));
-    }
-}
-
-#[cfg(any(ios_platform, web_platform, orbital_platform))]
-fn main() {
-    println!("This platform doesn't support pump_events.");
-}
--- a/examples/run_on_demand.rs
+++ b/examples/run_on_demand.rs
@@ -1,99 +0,0 @@
-#![allow(clippy::single_match)]
-
-// Limit this example to only compatible platforms.
-#[cfg(any(windows_platform, macos_platform, x11_platform, wayland_platform,))]
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    use std::time::Duration;
-
-    use winit::application::ApplicationHandler;
-    use winit::event::WindowEvent;
-    use winit::event_loop::run_on_demand::EventLoopExtRunOnDemand;
-    use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::window::{Window, WindowAttributes, WindowId};
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    #[derive(Default, Debug)]
-    struct App {
-        idx: usize,
-        window_id: Option<WindowId>,
-        window: Option<Box<dyn Window>>,
-    }
-
-    impl ApplicationHandler for App {
-        fn about_to_wait(&mut self, _event_loop: &dyn ActiveEventLoop) {
-            if let Some(window) = self.window.as_ref() {
-                window.request_redraw();
-            }
-        }
-
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-            let window_attributes = WindowAttributes::default()
-                .with_title("Fantastic window number one!")
-                .with_surface_size(winit::dpi::LogicalSize::new(128.0, 128.0));
-            let window = event_loop.create_window(window_attributes).unwrap();
-            self.window_id = Some(window.id());
-            self.window = Some(window);
-        }
-
-        fn window_event(
-            &mut self,
-            event_loop: &dyn ActiveEventLoop,
-            window_id: WindowId,
-            event: WindowEvent,
-        ) {
-            if event == WindowEvent::Destroyed && self.window_id == Some(window_id) {
-                println!(
-                    "--------------------------------------------------------- Window {} Destroyed",
-                    self.idx
-                );
-                self.window_id = None;
-                event_loop.exit();
-                return;
-            }
-
-            let window = match self.window.as_mut() {
-                Some(window) => window,
-                None => return,
-            };
-
-            match event {
-                WindowEvent::CloseRequested => {
-                    println!(
-                        "--------------------------------------------------------- Window {} \
-                         CloseRequested",
-                        self.idx
-                    );
-                    fill::cleanup_window(window.as_ref());
-                    self.window = None;
-                },
-                WindowEvent::RedrawRequested => {
-                    fill::fill_window(window.as_ref());
-                },
-                _ => (),
-            }
-        }
-    }
-
-    tracing_subscriber::fmt::init();
-
-    let mut event_loop = EventLoop::new().unwrap();
-
-    let mut app = App { idx: 1, ..Default::default() };
-    event_loop.run_app_on_demand(&mut app)?;
-
-    println!("--------------------------------------------------------- Finished first loop");
-    println!("--------------------------------------------------------- Waiting 5 seconds");
-    std::thread::sleep(Duration::from_secs(5));
-
-    app.idx += 1;
-    event_loop.run_app_on_demand(&mut app)?;
-    println!("--------------------------------------------------------- Finished second loop");
-    Ok(())
-}
-
-#[cfg(not(any(windows_platform, macos_platform, x11_platform, wayland_platform,)))]
-fn main() {
-    println!("This example is not supported on this platform");
-}
--- a/examples/transparent.rs
+++ b/examples/transparent.rs
@@ -0,0 +1,20 @@
+extern crate winit;
+
+fn main() {
+    let events_loop = winit::EventsLoop::new();
+
+    let window = winit::WindowBuilder::new().with_decorations(false)
+                                                 .with_transparency(true)
+                                                 .build(&events_loop).unwrap();
+
+    window.set_title("A fantastic window!");
+
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);
+
+        match event {
+            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
+            _ => ()
+        }
+    });
+}
--- a/examples/util/fill.rs
+++ b/examples/util/fill.rs
@@ -1,156 +0,0 @@
-//! Fill the window buffer with a solid color.
-//!
-//! Launching a window without drawing to it has unpredictable results varying from platform to
-//! platform. In order to have well-defined examples, this module provides an easy way to
-//! fill the window buffer with a solid color.
-//!
-//! The `softbuffer` crate is used, largely because of its ease of use. `glutin` or `wgpu` could
-//! also be used to fill the window buffer, but they are more complicated to use.
-
-#[allow(unused_imports)]
-pub use platform::cleanup_window;
-#[allow(unused_imports)]
-pub use platform::fill_window;
-#[allow(unused_imports)]
-pub use platform::fill_window_with_animated_color;
-#[allow(unused_imports)]
-pub use platform::fill_window_with_color;
-
-#[cfg(not(any(target_os = "android", target_os = "ios")))]
-mod platform {
-    use std::cell::RefCell;
-    use std::collections::HashMap;
-    use std::mem;
-    use std::mem::ManuallyDrop;
-    use std::num::NonZeroU32;
-    #[cfg(all(not(android_platform), not(web_platform)))]
-    use std::time::Instant;
-
-    use softbuffer::{Context, Surface};
-    #[cfg(all(web_platform, not(android_platform)))]
-    use web_time::Instant;
-    use winit::window::{Window, WindowId};
-
-    thread_local! {
-        // NOTE: You should never do things like that, create context and drop it before
-        // you drop the event loop. We do this for brevity to not blow up examples. We use
-        // ManuallyDrop to prevent destructors from running.
-        //
-        // A static, thread-local map of graphics contexts to open windows.
-        static GC: ManuallyDrop<RefCell<Option<GraphicsContext>>> = const { ManuallyDrop::new(RefCell::new(None)) };
-    }
-
-    /// The graphics context used to draw to a window.
-    struct GraphicsContext {
-        /// The global softbuffer context.
-        context: RefCell<Context<&'static dyn Window>>,
-
-        /// The hash map of window IDs to surfaces.
-        surfaces: HashMap<WindowId, Surface<&'static dyn Window, &'static dyn Window>>,
-    }
-
-    impl GraphicsContext {
-        fn new(w: &dyn Window) -> Self {
-            Self {
-                context: RefCell::new(
-                    Context::new(unsafe {
-                        mem::transmute::<&'_ dyn Window, &'static dyn Window>(w)
-                    })
-                    .expect("Failed to create a softbuffer context"),
-                ),
-                surfaces: HashMap::new(),
-            }
-        }
-
-        fn create_surface(
-            &mut self,
-            window: &dyn Window,
-        ) -> &mut Surface<&'static dyn Window, &'static dyn Window> {
-            self.surfaces.entry(window.id()).or_insert_with(|| {
-                Surface::new(&self.context.borrow(), unsafe {
-                    mem::transmute::<&'_ dyn Window, &'static dyn Window>(window)
-                })
-                .expect("Failed to create a softbuffer surface")
-            })
-        }
-
-        fn destroy_surface(&mut self, window: &dyn Window) {
-            self.surfaces.remove(&window.id());
-        }
-    }
-
-    pub fn fill_window_with_color(window: &dyn Window, color: u32) {
-        GC.with(|gc| {
-            let size = window.surface_size();
-            let (Some(width), Some(height)) =
-                (NonZeroU32::new(size.width), NonZeroU32::new(size.height))
-            else {
-                return;
-            };
-
-            // Either get the last context used or create a new one.
-            let mut gc = gc.borrow_mut();
-            let surface =
-                gc.get_or_insert_with(|| GraphicsContext::new(window)).create_surface(window);
-
-            // Fill a buffer with a solid color
-
-            surface.resize(width, height).expect("Failed to resize the softbuffer surface");
-
-            let mut buffer = surface.buffer_mut().expect("Failed to get the softbuffer buffer");
-            buffer.fill(color);
-            buffer.present().expect("Failed to present the softbuffer buffer");
-        })
-    }
-
-    #[allow(dead_code)]
-    pub fn fill_window(window: &dyn Window) {
-        fill_window_with_color(window, 0xff181818);
-    }
-
-    #[allow(dead_code)]
-    pub fn fill_window_with_animated_color(window: &dyn Window, start: Instant) {
-        let time = start.elapsed().as_secs_f32() * 1.5;
-        let blue = (time.sin() * 255.0) as u32;
-        let green = ((time.cos() * 255.0) as u32) << 8;
-        let red = ((1.0 - time.sin() * 255.0) as u32) << 16;
-        let color = red | green | blue;
-        fill_window_with_color(window, color);
-    }
-
-    #[allow(dead_code)]
-    pub fn cleanup_window(window: &dyn Window) {
-        GC.with(|gc| {
-            let mut gc = gc.borrow_mut();
-            if let Some(context) = gc.as_mut() {
-                context.destroy_surface(window);
-            }
-        });
-    }
-}
-
-#[cfg(any(target_os = "android", target_os = "ios"))]
-mod platform {
-    #[allow(dead_code)]
-    pub fn fill_window(_window: &dyn winit::window::Window) {
-        // No-op on mobile platforms.
-    }
-
-    #[allow(dead_code)]
-    pub fn fill_window_with_color(_window: &dyn winit::window::Window, _color: u32) {
-        // No-op on mobile platforms.
-    }
-
-    #[allow(dead_code)]
-    pub fn fill_window_with_animated_color(
-        _window: &dyn winit::window::Window,
-        _start: std::time::Instant,
-    ) {
-        // No-op on mobile platforms.
-    }
-
-    #[allow(dead_code)]
-    pub fn cleanup_window(_window: &dyn winit::window::Window) {
-        // No-op on mobile platforms.
-    }
-}
--- a/examples/util/tracing.rs
+++ b/examples/util/tracing.rs
@@ -1,25 +0,0 @@
-#[cfg(not(web_platform))]
-pub fn init() {
-    use tracing_subscriber::filter::{EnvFilter, LevelFilter};
-
-    tracing_subscriber::fmt()
-        .with_env_filter(
-            EnvFilter::builder().with_default_directive(LevelFilter::INFO.into()).from_env_lossy(),
-        )
-        .init();
-}
-
-#[cfg(web_platform)]
-pub fn init() {
-    use tracing_subscriber::layer::SubscriberExt;
-    use tracing_subscriber::util::SubscriberInitExt;
-
-    tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::fmt::layer()
-                .with_ansi(false)
-                .without_time()
-                .with_writer(tracing_web::MakeWebConsoleWriter::new()),
-        )
-        .init();
-}
--- a/examples/window.rs
+++ b/examples/window.rs
@@ -1,84 +1,19 @@
-//! Simple winit window example.
+extern crate winit;

-use std::error::Error;
+fn main() {
+    let events_loop = winit::EventsLoop::new();

-use winit::application::ApplicationHandler;
-use winit::event::WindowEvent;
-use winit::event_loop::{ActiveEventLoop, EventLoop};
-#[cfg(web_platform)]
-use winit::platform::web::WindowAttributesWeb;
-use winit::window::{Window, WindowAttributes, WindowId};
+    let window = winit::WindowBuilder::new()
+        .with_title("A fantastic window!")
+        .build(&events_loop)
+        .unwrap();

-#[path = "util/fill.rs"]
-mod fill;
-#[path = "util/tracing.rs"]
-mod tracing;
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);

-#[derive(Default, Debug)]
-struct App {
-    window: Option<Box<dyn Window>>,
-}
-
-impl ApplicationHandler for App {
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        #[cfg(not(web_platform))]
-        let window_attributes = WindowAttributes::default();
-        #[cfg(web_platform)]
-        let window_attributes = WindowAttributes::default()
-            .with_platform_attributes(Box::new(WindowAttributesWeb::default().with_append(true)));
-        self.window = match event_loop.create_window(window_attributes) {
-            Ok(window) => Some(window),
-            Err(err) => {
-                eprintln!("error creating window: {err}");
-                event_loop.exit();
-                return;
-            },
-        }
-    }
-
-    fn window_event(&mut self, event_loop: &dyn ActiveEventLoop, _: WindowId, event: WindowEvent) {
-        println!("{event:?}");
        match event {
-            WindowEvent::CloseRequested => {
-                println!("Close was requested; stopping");
-                event_loop.exit();
-            },
-            WindowEvent::SurfaceResized(_) => {
-                self.window.as_ref().expect("resize event without a window").request_redraw();
-            },
-            WindowEvent::RedrawRequested => {
-                // Redraw the application.
-                //
-                // It's preferable for applications that do not render continuously to render in
-                // this event rather than in AboutToWait, since rendering in here allows
-                // the program to gracefully handle redraws requested by the OS.
-
-                let window = self.window.as_ref().expect("redraw request without a window");
-
-                // Notify that you're about to draw.
-                window.pre_present_notify();
-
-                // Draw.
-                fill::fill_window(window.as_ref());
-
-                // For contiguous redraw loop you can request a redraw from here.
-                // window.request_redraw();
-            },
-            _ => (),
+            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
+            _ => ()
        }
-    }
-}
-
-fn main() -> Result<(), Box<dyn Error>> {
-    #[cfg(web_platform)]
-    console_error_panic_hook::set_once();
-
-    tracing::init();
-
-    let event_loop = EventLoop::new()?;
-
-    // For alternative loop run options see `pump_events` and `run_on_demand` examples.
-    event_loop.run_app(App::default())?;
-
-    Ok(())
+    });
 }
--- a/examples/x11_embed.rs
+++ b/examples/x11_embed.rs
@@ -1,71 +0,0 @@
-//! A demonstration of embedding a winit window in an existing X11 application.
-use std::error::Error;
-
-#[cfg(x11_platform)]
-fn main() -> Result<(), Box<dyn Error>> {
-    use winit::application::ApplicationHandler;
-    use winit::event::WindowEvent;
-    use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::platform::x11::WindowAttributesX11;
-    use winit::window::{Window, WindowAttributes, WindowId};
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    #[derive(Debug)]
-    pub struct XEmbedDemo {
-        parent_window_id: u32,
-        window: Option<Box<dyn Window>>,
-    }
-
-    impl ApplicationHandler for XEmbedDemo {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-            let mut window_attributes = WindowAttributes::default()
-                .with_title("An embedded window!")
-                .with_surface_size(winit::dpi::LogicalSize::new(128.0, 128.0));
-            let x11_attrs =
-                WindowAttributesX11::default().with_embed_parent_window(self.parent_window_id);
-            window_attributes = window_attributes.with_platform_attributes(Box::new(x11_attrs));
-
-            self.window = Some(event_loop.create_window(window_attributes).unwrap());
-        }
-
-        fn window_event(
-            &mut self,
-            event_loop: &dyn ActiveEventLoop,
-            _window_id: WindowId,
-            event: WindowEvent,
-        ) {
-            let window = self.window.as_ref().unwrap();
-            match event {
-                WindowEvent::CloseRequested => event_loop.exit(),
-                WindowEvent::RedrawRequested => {
-                    window.pre_present_notify();
-                    fill::fill_window(window.as_ref());
-                },
-                _ => (),
-            }
-        }
-
-        fn about_to_wait(&mut self, _event_loop: &dyn ActiveEventLoop) {
-            self.window.as_ref().unwrap().request_redraw();
-        }
-    }
-
-    // First argument should be a 32-bit X11 window ID.
-    let parent_window_id = std::env::args()
-        .nth(1)
-        .ok_or("Expected a 32-bit X11 window ID as the first argument.")?
-        .parse::<u32>()?;
-
-    tracing_subscriber::fmt::init();
-    let event_loop = EventLoop::new()?;
-
-    Ok(event_loop.run_app(XEmbedDemo { parent_window_id, window: None })?)
-}
-
-#[cfg(not(x11_platform))]
-fn main() -> Result<(), Box<dyn Error>> {
-    println!("This example is only supported on X11 platforms.");
-    Ok(())
-}
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,20 +0,0 @@
-comment_width = 100
-condense_wildcard_suffixes = true
-error_on_unformatted = true
-format_code_in_doc_comments = true
-format_macro_bodies = true
-format_macro_matchers = true
-format_strings = true
-group_imports = "StdExternalCrate"
-hex_literal_case = "Lower"
-imports_granularity = "Module"
-match_block_trailing_comma = true
-newline_style = "Unix"
-normalize_comments = true
-normalize_doc_attributes = true
-overflow_delimited_expr = true
-# Some macros break with this.
-reorder_impl_items = false
-use_field_init_shorthand = true
-use_small_heuristics = "Max"
-wrap_comments = true
--- a/src/api_transition.rs
+++ b/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 _);
+                }
+            }
+        }
+    };
+}
--- a/src/events.rs
+++ b/src/events.rs
@@ -0,0 +1,339 @@
+use std::path::PathBuf;
+use WindowId;
+
+#[derive(Clone, Debug)]
+pub enum Event {
+    WindowEvent {
+        window_id: WindowId,
+        event: WindowEvent,
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum WindowEvent {
+    // TODO: remove ; can break the lib internally so be careful
+    Awakened,
+
+    /// The size of the window has changed.
+    Resized(u32, u32),
+
+    /// The position of the window has changed.
+    Moved(i32, i32),
+
+    /// The window has been closed.
+    Closed,
+
+    /// A file has been dropped into the window.
+    DroppedFile(PathBuf),
+
+    /// The window received a unicode character.
+    ReceivedCharacter(char),
+
+    /// The window gained or lost focus.
+    ///
+    /// The parameter is true if the window has gained focus, and false if it has lost focus.
+    Focused(bool),
+
+    /// An event from the keyboard has been received.
+    KeyboardInput(ElementState, ScanCode, Option<VirtualKeyCode>, ModifiersState),
+
+    /// The cursor has moved on the window.
+    ///
+    /// The parameter are the (x,y) coords in pixels relative to the top-left corner of the window.
+    MouseMoved(i32, i32),
+
+    /// The cursor has entered the window.
+    MouseEntered,
+
+    /// The cursor has left the window.
+    MouseLeft,
+
+    /// A mouse wheel movement or touchpad scroll occurred.
+    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(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)
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+pub enum TouchPhase {
+    Started,
+    Moved,
+    Ended,
+    Cancelled
+}
+
+#[derive(Debug, Clone, Copy)]
+/// Represents touch event
+///
+/// Every time user touches screen new Start event with some finger id is generated.
+/// When the finger is removed from the screen End event with same id is generated.
+///
+/// For every id there will be at least 2 events with phases Start and End (or Cancelled).
+/// There may be 0 or more Move events.
+///
+///
+/// Depending on platform implementation id may or may not be reused by system after End event.
+///
+/// Gesture regonizer using this event should assume that Start event received with same id
+/// 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.
+pub struct Touch {
+    pub phase: TouchPhase,
+    pub location: (f64,f64),
+    /// unique identifier of a finger.
+    pub id: u64
+}
+
+pub type ScanCode = u8;
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+pub enum ElementState {
+    Pressed,
+    Released,
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+pub enum MouseButton {
+    Left,
+    Right,
+    Middle,
+    Other(u8),
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum MouseScrollDelta {
+	/// Amount in lines or rows to scroll in the horizontal
+	/// and vertical directions.
+	///
+	/// Positive values indicate movement forward
+	/// (away from the user) or rightwards.
+	LineDelta(f32, f32),
+	/// Amount in pixels to scroll in the horizontal and
+	/// vertical direction.
+	///
+	/// Scroll events are expressed as a PixelDelta if
+	/// supported by the device (eg. a touchpad) and
+	/// platform.
+	PixelDelta(f32, f32)
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
+pub enum VirtualKeyCode {
+    /// The '1' key over the letters.
+    Key1,
+    /// The '2' key over the letters.
+    Key2,
+    /// The '3' key over the letters.
+    Key3,
+    /// The '4' key over the letters.
+    Key4,
+    /// The '5' key over the letters.
+    Key5,
+    /// The '6' key over the letters.
+    Key6,
+    /// The '7' key over the letters.
+    Key7,
+    /// The '8' key over the letters.
+    Key8,
+    /// The '9' key over the letters.
+    Key9,
+    /// The '0' key over the 'O' and 'P' keys.
+    Key0,
+
+    A,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+    H,
+    I,
+    J,
+    K,
+    L,
+    M,
+    N,
+    O,
+    P,
+    Q,
+    R,
+    S,
+    T,
+    U,
+    V,
+    W,
+    X,
+    Y,
+    Z,
+
+    /// The Escape key, next to F1.
+    Escape,
+
+    F1,
+    F2,
+    F3,
+    F4,
+    F5,
+    F6,
+    F7,
+    F8,
+    F9,
+    F10,
+    F11,
+    F12,
+    F13,
+    F14,
+    F15,
+
+    /// Print Screen/SysRq.
+    Snapshot,
+    /// Scroll Lock.
+    Scroll,
+    /// Pause/Break key, next to Scroll lock.
+    Pause,
+
+    /// `Insert`, next to Backspace.
+    Insert,
+    Home,
+    Delete,
+    End,
+    PageDown,
+    PageUp,
+
+    Left,
+    Up,
+    Right,
+    Down,
+
+    /// The Backspace key, right over Enter.
+    // TODO: rename
+    Back,
+    /// The Enter key.
+    Return,
+    /// The space bar.
+    Space,
+
+    /// The "Compose" key on Linux.
+    Compose,
+
+    Numlock,
+    Numpad0,
+    Numpad1,
+    Numpad2,
+    Numpad3,
+    Numpad4,
+    Numpad5,
+    Numpad6,
+    Numpad7,
+    Numpad8,
+    Numpad9,
+
+    AbntC1,
+    AbntC2,
+    Add,
+    Apostrophe,
+    Apps,
+    At,
+    Ax,
+    Backslash,
+    Calculator,
+    Capital,
+    Colon,
+    Comma,
+    Convert,
+    Decimal,
+    Divide,
+    Equals,
+    Grave,
+    Kana,
+    Kanji,
+    LAlt,
+    LBracket,
+    LControl,
+    LMenu,
+    LShift,
+    LWin,
+    Mail,
+    MediaSelect,
+    MediaStop,
+    Minus,
+    Multiply,
+    Mute,
+    MyComputer,
+    NavigateForward, // also called "Prior"
+    NavigateBackward, // also called "Next"
+    NextTrack,
+    NoConvert,
+    NumpadComma,
+    NumpadEnter,
+    NumpadEquals,
+    OEM102,
+    Period,
+    PlayPause,
+    Power,
+    PrevTrack,
+    RAlt,
+    RBracket,
+    RControl,
+    RMenu,
+    RShift,
+    RWin,
+    Semicolon,
+    Slash,
+    Sleep,
+    Stop,
+    Subtract,
+    Sysrq,
+    Tab,
+    Underline,
+    Unlabeled,
+    VolumeDown,
+    VolumeUp,
+    Wake,
+    WebBack,
+    WebFavorites,
+    WebForward,
+    WebHome,
+    WebRefresh,
+    WebSearch,
+    WebStop,
+    Yen,
+}
+
+/// Represents the current state of the keyboard modifiers
+///
+/// Each field of this struct represents a modifier and is `true` if this modifier is active.
+#[derive(Default, Debug, Clone, Copy)]
+pub struct ModifiersState {
+    /// The "shift" key
+    pub shift: bool,
+    /// The "control" key
+    pub ctrl: bool,
+    /// The "alt" key
+    pub alt: bool,
+    /// The "logo" key
+    ///
+    /// This is the "windows" key on PC and "command" key on Mac.
+    pub logo: bool
+}
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -0,0 +1,404 @@
+//! Winit allows you to build a window on as many platforms as possible. 
+//!
+//! # Building a window
+//!
+//! Before you can build a window, you first need to build an `EventsLoop`. This is done with the
+//! `EventsLoop::new()` function. Example:
+//!
+//! ```no_run
+//! use winit::EventsLoop;
+//! let events_loop = EventsLoop::new();
+//! ```
+//!
+//! Once this is done there are two ways to create a window:
+//!
+//!  - Calling `Window::new(&events_loop)`.
+//!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
+//!
+//! 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.
+//!
+//! # Events handling
+//!
+//! Once a window has been created, it will *generate events*. For example whenever the user moves
+//! the window, resizes the window, moves the mouse, etc. an event is generated.
+//!
+//! The events generated by a window can be retreived from the `EventsLoop` the window was created
+//! with.
+//!
+//! There are two ways to do so. The first is to call `events_loop.poll_events(...)`, which will
+//! retreive all the events pending on the windows and immediately return after no new event is
+//! available. You usually want to use this method in application that render continuously on the
+//! screen, such as video games.
+//!
+//! ```no_run
+//! use winit::Event;
+//! use winit::WindowEvent;
+//! # use winit::EventsLoop;
+//! # let events_loop = EventsLoop::new();
+//!
+//! loop {
+//!     events_loop.poll_events(|event| {
+//!         match event {
+//!             Event::WindowEvent { event: WindowEvent::Resized(w, h), .. } => {
+//!                 println!("The window was resized to {}x{}", w, h);
+//!             },
+//!             _ => ()
+//!         }
+//!     });
+//! }
+//! ```
+//!
+//! The second way is to call `events_loop.run_forever(...)`. As its name tells, it will run
+//! forever unless it is stopped by calling `events_loop.interrupt()`.
+//!
+//! ```no_run
+//! use winit::Event;
+//! use winit::WindowEvent;
+//! # use winit::EventsLoop;
+//! # let events_loop = EventsLoop::new();
+//!
+//! events_loop.run_forever(|event| {
+//!     match event {
+//!         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+//!             println!("The window was closed ; stopping");
+//!             events_loop.interrupt();
+//!         },
+//!         _ => ()
+//!     }
+//! });
+//! ```
+//!
+//! If you use multiple windows, the `WindowEvent` event has a member named `window_id`. You can
+//! compare it with the value returned by the `id()` method of `Window` in order to know which
+//! window has received the event.
+//!
+//! # Drawing on the window
+//!
+//! Winit doesn't provide any function that allows drawing on a window. However it allows you to
+//! retreive the raw handle of the window (see the `os` module for that), which in turn allows you
+//! to create an OpenGL/Vulkan/DirectX/Metal/etc. context that will draw on the window.
+//!
+
+#[macro_use]
+extern crate lazy_static;
+
+#[macro_use]
+extern crate shared_library;
+
+extern crate libc;
+
+#[cfg(target_os = "windows")]
+extern crate winapi;
+#[cfg(target_os = "windows")]
+extern crate kernel32;
+#[cfg(target_os = "windows")]
+extern crate shell32;
+#[cfg(target_os = "windows")]
+extern crate gdi32;
+#[cfg(target_os = "windows")]
+extern crate user32;
+#[cfg(target_os = "windows")]
+extern crate dwmapi;
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[macro_use]
+extern crate objc;
+#[cfg(target_os = "macos")]
+extern crate cgl;
+#[cfg(target_os = "macos")]
+extern crate cocoa;
+#[cfg(target_os = "macos")]
+extern crate core_foundation;
+#[cfg(target_os = "macos")]
+extern crate core_graphics;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+extern crate x11_dl;
+#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd"))]
+#[macro_use(wayland_env,declare_handler)]
+extern crate wayland_client;
+
+use std::sync::Arc;
+
+pub use events::*;
+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;
+
+pub mod os;
+
+/// Represents a window.
+///
+/// # Example
+///
+/// ```no_run
+/// use winit::Event;
+/// use winit::EventsLoop;
+/// use winit::Window;
+/// use winit::WindowEvent;
+///
+/// let events_loop = EventsLoop::new();
+/// let window = Window::new(&events_loop).unwrap();
+///
+/// events_loop.run_forever(|event| {
+///     match event {
+///         Event::WindowEvent { event: WindowEvent::Closed, .. } => {
+///             events_loop.interrupt();
+///         },
+///         _ => ()
+///     }
+/// });
+/// ```
+pub struct Window {
+    window: platform::Window2,
+}
+
+/// Identifier of a window. Unique for each window.
+///
+/// Can be obtained with `window.id()`.
+///
+/// Whenever you receive an event specific to a window, this event contains a `WindowId` which you
+/// can then compare to the ids of your windows.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(platform::WindowId);
+
+/// 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: Arc<platform::EventsLoop>,
+}
+
+impl EventsLoop {
+    /// Builds a new events loop.
+    pub fn new() -> EventsLoop {
+        EventsLoop {
+            events_loop: Arc::new(platform::EventsLoop::new()),
+        }
+    }
+
+    /// Fetches all the events that are pending, calls the callback function for each of them,
+    /// and returns.
+    #[inline]
+    pub fn poll_events<F>(&self, callback: F)
+        where F: FnMut(Event)
+    {
+        self.events_loop.poll_events(callback)
+    }
+
+    /// Runs forever until `interrupt()` is called. Whenever an event happens, calls the callback.
+    #[inline]
+    pub fn run_forever<F>(&self, callback: F)
+        where F: FnMut(Event)
+    {
+        self.events_loop.run_forever(callback)
+    }
+
+    /// If we called `run_forever()`, stops the process of waiting for events.
+    // TODO: what if we're waiting from multiple threads?
+    #[inline]
+    pub fn interrupt(&self) {
+        self.events_loop.interrupt()
+    }
+}
+
+/// Object that allows you to build windows.
+#[derive(Clone)]
+pub struct WindowBuilder {
+    /// The attributes to use to create the window.
+    pub window: WindowAttributes,
+
+    // Platform-specific configuration. Private.
+    platform_specific: platform::PlatformSpecificWindowBuilderAttributes,
+}
+
+/// Error that can happen while creating a window or a headless renderer.
+#[derive(Debug)]
+pub enum CreationError {
+    OsError(String),
+    /// TODO: remove this error
+    NotSupported,
+}
+
+impl CreationError {
+    fn to_string(&self) -> &str {
+        match *self {
+            CreationError::OsError(ref text) => &text,
+            CreationError::NotSupported => "Some of the requested attributes are not supported",
+        }
+    }
+}
+
+impl std::fmt::Display for CreationError {
+    fn fmt(&self, formatter: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
+        formatter.write_str(self.to_string())
+    }
+}
+
+impl std::error::Error for CreationError {
+    fn description(&self) -> &str {
+        self.to_string()
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum MouseCursor {
+    /// The platform-dependent default cursor.
+    Default,
+    /// A simple crosshair.
+    Crosshair,
+    /// A hand (often used to indicate links in web browsers).
+    Hand,
+    /// Self explanatory.
+    Arrow,
+    /// Indicates something is to be moved.
+    Move,
+    /// Indicates text that may be selected or edited.
+    Text,
+    /// Program busy indicator.
+    Wait,
+    /// Help indicator (often rendered as a "?")
+    Help,
+    /// Progress indicator. Shows that processing is being done. But in contrast
+    /// with "Wait" the user may still interact with the program. Often rendered
+    /// as a spinning beach ball, or an arrow with a watch or hourglass.
+    Progress,
+
+    /// Cursor showing that something cannot be done.
+    NotAllowed,
+    ContextMenu,
+    NoneCursor,
+    Cell,
+    VerticalText,
+    Alias,
+    Copy,
+    NoDrop,
+    Grab,
+    Grabbing,
+    AllScroll,
+    ZoomIn,
+    ZoomOut,
+
+    /// Indicate that some edge is to be moved. For example, the 'SeResize' cursor
+    /// is used when the movement starts from the south-east corner of the box.
+    EResize,
+    NResize,
+    NeResize,
+    NwResize,
+    SResize,
+    SeResize,
+    SwResize,
+    WResize,
+    EwResize,
+    NsResize,
+    NeswResize,
+    NwseResize,
+    ColResize,
+    RowResize,
+}
+
+/// Describes how glutin handles the cursor.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum CursorState {
+    /// Normal cursor behavior.
+    Normal,
+
+    /// The cursor will be invisible when over the window.
+    Hide,
+
+    /// Grabs the mouse cursor. The cursor's motion will be confined to this
+    /// window and the window has exclusive access to further events regarding
+    /// the cursor.
+    ///
+    /// This is useful for first-person cameras for example.
+    Grab,
+}
+
+/// Attributes to use when creating a window.
+#[derive(Clone)]
+pub struct WindowAttributes {
+    /// The dimensions of the window. If this is `None`, some platform-specific dimensions will be
+    /// used.
+    ///
+    /// The default is `None`.
+    pub dimensions: Option<(u32, u32)>,
+
+    /// The minimum dimensions a window can be, If this is `None`, the window will have no minimum dimensions (aside from reserved).
+    ///
+    /// The default is `None`.
+    pub min_dimensions: Option<(u32, u32)>,
+
+    /// The maximum dimensions a window can be, If this is `None`, the maximum will have no maximum or will be set to the primary monitor's dimensions by the platform.
+    ///
+    /// The default is `None`.
+    pub max_dimensions: Option<(u32, u32)>,
+
+    /// If `Some`, the window will be in fullscreen mode with the given monitor.
+    ///
+    /// The default is `None`.
+    pub monitor: Option<platform::MonitorId>,
+
+    /// The title of the window in the title bar.
+    ///
+    /// The default is `"glutin window"`.
+    pub title: String,
+
+    /// Whether the window should be immediately visible upon creation.
+    ///
+    /// The default is `true`.
+    pub visible: bool,
+
+    /// Whether the the window should be transparent. If this is true, writing colors
+    /// with alpha values different than `1.0` will produce a transparent window.
+    ///
+    /// The default is `false`.
+    pub transparent: bool,
+
+    /// Whether the window should have borders and bars.
+    ///
+    /// The default is `true`.
+    pub decorations: bool,
+
+    /// [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,
+}
+
+impl Default for WindowAttributes {
+    #[inline]
+    fn default() -> WindowAttributes {
+        WindowAttributes {
+            dimensions: None,
+            min_dimensions: None,
+            max_dimensions: None,
+            monitor: None,
+            title: "glutin window".to_owned(),
+            visible: true,
+            transparent: false,
+            decorations: true,
+            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
+    }
+}
--- a/src/os/android.rs
+++ b/src/os/android.rs
@@ -0,0 +1,25 @@
+#![cfg(any(target_os = "android"))]
+
+use std::os::raw::c_void;
+use Window;
+use WindowBuilder;
+
+/// Additional methods on `Window` that are specific to Android.
+pub trait WindowExt {
+    fn get_native_window(&self) -> *const c_void;
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_native_window(&self) -> *const c_void {
+        self.window.get_native_window()
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to Android.
+pub trait WindowBuilderExt {
+
+}
+
+impl WindowBuilderExt for WindowBuilder {
+}
--- a/src/os/macos.rs
+++ b/src/os/macos.rs
@@ -0,0 +1,75 @@
+#![cfg(target_os = "macos")]
+
+use std::convert::From;
+use std::os::raw::c_void;
+use cocoa::appkit::NSApplicationActivationPolicy;
+use {Window, WindowBuilder};
+
+/// Additional methods on `Window` that are specific to MacOS.
+pub trait WindowExt {
+    /// Returns a pointer to the cocoa `NSWindow` that is used by this window.
+    ///
+    /// The pointer will become invalid when the `Window` is destroyed.
+    fn get_nswindow(&self) -> *mut c_void;
+
+    /// Returns a pointer to the cocoa `NSView` that is used by this window.
+    ///
+    /// The pointer will become invalid when the `Window` is destroyed.
+    fn get_nsview(&self) -> *mut c_void;
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_nswindow(&self) -> *mut c_void {
+        self.window.get_nswindow()
+    }
+
+    #[inline]
+    fn get_nsview(&self) -> *mut c_void {
+        self.window.get_nsview()
+    }
+}
+
+/// Corresponds to `NSApplicationActivationPolicy`.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ActivationPolicy {
+    /// Corresponds to `NSApplicationActivationPolicyRegular`.
+    Regular,
+    /// Corresponds to `NSApplicationActivationPolicyAccessory`.
+    Accessory,
+    /// Corresponds to `NSApplicationActivationPolicyProhibited`.
+    Prohibited,
+}
+
+impl Default for ActivationPolicy {
+    fn default() -> Self {
+        ActivationPolicy::Regular
+    }
+}
+
+impl From<ActivationPolicy> for NSApplicationActivationPolicy {
+    fn from(activation_policy: ActivationPolicy) -> Self {
+        match activation_policy {
+            ActivationPolicy::Regular =>
+                NSApplicationActivationPolicy::NSApplicationActivationPolicyRegular,
+            ActivationPolicy::Accessory =>
+                NSApplicationActivationPolicy::NSApplicationActivationPolicyAccessory,
+            ActivationPolicy::Prohibited =>
+                NSApplicationActivationPolicy::NSApplicationActivationPolicyProhibited,
+        }
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to MacOS.
+pub trait WindowBuilderExt {
+    fn with_activation_policy(self, activation_policy: ActivationPolicy) -> 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
+    }
+}
--- a/src/os/mod.rs
+++ b/src/os/mod.rs
@@ -0,0 +1,15 @@
+//! Contains traits with platform-specific methods in them.
+//!
+//! Contains the follow modules:
+//!
+//!  - `android`
+//!  - `macos`
+//!  - `unix`
+//!  - `windows`
+//!
+//! However only the module corresponding to the platform you're compiling to will be available.
+//!
+pub mod android;
+pub mod macos;
+pub mod unix;
+pub mod windows;
--- a/src/os/unix.rs
+++ b/src/os/unix.rs
@@ -0,0 +1,174 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+
+use std::sync::Arc;
+use std::ptr;
+use libc;
+use Window;
+use platform::Window2 as LinuxWindow;
+use platform::{UnixBackend, UNIX_BACKEND};
+use WindowBuilder;
+use platform::x11::XConnection;
+use platform::x11::ffi::XVisualInfo;
+
+use wayland_client::protocol::wl_display::WlDisplay;
+use wayland_client::protocol::wl_surface::WlSurface;
+
+pub use platform::x11;
+
+// TODO: do not expose XConnection
+pub fn get_x11_xconnection() -> Option<Arc<XConnection>> {
+    match *UNIX_BACKEND {
+        UnixBackend::X(ref connec) => Some(connec.clone()),
+        _ => None,
+    }
+}
+
+/// Additional methods on `Window` that are specific to Unix.
+pub trait WindowExt {
+    /// Returns a pointer to the `Window` object of xlib that is used by this window.
+    ///
+    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_xlib_window(&self) -> Option<*mut libc::c_void>;
+
+    /// Returns a pointer to the `Display` object of xlib that is used by this window.
+    ///
+    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_xlib_display(&self) -> Option<*mut libc::c_void>;
+
+    fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void>;
+
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
+    
+    /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
+    ///
+    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_xcb_connection(&self) -> Option<*mut libc::c_void>;
+
+    /// Returns a pointer to the `wl_surface` object of wayland that is used by this window.
+    ///
+    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_wayland_surface(&self) -> Option<*mut libc::c_void>;
+
+    /// Returns a pointer to the `wl_display` object of wayland that is used by this window.
+    ///
+    /// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
+    ///
+    /// The pointer will become invalid when the glutin `Window` is destroyed.
+    fn get_wayland_display(&self) -> Option<*mut libc::c_void>;
+
+    /// Returns a reference to the `WlSurface` 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_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<*mut libc::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
+            _ => None
+        }
+    }
+
+    #[inline]
+    fn get_xlib_display(&self) -> Option<*mut libc::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
+            _ => None
+        }
+    }
+
+    fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
+            _ => None
+        }
+    }
+
+    fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
+            _ => None
+        }
+    }
+
+    fn get_xcb_connection(&self) -> Option<*mut libc::c_void> {
+        match self.window {
+            LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
+            _ => None
+        }
+    }
+
+    #[inline]
+    fn get_wayland_surface(&self) -> Option<*mut libc::c_void> {
+        use wayland_client::Proxy;
+        self.get_wayland_client_surface().map(|p| p.ptr() as *mut _)
+    }
+
+
+    #[inline]
+    fn get_wayland_display(&self) -> Option<*mut libc::c_void> {
+        use wayland_client::Proxy;
+        self.get_wayland_client_display().map(|p| p.ptr() as *mut _)
+    }
+
+    #[inline]
+    fn get_wayland_client_surface(&self) -> Option<&WlSurface> {
+        match self.window {
+            LinuxWindow::Wayland(ref w) => Some(w.get_surface()),
+            _ => None
+        }
+    }
+
+    #[inline]
+    fn get_wayland_client_display(&self) -> Option<&WlDisplay> {
+        match self.window {
+            LinuxWindow::Wayland(ref w) => Some(w.get_display()),
+            _ => None
+        }
+    }
+}
+
+/// 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;
+}
+
+impl WindowBuilderExt for WindowBuilder {
+    #[inline]
+    fn with_x11_visual<T>(mut self, visual_infos: *const T) -> WindowBuilder {
+        self.platform_specific.visual_infos = Some(
+            unsafe { ptr::read(visual_infos as *const XVisualInfo) }
+        );
+        self
+    }
+
+    #[inline]
+    fn with_x11_screen(mut self, screen_id: i32) -> WindowBuilder {
+        self.platform_specific.screen_id = Some(screen_id);
+        self
+    }
+}
--- a/src/os/windows.rs
+++ b/src/os/windows.rs
@@ -0,0 +1,37 @@
+#![cfg(target_os = "windows")]
+
+use libc;
+use Window;
+use WindowBuilder;
+use winapi;
+
+/// Additional methods on `Window` that are specific to Windows.
+pub trait WindowExt {
+    /// Returns a pointer to the `Window` object of xlib that is used by this window.
+    ///
+    /// Returns `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;
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_hwnd(&self) -> *mut libc::c_void {
+        self.window.platform_window()
+    }
+}
+
+/// Additional methods on `WindowBuilder` that are specific to Windows.
+pub trait WindowBuilderExt {
+    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: winapi::HWND) -> WindowBuilder {
+        self.platform_specific.parent = Some(parent);
+        self
+    }
+}
--- a/src/platform/android/ffi.rs
+++ b/src/platform/android/ffi.rs
@@ -0,0 +1,108 @@
+#![allow(dead_code)]
+#![allow(non_snake_case)]
+#![allow(non_camel_case_types)]
+#![allow(non_upper_case_globals)]
+
+use libc;
+use std::os::raw;
+
+#[link(name = "android")]
+#[link(name = "EGL")]
+#[link(name = "GLESv2")]
+extern {}
+
+/**
+ * asset_manager.h
+ */
+pub type AAssetManager = raw::c_void;
+
+/**
+ * native_window.h
+ */
+pub type ANativeWindow = raw::c_void;
+
+extern {
+    pub fn ANativeWindow_getHeight(window: *const ANativeWindow) -> libc::int32_t;
+    pub fn ANativeWindow_getWidth(window: *const ANativeWindow) -> libc::int32_t;
+}
+
+/**
+ * native_activity.h
+ */
+pub type JavaVM = ();
+pub type JNIEnv = ();
+pub type jobject = *const libc::c_void;
+
+pub type AInputQueue = ();  // FIXME: wrong
+pub type ARect = ();  // FIXME: wrong
+
+#[repr(C)]
+pub struct ANativeActivity {
+    pub callbacks: *mut ANativeActivityCallbacks,
+    pub vm: *mut JavaVM,
+    pub env: *mut JNIEnv,
+    pub clazz: jobject,
+    pub internalDataPath: *const libc::c_char,
+    pub externalDataPath: *const libc::c_char,
+    pub sdkVersion: libc::int32_t,
+    pub instance: *mut libc::c_void,
+    pub assetManager: *mut AAssetManager,
+    pub obbPath: *const libc::c_char,
+}
+
+#[repr(C)]
+pub struct ANativeActivityCallbacks {
+    pub onStart: extern fn(*mut ANativeActivity),
+    pub onResume: extern fn(*mut ANativeActivity),
+    pub onSaveInstanceState: extern fn(*mut ANativeActivity, *mut libc::size_t),
+    pub onPause: extern fn(*mut ANativeActivity),
+    pub onStop: extern fn(*mut ANativeActivity),
+    pub onDestroy: extern fn(*mut ANativeActivity),
+    pub onWindowFocusChanged: extern fn(*mut ANativeActivity, libc::c_int),
+    pub onNativeWindowCreated: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowResized: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowRedrawNeeded: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onNativeWindowDestroyed: extern fn(*mut ANativeActivity, *const ANativeWindow),
+    pub onInputQueueCreated: extern fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onInputQueueDestroyed: extern fn(*mut ANativeActivity, *mut AInputQueue),
+    pub onContentRectChanged: extern fn(*mut ANativeActivity, *const ARect),
+    pub onConfigurationChanged: extern fn(*mut ANativeActivity),
+    pub onLowMemory: extern fn(*mut ANativeActivity),
+}
+
+/**
+ * looper.h
+ */
+pub type ALooper = ();
+
+#[link(name = "android")]
+extern {
+    pub fn ALooper_forThread() -> *const ALooper;
+    pub fn ALooper_acquire(looper: *const ALooper);
+    pub fn ALooper_release(looper: *const ALooper);
+    pub fn ALooper_prepare(opts: libc::c_int) -> *const ALooper;
+    pub fn ALooper_pollOnce(timeoutMillis: libc::c_int, outFd: *mut libc::c_int,
+        outEvents: *mut libc::c_int, outData: *mut *mut libc::c_void) -> libc::c_int;
+    pub fn ALooper_pollAll(timeoutMillis: libc::c_int, outFd: *mut libc::c_int,
+        outEvents: *mut libc::c_int, outData: *mut *mut libc::c_void) -> libc::c_int;
+    pub fn ALooper_wake(looper: *const ALooper);
+    pub fn ALooper_addFd(looper: *const ALooper, fd: libc::c_int, ident: libc::c_int,
+        events: libc::c_int, callback: ALooper_callbackFunc, data: *mut libc::c_void)
+        -> libc::c_int;
+    pub fn ALooper_removeFd(looper: *const ALooper, fd: libc::c_int) -> libc::c_int;
+}
+
+pub const ALOOPER_PREPARE_ALLOW_NON_CALLBACKS: libc::c_int = 1 << 0;
+
+pub const ALOOPER_POLL_WAKE: libc::c_int = -1;
+pub const ALOOPER_POLL_CALLBACK: libc::c_int = -2;
+pub const ALOOPER_POLL_TIMEOUT: libc::c_int = -3;
+pub const ALOOPER_POLL_ERROR: libc::c_int = -4;
+
+pub const ALOOPER_EVENT_INPUT: libc::c_int = 1 << 0;
+pub const ALOOPER_EVENT_OUTPUT: libc::c_int = 1 << 1;
+pub const ALOOPER_EVENT_ERROR: libc::c_int = 1 << 2;
+pub const ALOOPER_EVENT_HANGUP: libc::c_int = 1 << 3;
+pub const ALOOPER_EVENT_INVALID: libc::c_int = 1 << 4;
+
+pub type ALooper_callbackFunc = extern fn(libc::c_int, libc::c_int, *mut libc::c_void) -> libc::c_int;
--- a/src/platform/android/mod.rs
+++ b/src/platform/android/mod.rs
@@ -0,0 +1,275 @@
+#![cfg(target_os = "android")]
+
+extern crate android_glue;
+
+use libc;
+use std::ffi::{CString};
+use std::sync::mpsc::{Receiver, channel};
+use std::os::raw::c_void;
+use {CreationError, WindowEvent as Event, MouseCursor};
+use CreationError::OsError;
+use events::ElementState::{Pressed, Released};
+use events::{Touch, TouchPhase};
+
+use std::collections::VecDeque;
+
+use CursorState;
+use WindowAttributes;
+use native_monitor::NativeMonitorId;
+
+gen_api_transition!();
+
+pub struct Window {
+    native_window: *const c_void,
+    event_rx: Receiver<android_glue::Event>,
+}
+
+#[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) {
+        unimplemented!()
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes;
+#[derive(Clone, Default)]
+pub struct PlatformSpecificHeadlessBuilderAttributes;
+
+pub struct PollEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for PollEventsIterator<'a> {
+    type Item = Event;
+
+    fn next(&mut self) -> Option<Event> {
+        match self.window.event_rx.try_recv() {
+            Ok(android_glue::Event::EventMotion(motion)) => {
+                Some(Event::Touch(Touch {
+                    phase: match motion.action {
+                        android_glue::MotionAction::Down => TouchPhase::Started,
+                        android_glue::MotionAction::Move => TouchPhase::Moved,
+                        android_glue::MotionAction::Up => TouchPhase::Ended,
+                        android_glue::MotionAction::Cancel => TouchPhase::Cancelled,
+                    },
+                    location: (motion.x as f64, motion.y as f64),
+                    id: motion.pointer_id as u64,
+                }))
+            },
+            Ok(android_glue::Event::InitWindow) => {
+                // The activity went to foreground.
+                Some(Event::Suspended(false))
+            },
+            Ok(android_glue::Event::TermWindow) => {
+                // The activity went to background.
+                Some(Event::Suspended(true))
+            },
+            Ok(android_glue::Event::WindowResized) |
+            Ok(android_glue::Event::ConfigChanged) => {
+                // Activity Orientation changed or resized.
+                self.window.get_inner_size().map(|s| Event::Resized(s.0, s.1))
+            },
+            Ok(android_glue::Event::WindowRedrawNeeded) => {
+                // The activity needs to be redrawn.
+                Some(Event::Refresh)
+            }
+            _ => {
+                None
+            }
+        }
+    }
+}
+
+pub struct WaitEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for WaitEventsIterator<'a> {
+    type Item = Event;
+
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        loop {
+            // calling poll_events()
+            if let Some(ev) = self.window.poll_events().next() {
+                return Some(ev);
+            }
+
+            // TODO: Implement a proper way of sleeping on the event queue
+            // timer::sleep(Duration::milliseconds(16));
+        }
+    }
+}
+
+impl Window {
+    pub fn new(win_attribs: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window, CreationError>
+    {
+        use std::{mem, ptr};
+
+        // not implemented
+        assert!(win_attribs.min_dimensions.is_none());
+        assert!(win_attribs.max_dimensions.is_none());
+
+        let native_window = unsafe { android_glue::get_native_window() };
+        if native_window.is_null() {
+            return Err(OsError(format!("Android's native window is null")));
+        }
+
+        let (tx, rx) = channel();
+        android_glue::add_sender(tx);
+        android_glue::set_multitouch(win_attribs.multitouch);
+
+        Ok(Window {
+            native_window: native_window as *const _,
+            event_rx: rx,
+        })
+    }
+
+    #[inline]
+    pub fn get_native_window(&self) -> *const c_void {
+        self.native_window
+    }
+
+    #[inline]
+    pub fn is_closed(&self) -> bool {
+        false
+    }
+
+    #[inline]
+    pub fn set_title(&self, _: &str) {
+    }
+
+    #[inline]
+    pub fn show(&self) {
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _x: i32, _y: i32) {
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        let native_window = unsafe { android_glue::get_native_window() };
+
+        if native_window.is_null() {
+            None
+        } else {
+            Some((
+                unsafe { ffi::ANativeWindow_getWidth(native_window as *const _) } as u32,
+                unsafe { ffi::ANativeWindow_getHeight(native_window as *const _) } as u32
+            ))
+        }
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+        self.get_inner_size()
+    }
+
+    #[inline]
+    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!();
+    }
+
+    #[inline]
+    pub fn platform_window(&self) -> *mut libc::c_void {
+        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> {
+        Ok(())
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        1.0
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+        unimplemented!();
+    }
+}
+
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
+#[derive(Clone)]
+pub struct WindowProxy;
+
+impl WindowProxy {
+    #[inline]
+    pub fn wakeup_event_loop(&self) {
+        android_glue::wake_event_loop();
+    }
+}
--- a/src/platform/ios/ffi.rs
+++ b/src/platform/ios/ffi.rs
@@ -0,0 +1,107 @@
+use std::ffi::CString;
+
+use libc;
+use objc::runtime::{ Object, Class };
+
+#[allow(non_camel_case_types)]
+pub type id = *mut Object;
+
+#[allow(non_camel_case_types)]
+#[allow(non_upper_case_globals)]
+pub const nil: id = 0 as id;
+
+pub type CFStringRef = *const libc::c_void;
+pub type CFTimeInterval = f64;
+pub type Boolean = u32;
+
+#[allow(non_upper_case_globals)]
+pub const kCFRunLoopRunHandledSource: i32 = 4;
+
+#[cfg(target_pointer_width = "32")]
+pub type CGFloat = f32;
+#[cfg(target_pointer_width = "64")]
+pub type CGFloat = f64;
+
+#[cfg(target_pointer_width = "32")]
+pub type NSUInteger = u32;
+#[cfg(target_pointer_width = "64")]
+pub type NSUInteger = u64;
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGPoint {
+    pub x: CGFloat,
+    pub y: CGFloat,
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGRect {
+    pub origin: CGPoint,
+    pub size: CGSize
+}
+
+#[repr(C)]
+#[derive(Debug, Clone)]
+pub struct CGSize {
+    pub width: CGFloat,
+    pub height: CGFloat
+}
+
+#[link(name = "UIKit", kind = "framework")]
+#[link(name = "CoreFoundation", kind = "framework")]
+#[link(name = "GlKit", kind = "framework")]
+extern {
+    pub static kCFRunLoopDefaultMode: CFStringRef;
+
+    // int UIApplicationMain ( int argc, char *argv[], NSString *principalClassName, NSString *delegateClassName );
+    pub fn UIApplicationMain(argc: libc::c_int, argv: *const libc::c_char, principalClassName: id, delegateClassName: id) -> libc::c_int;
+
+    // SInt32 CFRunLoopRunInMode ( CFStringRef mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled );
+    pub fn CFRunLoopRunInMode(mode: CFStringRef, seconds: CFTimeInterval, returnAfterSourceHandled: Boolean) -> i32;
+}
+
+extern {
+    pub fn setjmp(env: *mut libc::c_void) -> libc::c_int;
+    pub fn longjmp(env: *mut libc::c_void, val: libc::c_int);
+}
+
+pub trait NSString {
+    unsafe fn alloc(_: Self) -> id {
+        msg_send![class("NSString"), alloc]
+    }
+
+    #[allow(non_snake_case)]
+    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id;
+    #[allow(non_snake_case)]
+    unsafe fn stringByAppendingString_(self, other: id) -> id;
+    unsafe fn init_str(self, string: &str) -> Self;
+    #[allow(non_snake_case)]
+    unsafe fn UTF8String(self) -> *const libc::c_char;
+}
+
+impl NSString for id {
+    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id {
+        msg_send![self, initWithUTF8String:c_string as id]
+    }
+
+    unsafe fn stringByAppendingString_(self, other: id) -> id {
+        msg_send![self, stringByAppendingString:other]
+    }
+
+    unsafe fn init_str(self, string: &str) -> id {
+        let cstring = CString::new(string).unwrap();
+        self.initWithUTF8String_(cstring.as_ptr())
+    }
+
+    unsafe fn UTF8String(self) -> *const libc::c_char {
+        msg_send![self, UTF8String]
+    }
+}
+
+#[inline]
+pub fn class(name: &str) -> *mut Class {
+    unsafe {
+        ::std::mem::transmute(Class::get(name))
+    }
+}
--- a/src/platform/ios/mod.rs
+++ b/src/platform/ios/mod.rs
@@ -0,0 +1,497 @@
+//! iOS support
+//!
+//! # Building app
+//! To build ios app you will need rustc built for this targets:
+//!
+//!  - armv7-apple-ios
+//!  - armv7s-apple-ios
+//!  - i386-apple-ios
+//!  - aarch64-apple-ios
+//!  - x86_64-apple-ios
+//!
+//! Then
+//!
+//! ```
+//! cargo build --target=...
+//! ```
+//! The simplest way to integrate your app into xcode environment is to build it
+//! as a static library. Wrap your main function and export it.
+//!
+//! ```rust, ignore
+//! #[no_mangle]
+//! pub extern fn start_glutin_app() {
+//!     start_inner()
+//! }
+//!
+//! fn start_inner() {
+//!    ...
+//! }
+//!
+//! ```
+//!
+//! Compile project and then drag resulting .a into Xcode project. Add glutin.h to xcode.
+//!
+//! ```ignore
+//! void start_glutin_app();
+//! ```
+//!
+//! Use start_glutin_app inside your xcode's main function.
+//!
+//!
+//! # App lifecycle and events
+//!
+//! iOS environment is very different from other platforms and you must be very
+//! careful with it's events. Familiarize yourself with
+//! [app lifecycle](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIApplicationDelegate_Protocol/).
+//!
+//!
+//! This is how those event are represented in glutin:
+//!
+//!  - applicationDidBecomeActive is Focused(true)
+//!  - applicationWillResignActive is Focused(false)
+//!  - applicationDidEnterBackground is Suspended(true)
+//!  - applicationWillEnterForeground is Suspended(false)
+//!  - applicationWillTerminate is Closed
+//!
+//! 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 Closed event if suspended, it will be SIGKILL'ed
+
+#![cfg(target_os = "ios")]
+
+use std::collections::VecDeque;
+use std::ptr;
+use std::mem;
+use std::os::raw::c_void;
+
+use libc;
+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 WindowEvent as Event;
+use events::{ Touch, TouchPhase };
+
+mod ffi;
+use self::ffi::{
+    setjmp,
+    UIApplicationMain,
+    CFTimeInterval,
+    CFRunLoopRunInMode,
+    kCFRunLoopDefaultMode,
+    kCFRunLoopRunHandledSource,
+    id,
+    nil,
+    NSString,
+    CGFloat,
+    longjmp,
+    CGRect,
+    CGPoint
+ };
+
+static mut jmpbuf: [c_int;27] = [0;27];
+
+#[derive(Clone)]
+pub struct MonitorId;
+
+pub struct Window {
+    delegate_state: *mut DelegateState
+}
+
+#[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>,
+    window: id,
+    controller: id,
+    size: (u32,u32),
+    scale: f32
+}
+
+
+impl DelegateState {
+    #[inline]
+    fn new(window: id, controller:id, size: (u32,u32), scale: f32) -> DelegateState {
+        DelegateState {
+            events_queue: VecDeque::new(),
+            window: window,
+            controller: controller,
+            size: size,
+            scale: scale
+        }
+    }
+}
+
+#[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!()
+    }
+}
+
+gen_api_transition!();
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes;
+
+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];
+                let delegate: id = msg_send![app, delegate];
+                let state: *mut c_void = *(&*delegate).get_ivar("glutinState");
+                let state = state as *mut DelegateState;
+
+                let window = Window {
+                    delegate_state: state
+                };
+
+                return Ok(window)
+            }
+        }
+
+        Window::create_delegate_class();
+        Window::create_view_class();
+        Window::start_app();
+
+        Err(CreationError::OsError(format!("Couldn't create UIApplication")))
+    }
+
+    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()];
+
+                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();
+
+        unsafe {
+            decl.add_method(sel!(application:didFinishLaunchingWithOptions:),
+                            did_finish_launching as extern fn(&mut Object, Sel, id, id) -> BOOL);
+
+            decl.add_method(sel!(applicationDidBecomeActive:),
+                            did_become_active as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(applicationWillResignActive:),
+                            will_resign_active as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(applicationWillEnterForeground:),
+                            will_enter_foreground as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(applicationDidEnterBackground:),
+                            did_enter_background as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(applicationWillTerminate:),
+                            will_terminate as extern fn(&Object, Sel, id));
+
+
+            decl.add_method(sel!(touchesBegan:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesMoved:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesEnded:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+            decl.add_method(sel!(touchesCancelled:withEvent:),
+                            handle_touches as extern fn(this: &Object, _: Sel, _: id, _:id));
+
+
+            decl.add_method(sel!(postLaunch:),
+                            post_launch as extern fn(&Object, Sel, id));
+
+            decl.add_ivar::<*mut c_void>("glutinState");
+
+            decl.register();
+        }
+    }
+
+    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"));
+        }
+    }
+
+    #[inline]
+    pub fn set_title(&self, _: &str) {
+    }
+
+    #[inline]
+    pub fn show(&self) {
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _x: i32, _y: i32) {
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        unsafe { Some((&*self.delegate_state).size) }
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+        self.get_inner_size()
+    }
+
+    #[inline]
+    pub fn set_inner_size(&self, _x: u32, _y: u32) {
+    }
+
+    #[inline]
+    pub fn poll_events(&self) -> PollEventsIterator {
+        PollEventsIterator {
+            window: self
+        }
+    }
+
+    #[inline]
+    pub fn wait_events(&self) -> WaitEventsIterator {
+        WaitEventsIterator {
+            window: self
+        }
+    }
+
+    #[inline]
+    pub fn platform_display(&self) -> *mut libc::c_void {
+        unimplemented!();
+    }
+
+    #[inline]
+    pub fn platform_window(&self) -> *mut libc::c_void {
+        unimplemented!()
+    }
+
+    #[inline]
+    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _: MouseCursor) {
+    }
+
+    #[inline]
+    pub fn set_cursor_state(&self, _: CursorState) -> Result<(), String> {
+        Ok(())
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        unsafe { (&*self.delegate_state) }.scale
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
+        unimplemented!();
+    }
+
+    #[inline]
+    pub fn create_window_proxy(&self) -> WindowProxy {
+        WindowProxy
+    }
+
+}
+
+impl WindowProxy {
+    #[inline]
+    pub fn wakeup_event_loop(&self) {
+        unimplemented!()
+    }
+}
+
+
+impl<'a> Iterator for WaitEventsIterator<'a> {
+    type Item = Event;
+
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        loop {
+            if let Some(ev) = self.window.poll_events().next() {
+                return Some(ev);
+            }
+        }
+    }
+}
+
+impl<'a> Iterator for PollEventsIterator<'a> {
+    type Item = Event;
+
+    fn next(&mut self) -> Option<Event> {
+        unsafe {
+            let state = &mut *self.window.delegate_state;
+
+            if let Some(event) = state.events_queue.pop_front() {
+                return Some(event)
+            }
+
+            // 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()
+            }
+
+            // run runloop
+            let seconds: CFTimeInterval = 0.000002;
+            while CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, 1) == kCFRunLoopRunHandledSource {}
+
+            state.events_queue.pop_front()
+        }
+    }
+}
--- a/src/platform/linux/dlopen.rs
+++ b/src/platform/linux/dlopen.rs
@@ -0,0 +1,15 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#![allow(dead_code)]
+
+use std::os::raw::{c_void, c_char, c_int};
+
+pub const RTLD_LAZY: c_int = 0x001;
+pub const RTLD_NOW: c_int = 0x002;
+
+#[link="dl"]
+extern {
+    pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void;
+    pub fn dlerror() -> *mut c_char;
+    pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void;
+    pub fn dlclose(handle: *mut c_void) -> c_int;
+}
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -0,0 +1,345 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+
+use std::collections::VecDeque;
+use std::sync::Arc;
+
+use CreationError;
+use CursorState;
+use MouseCursor;
+use libc;
+
+use self::x11::XConnection;
+use self::x11::XError;
+use self::x11::XNotSupported;
+use self::x11::ffi::XVisualInfo;
+
+mod dlopen;
+pub mod wayland;
+pub mod x11;
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub visual_infos: Option<XVisualInfo>,
+    pub screen_id: Option<i32>,
+}
+
+pub enum UnixBackend {
+    X(Arc<XConnection>),
+    Wayland(Arc<wayland::WaylandContext>),
+    Error(XNotSupported),
+} 
+
+lazy_static!(
+    pub static ref UNIX_BACKEND: UnixBackend = {
+        if let Some(ctxt) = wayland::WaylandContext::init() {
+            UnixBackend::Wayland(Arc::new(ctxt))
+        } else {
+            match XConnection::new(Some(x_error_callback)) {
+                Ok(x) => UnixBackend::X(Arc::new(x)),
+                Err(e) => UnixBackend::Error(e),
+            }
+        }
+    };
+);
+
+
+pub 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(Clone)]
+pub enum MonitorId {
+    #[doc(hidden)]
+    X(x11::MonitorId),
+    #[doc(hidden)]
+    Wayland(wayland::MonitorId),
+    #[doc(hidden)]
+    None,
+}
+
+#[inline]
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    match *UNIX_BACKEND {
+        UnixBackend::Wayland(ref ctxt) => wayland::get_available_monitors(ctxt)
+                                .into_iter()
+                                .map(MonitorId::Wayland)
+                                .collect(),
+        UnixBackend::X(ref connec) => x11::get_available_monitors(connec)
+                                    .into_iter()
+                                    .map(MonitorId::X)
+                                    .collect(),
+        UnixBackend::Error(_) => { let mut d = VecDeque::new(); d.push_back(MonitorId::None); d},
+    }
+}
+
+#[inline]
+pub fn get_primary_monitor() -> MonitorId {
+    match *UNIX_BACKEND {
+        UnixBackend::Wayland(ref ctxt) => MonitorId::Wayland(wayland::get_primary_monitor(ctxt)),
+        UnixBackend::X(ref connec) => MonitorId::X(x11::get_primary_monitor(connec)),
+        UnixBackend::Error(_) => MonitorId::None,
+    }
+}
+
+impl MonitorId {
+    #[inline]
+    pub fn get_name(&self) -> Option<String> {
+        match self {
+            &MonitorId::X(ref m) => m.get_name(),
+            &MonitorId::Wayland(ref m) => m.get_name(),
+            &MonitorId::None => None,
+        }
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
+        match self {
+            &MonitorId::X(ref m) => m.get_native_identifier(),
+            &MonitorId::Wayland(ref m) => m.get_native_identifier(),
+            &MonitorId::None => unimplemented!()        // FIXME:
+        }
+    }
+
+    #[inline]
+    pub fn get_dimensions(&self) -> (u32, u32) {
+        match self {
+            &MonitorId::X(ref m) => m.get_dimensions(),
+            &MonitorId::Wayland(ref m) => m.get_dimensions(),
+            &MonitorId::None => (800, 600),     // FIXME:
+        }
+    }
+}
+
+impl Window2 {
+    #[inline]
+    pub fn new(events_loop: ::std::sync::Arc<EventsLoop>, window: &::WindowAttributes,
+               pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window2, CreationError>
+    {
+        match *UNIX_BACKEND {
+            UnixBackend::Wayland(ref ctxt) => {
+                if let EventsLoop::Wayland(ref evlp) = *events_loop {
+                    wayland::Window::new(evlp, ctxt.clone(), window).map(Window2::Wayland)
+                } else {
+                    // It is not possible to instanciate an EventsLoop not matching its backend
+                    unreachable!()
+                }
+            },
+
+            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 {
+            &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 {
+            &Window2::X(ref w) => w.set_title(title),
+            &Window2::Wayland(ref w) => w.set_title(title)
+        }
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        match self {
+            &Window2::X(ref w) => w.show(),
+            &Window2::Wayland(ref w) => w.show()
+        }
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        match self {
+            &Window2::X(ref w) => w.hide(),
+            &Window2::Wayland(ref w) => w.hide()
+        }
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        match self {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &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 {
+            &Window2::X(ref w) => w.platform_window(),
+            &Window2::Wayland(ref w) => w.get_surface().ptr() as *mut _
+        }
+    }
+}
+
+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(),
+            error_code: (*event).error_code,
+            request_code: (*event).request_code,
+            minor_code: (*event).minor_code,
+        };
+
+        *x.latest_error.lock().unwrap() = Some(error);
+    }
+
+    0
+}
+
+pub enum EventsLoop {
+    #[doc(hidden)]
+    Wayland(wayland::EventsLoop),
+    #[doc(hidden)]
+    X(x11::EventsLoop)
+}
+
+impl EventsLoop {
+    pub fn new() -> EventsLoop {
+        match *UNIX_BACKEND {
+            UnixBackend::Wayland(ref ctxt) => {
+                EventsLoop::Wayland(wayland::EventsLoop::new(ctxt.clone()))
+            },
+
+            UnixBackend::X(_) => {
+                EventsLoop::X(x11::EventsLoop::new())
+            },
+
+            UnixBackend::Error(_) => {
+                panic!("Attempted to create an EventsLoop while no backend was available.")
+            }
+        }
+    }
+
+    pub fn interrupt(&self) {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => evlp.interrupt(),
+            EventsLoop::X(ref evlp) => evlp.interrupt()
+        }
+    }
+
+    pub fn poll_events<F>(&self, callback: F)
+        where F: FnMut(::Event)
+    {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => evlp.poll_events(callback),
+            EventsLoop::X(ref evlp) => evlp.poll_events(callback)
+        }
+    }
+
+    pub fn run_forever<F>(&self, callback: F)
+        where F: FnMut(::Event)
+    {
+        match *self {
+            EventsLoop::Wayland(ref evlp) => evlp.run_forever(callback),
+            EventsLoop::X(ref evlp) => evlp.run_forever(callback)
+        }
+    }
+}
--- a/src/platform/linux/wayland/context.rs
+++ b/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)
+    }
+}
--- a/src/platform/linux/wayland/event_loop.rs
+++ b/src/platform/linux/wayland/event_loop.rs
@@ -0,0 +1,592 @@
+use {WindowEvent as Event, ElementState, MouseButton, MouseScrollDelta, TouchPhase, ModifiersState};
+
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::AtomicBool;
+
+use super::{DecoratedHandler, WindowId, WaylandContext};
+
+
+use wayland_client::{EventQueue, EventQueueHandle, Init, Proxy};
+use wayland_client::protocol::{wl_seat, wl_surface, wl_pointer, wl_keyboard};
+
+use super::make_wid;
+use super::wayland_window::DecoratedSurface;
+use super::wayland_kbd::MappedKeyboard;
+use super::keyboard::KbdHandler;
+
+/// This struct is used as a holder for the callback
+/// during the dispatching of events.
+///
+/// The proper ay to use it is:
+/// - set a callback in it (and retrieve the noop one it contains)
+/// - dispatch the EventQueue
+/// - put back the noop callback in it
+///
+/// Failure to do so is unsafe™
+pub struct EventsLoopSink {
+    callback: Box<FnMut(::Event)>
+}
+
+unsafe impl Send for EventsLoopSink { }
+
+impl EventsLoopSink {
+    pub fn new() -> EventsLoopSink {
+        EventsLoopSink {
+            callback: Box::new(|_| {}),
+        }
+    }
+
+    pub fn send_event(&mut self, evt: ::WindowEvent, wid: WindowId) {
+        let evt = ::Event::WindowEvent {
+            event: evt,
+            window_id: ::WindowId(::platform::WindowId::Wayland(wid))
+        };
+        (self.callback)(evt)
+    }
+
+    // This function is only safe of the set callback is unset before exclusive
+    // access to the wayland EventQueue is finished.
+    //
+    // The callback also cannot be used any longer as long as it has not been
+    // cleared from the Sink.
+    unsafe fn set_callback(&mut self, cb: Box<FnMut(::Event)>) -> Box<FnMut(::Event)> {
+        ::std::mem::replace(&mut self.callback, cb)
+    }
+
+    fn with_callback<F: FnOnce(&mut FnMut(::Event))>(&mut self, f: F) {
+        f(&mut *self.callback)
+    }
+}
+
+pub struct EventsLoop {
+    // the global wayland context
+    ctxt: Arc<WaylandContext>,
+    // our EventQueue
+    evq: Arc<Mutex<EventQueue>>,
+    // ids of the DecoratedHandlers of the surfaces we know
+    decorated_ids: Mutex<Vec<(usize, Arc<wl_surface::WlSurface>)>>,
+    // our sink, receiver of callbacks, shared with some handlers
+    sink: Arc<Mutex<EventsLoopSink>>,
+    // trigger interruption of the run
+    interrupted: AtomicBool,
+    // trigger cleanup of the dead surfaces
+    cleanup_needed: Arc<AtomicBool>,
+    hid: usize
+}
+
+impl EventsLoop {
+    pub fn new(ctxt: Arc<WaylandContext>) -> EventsLoop {
+        let mut evq = ctxt.display.create_event_queue();
+        let sink = Arc::new(Mutex::new(EventsLoopSink::new()));
+        let hid = evq.add_handler_with_init(InputHandler::new(&ctxt, sink.clone()));
+        EventsLoop {
+            ctxt: ctxt,
+            evq: Arc::new(Mutex::new(evq)),
+            decorated_ids: Mutex::new(Vec::new()),
+            sink: sink,
+            interrupted: AtomicBool::new(false),
+            cleanup_needed: Arc::new(AtomicBool::new(false)),
+            hid: hid
+        }
+    }
+
+    // some internals that Window needs access to
+    pub fn get_window_init(&self) -> (Arc<Mutex<EventQueue>>, Arc<AtomicBool>) {
+        (self.evq.clone(), self.cleanup_needed.clone())
+    }
+
+    pub fn register_window(&self, decorated_id: usize, surface: Arc<wl_surface::WlSurface>) {
+        self.decorated_ids.lock().unwrap().push((decorated_id, surface.clone()));
+        let mut guard = self.evq.lock().unwrap();
+        let mut state = guard.state();
+        state.get_mut_handler::<InputHandler>(self.hid).windows.push(surface);
+    }
+
+    fn process_resize(evq: &mut EventQueue, ids: &[(usize, Arc<wl_surface::WlSurface>)], callback: &mut FnMut(::Event))
+    {
+        let mut state = evq.state();
+        for &(decorated_id, ref window) in ids {
+            let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(decorated_id);
+            if let Some((w, h)) = decorated.handler().as_mut().and_then(|h| h.take_newsize()) {
+                decorated.resize(w as i32, h as i32);
+                callback(
+                    ::Event::WindowEvent {
+                        window_id: ::WindowId(::platform::WindowId::Wayland(make_wid(&window))),
+                        event: ::WindowEvent::Resized(w,h)
+                    }
+                );
+            }
+        }
+    }
+
+    pub fn interrupt(&self) {
+        self.interrupted.store(true, ::std::sync::atomic::Ordering::Relaxed);
+    }
+
+    fn prune_dead_windows(&self) {
+        self.decorated_ids.lock().unwrap().retain(|&(_, ref w)| w.is_alive());
+        let mut evq_guard = self.evq.lock().unwrap();
+        let mut state = evq_guard.state();
+        let handler = state.get_mut_handler::<InputHandler>(self.hid);
+        handler.windows.retain(|w| w.is_alive());
+        if let Some(w) = handler.mouse_focus.take() {
+            if w.is_alive() {
+                handler.mouse_focus = Some(w)
+            }
+        }
+    }
+
+    pub fn poll_events<F>(&self, callback: F)
+        where F: FnMut(::Event)
+    {
+        // send pending requests to the server...
+        self.ctxt.flush();
+
+        // first of all, get exclusive access to this event queue
+        let mut evq_guard = self.evq.lock().unwrap();
+
+        // read some events from the socket if some are waiting & queue is empty
+        if let Some(guard) = evq_guard.prepare_read() {
+            guard.read_events().expect("Wayland connection unexpectedly lost");
+        }
+
+        // set the callback into the sink
+        // we extend the lifetime of the closure to 'static to be able to put it in
+        // the sink, but we'll explicitly drop it at the end of this function, so it's fine
+        let static_cb = unsafe { ::std::mem::transmute(Box::new(callback) as Box<FnMut(_)>) };
+        let old_cb = unsafe { self.sink.lock().unwrap().set_callback(static_cb) };
+
+        // then do the actual dispatching
+        self.ctxt.dispatch_pending();
+        evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost");
+
+        let mut sink_guard = self.sink.lock().unwrap();
+
+        // events where probably dispatched, process resize
+        let ids_guard = self.decorated_ids.lock().unwrap();
+        sink_guard.with_callback(
+            |cb| Self::process_resize(&mut evq_guard, &ids_guard, cb)
+        );
+
+        // replace the old noop callback
+        unsafe { self.sink.lock().unwrap().set_callback(old_cb) };
+
+        if self.cleanup_needed.swap(false, ::std::sync::atomic::Ordering::Relaxed) {
+            self.prune_dead_windows()
+        }
+    }
+
+    pub fn run_forever<F>(&self, callback: F)
+        where F: FnMut(::Event)
+    {
+        // send pending requests to the server...
+        self.ctxt.flush();
+
+        // first of all, get exclusive access to this event queue
+        let mut evq_guard = self.evq.lock().unwrap();
+
+        // set the callback into the sink
+        // we extend the lifetime of the closure to 'static to be able to put it in
+        // the sink, but we'll explicitly drop it at the end of this function, so it's fine
+        let static_cb = unsafe { ::std::mem::transmute(Box::new(callback) as Box<FnMut(_)>) };
+        let old_cb = unsafe { self.sink.lock().unwrap().set_callback(static_cb) };
+
+        while !self.interrupted.load(::std::sync::atomic::Ordering::Relaxed) {
+            self.ctxt.dispatch();
+            evq_guard.dispatch_pending().expect("Wayland connection unexpectedly lost");
+            let ids_guard = self.decorated_ids.lock().unwrap();
+            self.sink.lock().unwrap().with_callback(
+                |cb| Self::process_resize(&mut evq_guard, &ids_guard, cb)
+            );
+            self.ctxt.flush();
+
+            if self.cleanup_needed.swap(false, ::std::sync::atomic::Ordering::Relaxed) {
+                self.prune_dead_windows()
+            }
+        }
+
+        // replace the old noop callback
+        unsafe { self.sink.lock().unwrap().set_callback(old_cb) };
+    }
+}
+
+enum KbdType {
+    Mapped(MappedKeyboard<KbdHandler>),
+    Plain(Option<WindowId>)
+}
+
+struct InputHandler {
+    my_id: usize,
+    windows: Vec<Arc<wl_surface::WlSurface>>,
+    seat: Option<wl_seat::WlSeat>,
+    mouse: Option<wl_pointer::WlPointer>,
+    mouse_focus: Option<Arc<wl_surface::WlSurface>>,
+    mouse_location: (i32, i32),
+    axis_buffer: Option<(f32, f32)>,
+    axis_discrete_buffer: Option<(i32, i32)>,
+    axis_state: TouchPhase,
+    kbd: Option<wl_keyboard::WlKeyboard>,
+    kbd_handler: KbdType,
+    callback: Arc<Mutex<EventsLoopSink>>
+}
+
+impl InputHandler {
+    fn new(ctxt: &WaylandContext, sink: Arc<Mutex<EventsLoopSink>>) -> InputHandler {
+        let kbd_handler = match MappedKeyboard::new(KbdHandler::new(sink.clone())) {
+            Ok(h) => KbdType::Mapped(h),
+            Err(_) => KbdType::Plain(None)
+        };
+        InputHandler {
+            my_id: 0,
+            windows: Vec::new(),
+            seat: ctxt.get_seat(),
+            mouse: None,
+            mouse_focus: None,
+            mouse_location: (0,0),
+            axis_buffer: None,
+            axis_discrete_buffer: None,
+            axis_state: TouchPhase::Started,
+            kbd: None,
+            kbd_handler: kbd_handler,
+            callback: sink
+        }
+    }
+}
+
+impl Init for InputHandler {
+    fn init(&mut self, evqh: &mut EventQueueHandle, index: usize) {
+        if let Some(ref seat) = self.seat {
+            evqh.register::<_, InputHandler>(seat, index);
+        }
+        self.my_id = index;
+    }
+}
+
+impl wl_seat::Handler for InputHandler {
+    fn capabilities(&mut self,
+                    evqh: &mut EventQueueHandle,
+                    seat: &wl_seat::WlSeat,
+                    capabilities: wl_seat::Capability)
+    {
+        // create pointer if applicable
+        if capabilities.contains(wl_seat::Pointer) && self.mouse.is_none() {
+            let pointer = seat.get_pointer().expect("Seat is not dead");
+            evqh.register::<_, InputHandler>(&pointer, self.my_id);
+            self.mouse = Some(pointer);
+        }
+        // destroy pointer if applicable
+        if !capabilities.contains(wl_seat::Pointer) {
+            if let Some(pointer) = self.mouse.take() {
+                pointer.release();
+            }
+        }
+        // create keyboard if applicable
+        if capabilities.contains(wl_seat::Keyboard) && self.kbd.is_none() {
+            let kbd = seat.get_keyboard().expect("Seat is not dead");
+            evqh.register::<_, InputHandler>(&kbd, self.my_id);
+            self.kbd = Some(kbd);
+        }
+        // destroy keyboard if applicable
+        if !capabilities.contains(wl_seat::Keyboard) {
+            if let Some(kbd) = self.kbd.take() {
+                kbd.release();
+            }
+        }
+    }
+}
+
+declare_handler!(InputHandler, wl_seat::Handler, wl_seat::WlSeat);
+
+/*
+ * Pointer Handling
+ */
+
+impl wl_pointer::Handler for InputHandler {
+    fn enter(&mut self,
+             _evqh: &mut EventQueueHandle,
+             _proxy: &wl_pointer::WlPointer,
+             _serial: u32,
+             surface: &wl_surface::WlSurface,
+             surface_x: f64,
+             surface_y: f64)
+    {
+        self.mouse_location = (surface_x as i32, surface_y as i32);
+        for window in &self.windows {
+            if window.equals(surface) {
+                self.mouse_focus = Some(window.clone());
+                let (w, h) = self.mouse_location;
+                let mut guard = self.callback.lock().unwrap();
+                guard.send_event(Event::MouseEntered, make_wid(window));
+                guard.send_event(Event::MouseMoved(w, h), make_wid(window));
+                break;
+            }
+        }
+    }
+
+    fn leave(&mut self,
+             _evqh: &mut EventQueueHandle,
+             _proxy: &wl_pointer::WlPointer,
+             _serial: u32,
+             surface: &wl_surface::WlSurface)
+    {
+        self.mouse_focus = None;
+        for window in &self.windows {
+            if window.equals(surface) {
+                self.callback.lock().unwrap().send_event(Event::MouseLeft, make_wid(window));
+            }
+        }
+    }
+
+    fn motion(&mut self,
+              _evqh: &mut EventQueueHandle,
+              _proxy: &wl_pointer::WlPointer,
+              _time: u32,
+              surface_x: f64,
+              surface_y: f64)
+    {
+        self.mouse_location = (surface_x as i32, surface_y as i32);
+        if let Some(ref window) = self.mouse_focus {
+            let (w,h) = self.mouse_location;
+            self.callback.lock().unwrap().send_event(Event::MouseMoved(w, h), make_wid(window));
+        }
+    }
+
+    fn button(&mut self,
+              _evqh: &mut EventQueueHandle,
+              _proxy: &wl_pointer::WlPointer,
+              _serial: u32,
+              _time: u32,
+              button: u32,
+              state: wl_pointer::ButtonState)
+    {
+        if let Some(ref window) = self.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
+            };
+            self.callback.lock().unwrap().send_event(Event::MouseInput(state, button), make_wid(window));
+        }
+    }
+
+    fn axis(&mut self,
+            _evqh: &mut EventQueueHandle,
+            _proxy: &wl_pointer::WlPointer,
+            _time: u32,
+            axis: wl_pointer::Axis,
+            value: f64)
+    {
+        let (mut x, mut y) = self.axis_buffer.unwrap_or((0.0, 0.0));
+        match axis {
+            wl_pointer::Axis::VerticalScroll => y += value as f32,
+            wl_pointer::Axis::HorizontalScroll => x += value as f32
+        }
+        self.axis_buffer = Some((x,y));
+        self.axis_state = match self.axis_state {
+            TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+            _ => TouchPhase::Started
+        }
+    }
+
+    fn frame(&mut self,
+             _evqh: &mut EventQueueHandle,
+             _proxy: &wl_pointer::WlPointer)
+    {
+        let axis_buffer = self.axis_buffer.take();
+        let axis_discrete_buffer = self.axis_discrete_buffer.take();
+        if let Some(ref window) = self.mouse_focus {
+            if let Some((x, y)) = axis_discrete_buffer {
+                self.callback.lock().unwrap().send_event(
+                    Event::MouseWheel(
+                        MouseScrollDelta::LineDelta(x as f32, y as f32),
+                        self.axis_state
+                    ),
+                    make_wid(window)
+                );
+            } else if let Some((x, y)) = axis_buffer {
+                self.callback.lock().unwrap().send_event(
+                    Event::MouseWheel(
+                        MouseScrollDelta::PixelDelta(x as f32, y as f32),
+                        self.axis_state
+                    ),
+                    make_wid(window)
+                );
+            }
+        }
+    }
+
+    fn axis_source(&mut self,
+                   _evqh: &mut EventQueueHandle,
+                   _proxy: &wl_pointer::WlPointer,
+                   _axis_source: wl_pointer::AxisSource)
+    {
+    }
+
+    fn axis_stop(&mut self,
+                 _evqh: &mut EventQueueHandle,
+                 _proxy: &wl_pointer::WlPointer,
+                 _time: u32,
+                 _axis: wl_pointer::Axis)
+    {
+        self.axis_state = TouchPhase::Ended;
+    }
+
+    fn axis_discrete(&mut self,
+                     _evqh: &mut EventQueueHandle,
+                     _proxy: &wl_pointer::WlPointer,
+                     axis: wl_pointer::Axis,
+                     discrete: i32)
+    {
+        let (mut x, mut y) = self.axis_discrete_buffer.unwrap_or((0,0));
+        match axis {
+            wl_pointer::Axis::VerticalScroll => y += discrete,
+            wl_pointer::Axis::HorizontalScroll => x += discrete
+        }
+        self.axis_discrete_buffer = Some((x,y));
+                self.axis_state = match self.axis_state {
+            TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+            _ => TouchPhase::Started
+        }
+    }
+}
+
+declare_handler!(InputHandler, wl_pointer::Handler, wl_pointer::WlPointer);
+
+/*
+ * Keyboard Handling
+ */
+
+impl wl_keyboard::Handler for InputHandler {
+    // mostly pass-through
+    fn keymap(&mut self,
+              evqh: &mut EventQueueHandle,
+              proxy: &wl_keyboard::WlKeyboard,
+              format: wl_keyboard::KeymapFormat,
+              fd: ::std::os::unix::io::RawFd,
+              size: u32)
+    {
+        match self.kbd_handler {
+            KbdType::Mapped(ref mut h) => h.keymap(evqh, proxy, format, fd, size),
+            _ => ()
+        }
+    }
+
+    fn enter(&mut self,
+             evqh: &mut EventQueueHandle,
+             proxy: &wl_keyboard::WlKeyboard,
+             serial: u32,
+             surface: &wl_surface::WlSurface,
+             keys: Vec<u8>)
+    {
+        for window in &self.windows {
+            if window.equals(surface) {
+                self.callback.lock().unwrap().send_event(Event::Focused(true), make_wid(window));
+                match self.kbd_handler {
+                    KbdType::Mapped(ref mut h) => {
+                        h.handler().target = Some(make_wid(window));
+                        h.enter(evqh, proxy, serial, surface, keys);
+                    },
+                    KbdType::Plain(ref mut target) => {
+                        *target = Some(make_wid(window))
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    fn leave(&mut self,
+             evqh: &mut EventQueueHandle,
+             proxy: &wl_keyboard::WlKeyboard,
+             serial: u32,
+             surface: &wl_surface::WlSurface)
+    {
+        for window in &self.windows {
+            if window.equals(surface) {
+                self.callback.lock().unwrap().send_event(Event::Focused(false), make_wid(window));
+                match self.kbd_handler {
+                    KbdType::Mapped(ref mut h) => {
+                        h.handler().target = None;
+                        h.leave(evqh, proxy, serial, surface);
+                    },
+                    KbdType::Plain(ref mut target) => {
+                        *target = None
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    fn key(&mut self,
+           evqh: &mut EventQueueHandle,
+           proxy: &wl_keyboard::WlKeyboard,
+           serial: u32,
+           time: u32,
+           key: u32,
+           state: wl_keyboard::KeyState)
+    {
+        match self.kbd_handler {
+            KbdType::Mapped(ref mut h) => h.key(evqh, proxy, serial, time, key, state),
+            KbdType::Plain(Some(wid)) => {
+                let state = match state {
+                    wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                    wl_keyboard::KeyState::Released => ElementState::Released,
+                };
+                // This is fallback impl if libxkbcommon was not available
+                // This case should probably never happen, as most wayland
+                // compositors _need_ libxkbcommon anyway...
+                //
+                // In this case, we don't have the modifiers state information
+                // anyway, as we need libxkbcommon to interpret it (it is
+                // supposed to be serialized by the compositor using libxkbcommon)
+                self.callback.lock().unwrap().send_event(
+                    Event::KeyboardInput(
+                        state,
+                        key as u8,
+                        None,
+                        ModifiersState::default()
+                    ),
+                    wid
+                );
+            },
+            KbdType::Plain(None) => ()
+        }
+    }
+
+    fn modifiers(&mut self,
+                 evqh: &mut EventQueueHandle,
+                 proxy: &wl_keyboard::WlKeyboard,
+                 serial: u32,
+                 mods_depressed: u32,
+                 mods_latched: u32,
+                 mods_locked: u32,
+                 group: u32)
+    {
+        match self.kbd_handler {
+            KbdType::Mapped(ref mut h) => h.modifiers(evqh, proxy, serial, mods_depressed,
+                                                      mods_latched, mods_locked, group),
+            _ => ()
+        }
+    }
+
+    fn repeat_info(&mut self,
+                   evqh: &mut EventQueueHandle,
+                   proxy: &wl_keyboard::WlKeyboard,
+                   rate: i32,
+                   delay: i32)
+    {
+        match self.kbd_handler {
+            KbdType::Mapped(ref mut h) => h.repeat_info(evqh, proxy, rate, delay),
+            _ => ()
+        }
+    }
+}
+
+declare_handler!(InputHandler, wl_keyboard::Handler, wl_keyboard::WlKeyboard);
--- a/src/platform/linux/wayland/keyboard.rs
+++ b/src/platform/linux/wayland/keyboard.rs
@@ -0,0 +1,232 @@
+use std::sync::{Arc, Mutex};
+
+use {VirtualKeyCode, ElementState, WindowEvent as Event};
+
+use events::ModifiersState;
+
+use super::{wayland_kbd, EventsLoopSink, WindowId};
+use wayland_client::EventQueueHandle;
+use wayland_client::protocol::wl_keyboard;
+
+pub struct KbdHandler {
+    sink: Arc<Mutex<EventsLoopSink>>,
+    pub target: Option<WindowId>
+}
+
+impl KbdHandler {
+    pub fn new(sink: Arc<Mutex<EventsLoopSink>>) -> KbdHandler {
+        KbdHandler { sink: sink, target: None }
+    }
+}
+
+impl wayland_kbd::Handler for KbdHandler {
+    fn key(&mut self,
+           _evqh: &mut EventQueueHandle,
+           _proxy: &wl_keyboard::WlKeyboard,
+           _serial: u32,
+           _time: u32,
+           mods: &wayland_kbd::ModifiersState,
+           rawkey: u32,
+           keysym: u32,
+           state: wl_keyboard::KeyState,
+           utf8: Option<String>)
+    {
+        if let Some(wid) = self.target {
+            let state = match state {
+                wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                wl_keyboard::KeyState::Released => ElementState::Released,
+            };
+            let vkcode = key_to_vkey(rawkey, keysym);
+            let mut guard = self.sink.lock().unwrap();
+            guard.send_event(
+                Event::KeyboardInput(
+                    state,
+                    rawkey as u8,
+                    vkcode,
+                    ModifiersState {
+                        shift: mods.shift,
+                        ctrl: mods.ctrl,
+                        alt: mods.alt,
+                        logo: mods.logo
+                    }
+                ),
+                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);
+                }
+            }
+        }
+    }
+}
+
+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),
+        10 => Some(VirtualKeyCode::Key9),
+        11 => Some(VirtualKeyCode::Key0),
+        _  => keysym_to_vkey(keysym)
+    }
+}
+
+fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
+    use super::wayland_kbd::keysyms;
+    match keysym {
+        // letters
+        keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
+        keysyms::XKB_KEY_B | keysyms::XKB_KEY_b => Some(VirtualKeyCode::B),
+        keysyms::XKB_KEY_C | keysyms::XKB_KEY_c => Some(VirtualKeyCode::C),
+        keysyms::XKB_KEY_D | keysyms::XKB_KEY_d => Some(VirtualKeyCode::D),
+        keysyms::XKB_KEY_E | keysyms::XKB_KEY_e => Some(VirtualKeyCode::E),
+        keysyms::XKB_KEY_F | keysyms::XKB_KEY_f => Some(VirtualKeyCode::F),
+        keysyms::XKB_KEY_G | keysyms::XKB_KEY_g => Some(VirtualKeyCode::G),
+        keysyms::XKB_KEY_H | keysyms::XKB_KEY_h => Some(VirtualKeyCode::H),
+        keysyms::XKB_KEY_I | keysyms::XKB_KEY_i => Some(VirtualKeyCode::I),
+        keysyms::XKB_KEY_J | keysyms::XKB_KEY_j => Some(VirtualKeyCode::J),
+        keysyms::XKB_KEY_K | keysyms::XKB_KEY_k => Some(VirtualKeyCode::K),
+        keysyms::XKB_KEY_L | keysyms::XKB_KEY_l => Some(VirtualKeyCode::L),
+        keysyms::XKB_KEY_M | keysyms::XKB_KEY_m => Some(VirtualKeyCode::M),
+        keysyms::XKB_KEY_N | keysyms::XKB_KEY_n => Some(VirtualKeyCode::N),
+        keysyms::XKB_KEY_O | keysyms::XKB_KEY_o => Some(VirtualKeyCode::O),
+        keysyms::XKB_KEY_P | keysyms::XKB_KEY_p => Some(VirtualKeyCode::P),
+        keysyms::XKB_KEY_Q | keysyms::XKB_KEY_q => Some(VirtualKeyCode::Q),
+        keysyms::XKB_KEY_R | keysyms::XKB_KEY_r => Some(VirtualKeyCode::R),
+        keysyms::XKB_KEY_S | keysyms::XKB_KEY_s => Some(VirtualKeyCode::S),
+        keysyms::XKB_KEY_T | keysyms::XKB_KEY_t => Some(VirtualKeyCode::T),
+        keysyms::XKB_KEY_U | keysyms::XKB_KEY_u => Some(VirtualKeyCode::U),
+        keysyms::XKB_KEY_V | keysyms::XKB_KEY_v => Some(VirtualKeyCode::V),
+        keysyms::XKB_KEY_W | keysyms::XKB_KEY_w => Some(VirtualKeyCode::W),
+        keysyms::XKB_KEY_X | keysyms::XKB_KEY_x => Some(VirtualKeyCode::X),
+        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_F10 => Some(VirtualKeyCode::F10),
+        keysyms::XKB_KEY_F11 => Some(VirtualKeyCode::F11),
+        keysyms::XKB_KEY_F12 => Some(VirtualKeyCode::F12),
+        keysyms::XKB_KEY_F13 => Some(VirtualKeyCode::F13),
+        keysyms::XKB_KEY_F14 => Some(VirtualKeyCode::F14),
+        keysyms::XKB_KEY_F15 => Some(VirtualKeyCode::F15),
+        // flow control
+        keysyms::XKB_KEY_Print => Some(VirtualKeyCode::Snapshot),
+        keysyms::XKB_KEY_Scroll_Lock => Some(VirtualKeyCode::Scroll),
+        keysyms::XKB_KEY_Pause => Some(VirtualKeyCode::Pause),
+        keysyms::XKB_KEY_Insert => Some(VirtualKeyCode::Insert),
+        keysyms::XKB_KEY_Home => Some(VirtualKeyCode::Home),
+        keysyms::XKB_KEY_Delete => Some(VirtualKeyCode::Delete),
+        keysyms::XKB_KEY_End => Some(VirtualKeyCode::End),
+        keysyms::XKB_KEY_Page_Down => Some(VirtualKeyCode::PageDown),
+        keysyms::XKB_KEY_Page_Up => Some(VirtualKeyCode::PageUp),
+        // arrows
+        keysyms::XKB_KEY_Left => Some(VirtualKeyCode::Left),
+        keysyms::XKB_KEY_Up => Some(VirtualKeyCode::Up),
+        keysyms::XKB_KEY_Right => Some(VirtualKeyCode::Right),
+        keysyms::XKB_KEY_Down => Some(VirtualKeyCode::Down),
+        //
+        keysyms::XKB_KEY_BackSpace => Some(VirtualKeyCode::Back),
+        keysyms::XKB_KEY_Return => Some(VirtualKeyCode::Return),
+        keysyms::XKB_KEY_space => Some(VirtualKeyCode::Space),
+        // keypad
+        keysyms::XKB_KEY_Num_Lock => Some(VirtualKeyCode::Numlock),
+        keysyms::XKB_KEY_KP_0 => Some(VirtualKeyCode::Numpad0),
+        keysyms::XKB_KEY_KP_1 => Some(VirtualKeyCode::Numpad1),
+        keysyms::XKB_KEY_KP_2 => Some(VirtualKeyCode::Numpad2),
+        keysyms::XKB_KEY_KP_3 => Some(VirtualKeyCode::Numpad3),
+        keysyms::XKB_KEY_KP_4 => Some(VirtualKeyCode::Numpad4),
+        keysyms::XKB_KEY_KP_5 => Some(VirtualKeyCode::Numpad5),
+        keysyms::XKB_KEY_KP_6 => Some(VirtualKeyCode::Numpad6),
+        keysyms::XKB_KEY_KP_7 => Some(VirtualKeyCode::Numpad7),
+        keysyms::XKB_KEY_KP_8 => Some(VirtualKeyCode::Numpad8),
+        keysyms::XKB_KEY_KP_9 => Some(VirtualKeyCode::Numpad9),
+        // misc
+        // => Some(VirtualKeyCode::AbntC1),
+        // => Some(VirtualKeyCode::AbntC2),
+        keysyms::XKB_KEY_plus => Some(VirtualKeyCode::Add),
+        keysyms::XKB_KEY_apostrophe => Some(VirtualKeyCode::Apostrophe),
+        // => Some(VirtualKeyCode::Apps),
+        // => Some(VirtualKeyCode::At),
+        // => Some(VirtualKeyCode::Ax),
+        keysyms::XKB_KEY_backslash => Some(VirtualKeyCode::Backslash),
+        // => Some(VirtualKeyCode::Calculator),
+        // => Some(VirtualKeyCode::Capital),
+        keysyms::XKB_KEY_colon => Some(VirtualKeyCode::Colon),
+        keysyms::XKB_KEY_comma => Some(VirtualKeyCode::Comma),
+        // => Some(VirtualKeyCode::Convert),
+        // => Some(VirtualKeyCode::Decimal),
+        // => Some(VirtualKeyCode::Divide),
+        keysyms::XKB_KEY_equal => Some(VirtualKeyCode::Equals),
+        // => Some(VirtualKeyCode::Grave),
+        // => Some(VirtualKeyCode::Kana),
+        // => Some(VirtualKeyCode::Kanji),
+        keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
+        // => Some(VirtualKeyCode::LBracket),
+        keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
+        // => Some(VirtualKeyCode::LMenu),
+        keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
+        // => Some(VirtualKeyCode::LWin),
+        // => Some(VirtualKeyCode::Mail),
+        // => Some(VirtualKeyCode::MediaSelect),
+        // => Some(VirtualKeyCode::MediaStop),
+        keysyms::XKB_KEY_minus => Some(VirtualKeyCode::Minus),
+        keysyms::XKB_KEY_asterisk => Some(VirtualKeyCode::Multiply),
+        // => Some(VirtualKeyCode::Mute),
+        // => Some(VirtualKeyCode::MyComputer),
+        // => Some(VirtualKeyCode::NextTrack),
+        // => Some(VirtualKeyCode::NoConvert),
+        keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma),
+        keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter),
+        keysyms::XKB_KEY_KP_Equal => Some(VirtualKeyCode::NumpadEquals),
+        // => Some(VirtualKeyCode::OEM102),
+        // => Some(VirtualKeyCode::Period),
+        // => Some(VirtualKeyCode::Playpause),
+        // => Some(VirtualKeyCode::Power),
+        // => Some(VirtualKeyCode::Prevtrack),
+        keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
+        // => Some(VirtualKeyCode::RBracket),
+        keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
+        // => Some(VirtualKeyCode::RMenu),
+        keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
+        // => Some(VirtualKeyCode::RWin),
+        keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
+        keysyms::XKB_KEY_slash => Some(VirtualKeyCode::Slash),
+        // => Some(VirtualKeyCode::Sleep),
+        // => Some(VirtualKeyCode::Stop),
+        // => Some(VirtualKeyCode::Subtract),
+        // => Some(VirtualKeyCode::Sysrq),
+        keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
+        // => Some(VirtualKeyCode::Underline),
+        // => Some(VirtualKeyCode::Unlabeled),
+        keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
+        keysyms::XKB_KEY_XF86AudioRaiseVolume => Some(VirtualKeyCode::VolumeUp),
+        // => Some(VirtualKeyCode::Wake),
+        // => Some(VirtualKeyCode::Webback),
+        // => Some(VirtualKeyCode::WebFavorites),
+        // => Some(VirtualKeyCode::WebForward),
+        // => Some(VirtualKeyCode::WebHome),
+        // => Some(VirtualKeyCode::WebRefresh),
+        // => Some(VirtualKeyCode::WebSearch),
+        // => Some(VirtualKeyCode::WebStop),
+        // => Some(VirtualKeyCode::Yen),
+        // fallback
+        _ => None
+    }
+}
--- a/src/platform/linux/wayland/mod.rs
+++ b/src/platform/linux/wayland/mod.rs
@@ -0,0 +1,17 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+
+pub use self::window::{Window, WindowId};
+pub use self::event_loop::EventsLoop;
+pub use self::context::{WaylandContext, MonitorId, get_available_monitors,
+                        get_primary_monitor};
+
+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 keyboard;
+mod window;
--- a/src/platform/linux/wayland/window.rs
+++ b/src/platform/linux/wayland/window.rs
@@ -0,0 +1,205 @@
+use std::sync::{Arc, Mutex};
+use std::sync::atomic::AtomicBool;
+
+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 super::{WaylandContext, EventsLoop};
+use super::wayland_window;
+use super::wayland_window::DecoratedSurface;
+
+pub struct Window {
+    // the global wayland context
+    ctxt: Arc<WaylandContext>,
+    // the EventQueue of our EventsLoop
+    evq: Arc<Mutex<EventQueue>>,
+    // signal to advertize the EventsLoop when we are destroyed
+    cleanup_signal: Arc<AtomicBool>,
+    // our wayland surface
+    surface: Arc<wl_surface::WlSurface>,
+    // our current inner dimensions
+    size: Mutex<(u32, u32)>,
+    // the id of our DecoratedHandler in the EventQueue
+    decorated_id: usize
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(usize);
+
+#[inline]
+pub fn make_wid(s: &wl_surface::WlSurface) -> WindowId {
+    WindowId(s.ptr() as usize)
+}
+
+impl Window {
+    pub fn new(evlp: &EventsLoop, ctxt: Arc<WaylandContext>, attributes: &WindowAttributes)  -> Result<Window, CreationError>
+    {
+        let (width, height) = attributes.dimensions.unwrap_or((800,600));
+
+        let (surface, decorated) = ctxt.create_window::<DecoratedHandler>();
+
+        // 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);
+            }
+            decorated_id
+        };
+        let me = Window {
+            ctxt: ctxt,
+            evq: evq,
+            cleanup_signal: cleanup_signal,
+            surface: surface,
+            size: Mutex::new((width, height)),
+            decorated_id: decorated_id
+        };
+
+        // register ourselves to the EventsLoop
+        evlp.register_window(me.decorated_id, me.surface.clone());
+
+        Ok(me)
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        make_wid(&self.surface)
+    }
+
+    pub fn set_title(&self, title: &str) {
+        let mut guard = self.evq.lock().unwrap();
+        let mut state = guard.state();
+        let decorated = state.get_mut_handler::<DecoratedSurface<DecoratedHandler>>(self.decorated_id);
+        decorated.set_title(title.into())
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        // Not possible with wayland
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _x: i32, _y: i32) {
+        // Not possible with wayland
+    }
+
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        Some(self.size.lock().unwrap().clone())
+    }
+
+    #[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);
+        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) {
+        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]
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+        use CursorState::{Grab, Normal, Hide};
+        // TODO : not yet possible on wayland to grab cursor
+        match state {
+            Grab => Err("Cursor cannot be grabbed on wayland yet.".to_string()),
+            Hide => Err("Cursor cannot be hidden on wayland yet.".to_string()),
+            Normal => Ok(())
+        }
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        // TODO
+        1.0
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
+        // TODO: not yet possible on wayland
+        Err(())
+    }
+    
+    pub fn get_display(&self) -> &wl_display::WlDisplay {
+        &self.ctxt.display
+    }
+    
+    pub fn get_surface(&self) -> &wl_surface::WlSurface {
+        &self.surface
+    }
+}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        self.surface.destroy();
+        self.cleanup_signal.store(true, ::std::sync::atomic::Ordering::Relaxed);
+    }
+}
+
+pub struct DecoratedHandler {
+    newsize: Option<(u32, u32)>
+}
+
+impl DecoratedHandler {
+    fn new() -> DecoratedHandler { DecoratedHandler { newsize: None }}
+
+    pub fn take_newsize(&mut self) -> Option<(u32, u32)> {
+        self.newsize.take()
+    }
+}
+
+impl wayland_window::Handler for DecoratedHandler {
+    fn configure(&mut self,
+                 _: &mut EventQueueHandle,
+                 _: wl_shell_surface::Resize,
+                 width: i32, height: i32)
+    {
+        use std::cmp::max;
+        self.newsize = Some((max(width,1) as u32, max(height,1) as u32));
+    }
+}
--- a/src/platform/linux/x11/events.rs
+++ b/src/platform/linux/x11/events.rs
--- a/src/platform/linux/x11/ffi.rs
+++ b/src/platform/linux/x11/ffi.rs
@@ -1,4 +1,8 @@
-pub use x11_dl::error::OpenError;
-pub use x11_dl::xinput2::*;
+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;
--- a/src/platform/linux/x11/input.rs
+++ b/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
+}
+
--- a/src/platform/linux/x11/mod.rs
+++ b/src/platform/linux/x11/mod.rs
@@ -0,0 +1,124 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+
+pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
+pub use self::window::{Window, XWindow, PollEventsIterator, WaitEventsIterator, WindowProxy};
+pub use self::xdisplay::{XConnection, XNotSupported, XError};
+
+pub mod ffi;
+
+use platform::PlatformSpecificWindowBuilderAttributes;
+use CreationError;
+
+use std::sync::Arc;
+
+mod events;
+mod input;
+mod monitor;
+mod window;
+mod xdisplay;
+
+// API TRANSITION
+//
+// We don't use the gen_api_transistion!() macro but rather do the expansion manually:
+//
+// As this module is nested into platform/linux, its code is not _exactly_ the same as
+// the one generated by the macro.
+
+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 windows = self.windows.lock().unwrap();
+        for window in windows.iter() {
+            for event in window.poll_events() {
+                callback(::Event::WindowEvent {
+                    window_id: ::WindowId(::platform::WindowId::X(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(::std::time::Duration::from_millis(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<::platform::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<::platform::EventsLoop>, display: &Arc<XConnection>,
+               window: &::WindowAttributes, pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window2, CreationError>
+    {
+        let win = ::std::sync::Arc::new(try!(Window::new(display, window, pl_attribs)));
+        if let ::platform::EventsLoop::X(ref ev) = *events_loop {
+            ev.windows.lock().unwrap().push(win.clone());
+        } else {
+            // It should not be possible to create an eventloop not matching the backend
+            // in use
+            unreachable!()
+        }
+        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() {
+            if let ::platform::EventsLoop::X(ref ev) = *ev {
+                let mut windows = ev.windows.lock().unwrap();
+                windows.retain(|w| &**w as *const Window != &*self.window as *const _);
+            }
+        }
+    }
+}
--- a/src/platform/linux/x11/monitor.rs
+++ b/src/platform/linux/x11/monitor.rs
@@ -0,0 +1,44 @@
+use std::collections::VecDeque;
+use std::sync::Arc;
+
+use super::XConnection;
+use native_monitor::NativeMonitorId;
+
+#[derive(Clone)]
+pub struct MonitorId(pub Arc<XConnection>, pub u32);
+
+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");
+
+    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(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)
+}
+
+impl MonitorId {
+    pub fn get_name(&self) -> Option<String> {
+        let MonitorId(_, screen_num) = *self;
+        Some(format!("Monitor #{}", screen_num))
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Numeric(self.1)
+    }
+
+    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)
+    }
+}
--- a/src/platform/linux/x11/window.rs
+++ b/src/platform/linux/x11/window.rs
--- a/src/platform/linux/x11/xdisplay.rs
+++ b/src/platform/linux/x11/xdisplay.rs
@@ -0,0 +1,145 @@
+use std::ptr;
+use std::fmt;
+use std::error::Error;
+use std::sync::Mutex;
+
+use libc;
+
+use super::ffi;
+
+/// A connection to an X server.
+pub struct XConnection {
+    pub xlib: ffi::Xlib,
+    pub xf86vmode: ffi::Xf86vmode,
+    pub xcursor: ffi::Xcursor,
+    pub xinput2: ffi::XInput2,
+    pub xlib_xcb: ffi::Xlib_xcb,
+    pub display: *mut ffi::Display,
+    pub latest_error: Mutex<Option<XError>>,
+}
+
+unsafe impl Send for XConnection {}
+unsafe impl Sync for XConnection {}
+
+pub type XErrorHandler = Option<unsafe extern fn(*mut ffi::Display, *mut ffi::XErrorEvent) -> libc::c_int>;
+
+impl XConnection {
+    pub fn new(error_handler: XErrorHandler) -> Result<XConnection, XNotSupported> {
+        // opening the libraries
+        let xlib = try!(ffi::Xlib::open());
+        let xcursor = try!(ffi::Xcursor::open());
+        let xf86vmode = try!(ffi::Xf86vmode::open());
+        let xinput2 = try!(ffi::XInput2::open());
+        let xlib_xcb = try!(ffi::Xlib_xcb::open());
+
+        unsafe { (xlib.XInitThreads)() };
+        unsafe { (xlib.XSetErrorHandler)(error_handler) };
+
+        // calling XOpenDisplay
+        let display = unsafe {
+            let display = (xlib.XOpenDisplay)(ptr::null());
+            if display.is_null() {
+                return Err(XNotSupported::XOpenDisplayFailed);
+            }
+            display
+        };
+
+        Ok(XConnection {
+            xlib: xlib,
+            xf86vmode: xf86vmode,
+            xcursor: xcursor,
+            xinput2: xinput2,
+            xlib_xcb: xlib_xcb,
+            display: display,
+            latest_error: Mutex::new(None),
+        })
+    }
+
+    /// Checks whether an error has been triggered by the previous function calls.
+    #[inline]
+    pub fn check_errors(&self) -> Result<(), XError> {
+        let error = self.latest_error.lock().unwrap().take();
+
+        if let Some(error) = error {
+            Err(error)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Ignores any previous error.
+    #[inline]
+    pub fn ignore_error(&self) {
+        *self.latest_error.lock().unwrap() = None;
+    }
+}
+
+impl Drop for XConnection {
+    #[inline]
+    fn drop(&mut self) {
+        unsafe { (self.xlib.XCloseDisplay)(self.display) };
+    }
+}
+
+/// Error triggered by xlib.
+#[derive(Debug, Clone)]
+pub struct XError {
+    pub description: String,
+    pub error_code: u8,
+    pub request_code: u8,
+    pub minor_code: u8,
+}
+
+impl Error for XError {
+    #[inline]
+    fn description(&self) -> &str {
+        &self.description
+    }
+}
+
+impl fmt::Display for XError {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        write!(formatter, "X error: {} (code: {}, request code: {}, minor code: {})",
+               self.description, self.error_code, self.request_code, self.minor_code)
+    }
+}
+
+/// Error returned if this system doesn't have XLib or can't create an X connection.
+#[derive(Clone, Debug)]
+pub enum XNotSupported {
+    /// Failed to load one or several shared libraries.
+    LibraryOpenError(ffi::OpenError),
+    /// Connecting to the X server with `XOpenDisplay` failed.
+    XOpenDisplayFailed,     // TODO: add better message
+}
+
+impl From<ffi::OpenError> for XNotSupported {
+    #[inline]
+    fn from(err: ffi::OpenError) -> XNotSupported {
+        XNotSupported::LibraryOpenError(err)
+    }
+}
+
+impl Error for XNotSupported {
+    #[inline]
+    fn description(&self) -> &str {
+        match *self {
+            XNotSupported::LibraryOpenError(_) => "Failed to load one of xlib's shared libraries",
+            XNotSupported::XOpenDisplayFailed => "Failed to open connection to X server",
+        }
+    }
+
+    #[inline]
+    fn cause(&self) -> Option<&Error> {
+        match *self {
+            XNotSupported::LibraryOpenError(ref err) => Some(err),
+            _ => None
+        }
+    }
+}
+
+impl fmt::Display for XNotSupported {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(self.description())
+    }
+}
--- a/src/platform/macos/events_loop.rs
+++ b/src/platform/macos/events_loop.rs
@@ -0,0 +1,634 @@
+use cocoa::{self, appkit, foundation};
+use cocoa::appkit::{NSApplication, NSEvent, NSView, NSWindow};
+use events::{self, ElementState, Event, MouseButton, TouchPhase, WindowEvent, ModifiersState};
+use super::window::Window;
+use std;
+
+
+pub struct EventsLoop {
+    pub windows: std::sync::Mutex<Vec<std::sync::Weak<Window>>>,
+    pub pending_events: std::sync::Mutex<std::collections::VecDeque<Event>>,
+    modifiers: std::sync::Mutex<Modifiers>,
+    interrupted: std::sync::atomic::AtomicBool,
+
+    // The user event callback given via either of the `poll_events` or `run_forever` methods.
+    //
+    // We store the user's callback here so that it may be accessed by each of the window delegate
+    // callbacks (e.g. resize, close, etc) for the duration of a call to either of the
+    // `poll_events` or `run_forever` methods.
+    //
+    // This is *only* `Some` for the duration of a call to either of these methods and will be
+    // `None` otherwise.
+    user_callback: UserCallback,
+}
+
+struct Modifiers {
+    shift_pressed: bool,
+    ctrl_pressed: bool,
+    win_pressed: bool,
+    alt_pressed: bool,
+}
+
+// Wrapping the user callback in a type allows us to:
+//
+// - ensure the callback pointer is never accidentally cloned
+// - ensure that only the `EventsLoop` can `store` and `drop` the callback pointer
+// - `unsafe impl Send` and `Sync` so that `Send` and `Sync` can be implemented for `EventsLoop`.
+pub struct UserCallback {
+    mutex: std::sync::Mutex<Option<*mut FnMut(Event)>>,
+}
+
+
+unsafe impl Send for UserCallback {}
+unsafe impl Sync for UserCallback {}
+
+impl UserCallback {
+
+    // Here we store user's `callback` behind the mutex so that they may be safely shared between
+    // each of the window delegates.
+    //
+    // In order to make sure that the pointer is always valid, we must manually guarantee that it
+    // is dropped before the callback itself is dropped. Thus, this should *only* be called at the
+    // beginning of a call to `poll_events` and `run_forever`, both of which *must* drop the
+    // callback at the end of their scope using the `drop` method.
+    fn store<F>(&self, callback: &mut F)
+        where F: FnMut(Event)
+    {
+        let trait_object = callback as &mut FnMut(Event);
+        let trait_object_ptr = trait_object as *const FnMut(Event) as *mut FnMut(Event);
+        *self.mutex.lock().unwrap() = Some(trait_object_ptr);
+    }
+
+    // Emits the given event via the user-given callback.
+    //
+    // This is unsafe as it requires dereferencing the pointer to the user-given callback. We
+    // guarantee this is safe by ensuring the `UserCallback` never lives longer than the user-given
+    // callback.
+    //
+    // Note that the callback may not always be `Some`. This is because some `NSWindowDelegate`
+    // callbacks can be triggered by means other than `NSApp().sendEvent`. For example, if a window
+    // is destroyed or created during a call to the user's callback, the `WindowDelegate` methods
+    // may be called with `windowShouldClose` or `windowDidResignKey`.
+    unsafe fn call_with_event(&self, event: Event) {
+        let callback = match self.mutex.lock().unwrap().take() {
+            Some(callback) => callback,
+            None => return,
+        };
+        (*callback)(event);
+        *self.mutex.lock().unwrap() = Some(callback);
+    }
+
+    // Used to drop the user callback pointer at the end of the `poll_events` and `run_forever`
+    // methods. This is done to enforce our guarantee that the top callback will never live longer
+    // than the call to either `poll_events` or `run_forever` to which it was given.
+    fn drop(&self) {
+        self.mutex.lock().unwrap().take();
+    }
+
+}
+
+
+impl EventsLoop {
+
+    pub fn new() -> Self {
+        let modifiers = Modifiers {
+            shift_pressed: false,
+            ctrl_pressed: false,
+            win_pressed: false,
+            alt_pressed: false,
+        };
+        EventsLoop {
+            windows: std::sync::Mutex::new(Vec::new()),
+            pending_events: std::sync::Mutex::new(std::collections::VecDeque::new()),
+            modifiers: std::sync::Mutex::new(modifiers),
+            interrupted: std::sync::atomic::AtomicBool::new(false),
+            user_callback: UserCallback { mutex: std::sync::Mutex::new(None) },
+        }
+    }
+
+    pub fn poll_events<F>(&self, mut callback: F)
+        where F: FnMut(Event),
+    {
+        unsafe {
+            if !msg_send![cocoa::base::class("NSThread"), isMainThread] {
+                panic!("Events can only be polled from the main thread on macOS");
+            }
+        }
+
+        self.user_callback.store(&mut callback);
+
+        // Loop as long as we have pending events to return.
+        loop {
+            unsafe {
+                // First, yield all pending events.
+                self.call_user_callback_with_pending_events();
+
+                let pool = foundation::NSAutoreleasePool::new(cocoa::base::nil);
+
+                // Poll for the next event, returning `nil` if there are none.
+                let ns_event = appkit::NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
+                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
+                    foundation::NSDate::distantPast(cocoa::base::nil),
+                    foundation::NSDefaultRunLoopMode,
+                    cocoa::base::YES);
+
+                let event = self.ns_event_to_event(ns_event);
+
+                let _: () = msg_send![pool, release];
+
+                match event {
+                    // Call the user's callback.
+                    Some(event) => self.user_callback.call_with_event(event),
+                    None => break,
+                }
+            }
+        }
+
+        self.user_callback.drop();
+    }
+
+    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");
+            }
+        }
+
+        self.user_callback.store(&mut callback);
+
+        loop {
+            unsafe {
+                // First, yield all pending events.
+                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_(
+                    appkit::NSAnyEventMask.bits() | appkit::NSEventMaskPressure.bits(),
+                    foundation::NSDate::distantFuture(cocoa::base::nil),
+                    foundation::NSDefaultRunLoopMode,
+                    cocoa::base::YES);
+
+                let maybe_event = self.ns_event_to_event(ns_event);
+
+                // Release the pool before calling the top callback in case the user calls either
+                // `run_forever` or `poll_events` within the callback.
+                let _: () = msg_send![pool, release];
+
+                if let Some(event) = maybe_event {
+                    self.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.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(&self, ns_event: cocoa::base::id) -> Option<Event> {
+        if ns_event == cocoa::base::nil {
+            return None;
+        }
+
+        // FIXME: Despite not being documented anywhere, an `NSEvent` is produced when a user opens
+        // Spotlight while the NSApplication is in focus. This `NSEvent` produces a `NSEventType`
+        // with value `21`. This causes a SEGFAULT as soon as we try to match on the `NSEventType`
+        // enum as there is no variant associated with the value. Thus, we return early if this
+        // sneaky event occurs. If someone does find some documentation on this, please fix this by
+        // adding an appropriate variant to the `NSEventType` enum in the cocoa-rs crate.
+        if ns_event.eventType() as u64 == 21 {
+            return None;
+        }
+
+        let event_type = ns_event.eventType();
+        let ns_window = ns_event.window();
+        let window_id = super::window::get_window_id(ns_window);
+
+        // FIXME: Document this. Why do we do this? Seems like it passes on events to window/app.
+        // If we don't do this, window does not become main for some reason.
+        match event_type {
+            appkit::NSKeyDown => (),
+            _ => appkit::NSApp().sendEvent_(ns_event),
+        }
+
+        let windows = self.windows.lock().unwrap();
+        let maybe_window = windows.iter()
+            .filter_map(std::sync::Weak::upgrade)
+            .find(|window| window_id == window.id());
+
+        let into_event = |window_event| Event::WindowEvent {
+            window_id: ::WindowId(window_id),
+            event: window_event,
+        };
+
+        // Returns `Some` window if one of our windows is the key window.
+        let maybe_key_window = || windows.iter()
+            .filter_map(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::NSKeyDown => {
+                let mut events = std::collections::VecDeque::new();
+                let received_c_str = foundation::NSString::UTF8String(ns_event.characters());
+                let received_str = std::ffi::CStr::from_ptr(received_c_str);
+                for received_char in std::str::from_utf8(received_str.to_bytes()).unwrap().chars() {
+                    let window_event = WindowEvent::ReceivedCharacter(received_char);
+                    events.push_back(into_event(window_event));
+                }
+
+                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
+                let state = ElementState::Pressed;
+                let code = NSEvent::keyCode(ns_event) as u8;
+                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
+                events.push_back(into_event(window_event));
+                let event = events.pop_front();
+                self.pending_events.lock().unwrap().extend(events.into_iter());
+                event
+            },
+
+            appkit::NSKeyUp => {
+                let vkey =  to_virtual_key_code(NSEvent::keyCode(ns_event));
+
+                let state = ElementState::Released;
+                let code = NSEvent::keyCode(ns_event) as u8;
+                let window_event = WindowEvent::KeyboardInput(state, code, vkey, event_mods(ns_event));
+                Some(into_event(window_event))
+            },
+
+            appkit::NSFlagsChanged => {
+                let mut modifiers = self.modifiers.lock().unwrap();
+
+                unsafe fn modifier_event(event: cocoa::base::id,
+                                         keymask: appkit::NSEventModifierFlags,
+                                         key: events::VirtualKeyCode,
+                                         key_pressed: bool) -> Option<WindowEvent>
+                {
+                    if !key_pressed && NSEvent::modifierFlags(event).contains(keymask) {
+                        let state = ElementState::Pressed;
+                        let code = NSEvent::keyCode(event) as u8;
+                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
+                        Some(window_event)
+
+                    } else if key_pressed && !NSEvent::modifierFlags(event).contains(keymask) {
+                        let state = ElementState::Released;
+                        let code = NSEvent::keyCode(event) as u8;
+                        let window_event = WindowEvent::KeyboardInput(state, code, Some(key), event_mods(event));
+                        Some(window_event)
+
+                    } else {
+                        None
+                    }
+                }
+
+                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,
+                                                           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,
+                                                           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.pending_events.lock().unwrap().extend(events.into_iter());
+                event
+            },
+
+            appkit::NSLeftMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Left))) },
+            appkit::NSLeftMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Left))) },
+            appkit::NSRightMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Right))) },
+            appkit::NSRightMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Right))) },
+            appkit::NSOtherMouseDown => { Some(into_event(WindowEvent::MouseInput(ElementState::Pressed, MouseButton::Middle))) },
+            appkit::NSOtherMouseUp => { Some(into_event(WindowEvent::MouseInput(ElementState::Released, MouseButton::Middle))) },
+
+            appkit::NSMouseEntered => { Some(into_event(WindowEvent::MouseEntered)) },
+            appkit::NSMouseExited => { Some(into_event(WindowEvent::MouseLeft)) },
+
+            appkit::NSMouseMoved |
+            appkit::NSLeftMouseDragged |
+            appkit::NSOtherMouseDragged |
+            appkit::NSRightMouseDragged => {
+                // If the mouse movement was on one of our windows, use it.
+                // Otherwise, if one of our windows is the key window (receiving input), use it.
+                // Otherwise, return `None`.
+                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 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 => {
+                // If none of the windows received the scroll, return `None`.
+                let window = match maybe_window {
+                    Some(window) => window,
+                    None => return None,
+                };
+
+                use events::MouseScrollDelta::{LineDelta, PixelDelta};
+                let scale_factor = window.hidpi_factor();
+                let delta = if ns_event.hasPreciseScrollingDeltas() == cocoa::base::YES {
+                    PixelDelta(scale_factor * ns_event.scrollingDeltaX() as f32,
+                               scale_factor * ns_event.scrollingDeltaY() as f32)
+                } else {
+                    LineDelta(scale_factor * ns_event.scrollingDeltaX() as f32,
+                              scale_factor * ns_event.scrollingDeltaY() as f32)
+                };
+                let phase = match ns_event.phase() {
+                    appkit::NSEventPhaseMayBegin | appkit::NSEventPhaseBegan => TouchPhase::Started,
+                    appkit::NSEventPhaseEnded => TouchPhase::Ended,
+                    _ => TouchPhase::Moved,
+                };
+                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(pressure, stage);
+                Some(into_event(window_event))
+            },
+
+            appkit::NSApplicationDefined => match ns_event.subtype() {
+                appkit::NSEventSubtype::NSApplicationActivatedEventType => {
+                    Some(into_event(WindowEvent::Awakened))
+                },
+                _ => None,
+            },
+
+            _  => None,
+        }
+    }
+
+}
+
+
+fn to_virtual_key_code(code: u16) -> Option<events::VirtualKeyCode> {
+    Some(match code {
+        0x00 => events::VirtualKeyCode::A,
+        0x01 => events::VirtualKeyCode::S,
+        0x02 => events::VirtualKeyCode::D,
+        0x03 => events::VirtualKeyCode::F,
+        0x04 => events::VirtualKeyCode::H,
+        0x05 => events::VirtualKeyCode::G,
+        0x06 => events::VirtualKeyCode::Z,
+        0x07 => events::VirtualKeyCode::X,
+        0x08 => events::VirtualKeyCode::C,
+        0x09 => events::VirtualKeyCode::V,
+        //0x0a => World 1,
+        0x0b => events::VirtualKeyCode::B,
+        0x0c => events::VirtualKeyCode::Q,
+        0x0d => events::VirtualKeyCode::W,
+        0x0e => events::VirtualKeyCode::E,
+        0x0f => events::VirtualKeyCode::R,
+        0x10 => events::VirtualKeyCode::Y,
+        0x11 => events::VirtualKeyCode::T,
+        0x12 => events::VirtualKeyCode::Key1,
+        0x13 => events::VirtualKeyCode::Key2,
+        0x14 => events::VirtualKeyCode::Key3,
+        0x15 => events::VirtualKeyCode::Key4,
+        0x16 => events::VirtualKeyCode::Key6,
+        0x17 => events::VirtualKeyCode::Key5,
+        0x18 => events::VirtualKeyCode::Equals,
+        0x19 => events::VirtualKeyCode::Key9,
+        0x1a => events::VirtualKeyCode::Key7,
+        0x1b => events::VirtualKeyCode::Minus,
+        0x1c => events::VirtualKeyCode::Key8,
+        0x1d => events::VirtualKeyCode::Key0,
+        0x1e => events::VirtualKeyCode::RBracket,
+        0x1f => events::VirtualKeyCode::O,
+        0x20 => events::VirtualKeyCode::U,
+        0x21 => events::VirtualKeyCode::LBracket,
+        0x22 => events::VirtualKeyCode::I,
+        0x23 => events::VirtualKeyCode::P,
+        0x24 => events::VirtualKeyCode::Return,
+        0x25 => events::VirtualKeyCode::L,
+        0x26 => events::VirtualKeyCode::J,
+        0x27 => events::VirtualKeyCode::Apostrophe,
+        0x28 => events::VirtualKeyCode::K,
+        0x29 => events::VirtualKeyCode::Semicolon,
+        0x2a => events::VirtualKeyCode::Backslash,
+        0x2b => events::VirtualKeyCode::Comma,
+        0x2c => events::VirtualKeyCode::Slash,
+        0x2d => events::VirtualKeyCode::N,
+        0x2e => events::VirtualKeyCode::M,
+        0x2f => events::VirtualKeyCode::Period,
+        0x30 => events::VirtualKeyCode::Tab,
+        0x31 => events::VirtualKeyCode::Space,
+        0x32 => events::VirtualKeyCode::Grave,
+        0x33 => events::VirtualKeyCode::Back,
+        //0x34 => unkown,
+        0x35 => events::VirtualKeyCode::Escape,
+        0x36 => events::VirtualKeyCode::RWin,
+        0x37 => events::VirtualKeyCode::LWin,
+        0x38 => events::VirtualKeyCode::LShift,
+        //0x39 => Caps lock,
+        //0x3a => Left alt,
+        0x3b => events::VirtualKeyCode::LControl,
+        0x3c => events::VirtualKeyCode::RShift,
+        //0x3d => Right alt,
+        0x3e => events::VirtualKeyCode::RControl,
+        //0x3f => Fn key,
+        //0x40 => F17 Key,
+        0x41 => events::VirtualKeyCode::Decimal,
+        //0x42 -> unkown,
+        0x43 => events::VirtualKeyCode::Multiply,
+        //0x44 => unkown,
+        0x45 => events::VirtualKeyCode::Add,
+        //0x46 => unkown,
+        0x47 => events::VirtualKeyCode::Numlock,
+        //0x48 => KeypadClear,
+        0x49 => events::VirtualKeyCode::VolumeUp,
+        0x4a => events::VirtualKeyCode::VolumeDown,
+        0x4b => events::VirtualKeyCode::Divide,
+        0x4c => events::VirtualKeyCode::NumpadEnter,
+        //0x4d => unkown,
+        0x4e => events::VirtualKeyCode::Subtract,
+        //0x4f => F18 key,
+        //0x50 => F19 Key,
+        0x51 => events::VirtualKeyCode::NumpadEquals,
+        0x52 => events::VirtualKeyCode::Numpad0,
+        0x53 => events::VirtualKeyCode::Numpad1,
+        0x54 => events::VirtualKeyCode::Numpad2,
+        0x55 => events::VirtualKeyCode::Numpad3,
+        0x56 => events::VirtualKeyCode::Numpad4,
+        0x57 => events::VirtualKeyCode::Numpad5,
+        0x58 => events::VirtualKeyCode::Numpad6,
+        0x59 => events::VirtualKeyCode::Numpad7,
+        //0x5a => F20 Key,
+        0x5b => events::VirtualKeyCode::Numpad8,
+        0x5c => events::VirtualKeyCode::Numpad9,
+        //0x5d => unkown,
+        //0x5e => unkown,
+        //0x5f => unkown,
+        0x60 => events::VirtualKeyCode::F5,
+        0x61 => events::VirtualKeyCode::F6,
+        0x62 => events::VirtualKeyCode::F7,
+        0x63 => events::VirtualKeyCode::F3,
+        0x64 => events::VirtualKeyCode::F8,
+        0x65 => events::VirtualKeyCode::F9,
+        //0x66 => unkown,
+        0x67 => events::VirtualKeyCode::F11,
+        //0x68 => unkown,
+        0x69 => events::VirtualKeyCode::F13,
+        //0x6a => F16 Key,
+        0x6b => events::VirtualKeyCode::F14,
+        //0x6c => unkown,
+        0x6d => events::VirtualKeyCode::F10,
+        //0x6e => unkown,
+        0x6f => events::VirtualKeyCode::F12,
+        //0x70 => unkown,
+        0x71 => events::VirtualKeyCode::F15,
+        0x72 => events::VirtualKeyCode::Insert,
+        0x73 => events::VirtualKeyCode::Home,
+        0x74 => events::VirtualKeyCode::PageUp,
+        0x75 => events::VirtualKeyCode::Delete,
+        0x76 => events::VirtualKeyCode::F4,
+        0x77 => events::VirtualKeyCode::End,
+        0x78 => events::VirtualKeyCode::F2,
+        0x79 => events::VirtualKeyCode::PageDown,
+        0x7a => events::VirtualKeyCode::F1,
+        0x7b => events::VirtualKeyCode::Left,
+        0x7c => events::VirtualKeyCode::Right,
+        0x7d => events::VirtualKeyCode::Down,
+        0x7e => events::VirtualKeyCode::Up,
+        //0x7f =>  unkown,
+
+        _ => return None,
+    })
+}
+
+fn event_mods(event: cocoa::base::id) -> ModifiersState {
+    let flags = unsafe {
+        NSEvent::modifierFlags(event)
+    };
+    ModifiersState {
+        shift: flags.contains(appkit::NSShiftKeyMask),
+        ctrl: flags.contains(appkit::NSControlKeyMask),
+        alt: flags.contains(appkit::NSAlternateKeyMask),
+        logo: flags.contains(appkit::NSCommandKeyMask),
+    }
+}
--- a/src/platform/macos/mod.rs
+++ b/src/platform/macos/mod.rs
@@ -0,0 +1,38 @@
+#![cfg(target_os = "macos")]
+
+pub use self::events_loop::EventsLoop;
+pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
+pub use self::window::{Id as WindowId, PlatformSpecificWindowBuilderAttributes, Window};
+
+use {CreationError};
+
+pub struct Window2 {
+    pub window: ::std::sync::Arc<Window>,
+}
+
+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>,
+               attributes: &::WindowAttributes,
+               pl_attribs: &PlatformSpecificWindowBuilderAttributes) -> Result<Self, CreationError>
+    {
+        let weak_events_loop = ::std::sync::Arc::downgrade(&events_loop);
+        let window = ::std::sync::Arc::new(try!(Window::new(weak_events_loop, attributes, pl_attribs)));
+        let weak_window = ::std::sync::Arc::downgrade(&window);
+        events_loop.windows.lock().unwrap().push(weak_window);
+        Ok(Window2 { window: window })
+    }
+
+}
+
+mod events_loop;
+mod monitor;
+mod window;
--- a/src/platform/macos/monitor.rs
+++ b/src/platform/macos/monitor.rs
@@ -0,0 +1,50 @@
+use core_graphics::display;
+use std::collections::VecDeque;
+use native_monitor::NativeMonitorId;
+
+#[derive(Clone)]
+pub struct MonitorId(u32);
+
+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() -> 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 = unsafe { display::CGDisplayModelNumber(display_id) };
+        Some(format!("Monitor #{}", screen_num))
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        let MonitorId(display_id) = *self;
+        NativeMonitorId::Numeric(display_id)
+    }
+
+    pub fn get_dimensions(&self) -> (u32, u32) {
+        let MonitorId(display_id) = *self;
+        let dimension = unsafe {
+            let height = display::CGDisplayPixelsHigh(display_id);
+            let width = display::CGDisplayPixelsWide(display_id);
+            (width as u32, height as u32)
+        };
+        dimension
+    }
+}
--- a/src/platform/macos/window.rs
+++ b/src/platform/macos/window.rs
@@ -0,0 +1,656 @@
+use {CreationError, Event, WindowEvent, WindowId, MouseCursor, CursorState};
+use CreationError::OsError;
+use libc;
+
+use WindowAttributes;
+use native_monitor::NativeMonitorId;
+use os::macos::ActivationPolicy;
+
+use objc;
+use objc::runtime::{Class, Object, Sel, BOOL, YES, NO};
+use objc::declare::ClassDecl;
+
+use cocoa;
+use cocoa::base::{id, nil};
+use cocoa::foundation::{NSPoint, NSRect, NSSize, NSString, NSUInteger};
+use cocoa::appkit::{self, NSApplication, NSColor, NSView, NSWindow};
+
+use core_graphics::display::{CGAssociateMouseAndMouseCursorPosition, CGMainDisplayID, CGDisplayPixelsHigh, CGWarpMouseCursorPosition};
+
+use std;
+use std::ops::Deref;
+use std::os::raw::c_void;
+
+use os::macos::WindowExt;
+
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Id(pub usize);
+
+struct DelegateState {
+    view: IdRef,
+    window: IdRef,
+    events_loop: std::sync::Weak<super::EventsLoop>,
+}
+
+pub struct WindowDelegate {
+    state: Box<DelegateState>,
+    _this: IdRef,
+}
+
+impl WindowDelegate {
+    /// Get the delegate class, initiailizing it neccessary
+    fn class() -> *const Class {
+        use std::os::raw::c_void;
+
+        // Emits an event via the `EventsLoop`'s callback or stores it in the pending queue.
+        unsafe fn emit_event(state: &mut DelegateState, window_event: WindowEvent) {
+            let window_id = get_window_id(*state.window);
+            let event = Event::WindowEvent {
+                window_id: WindowId(window_id),
+                event: window_event,
+            };
+
+            if let Some(events_loop) = state.events_loop.upgrade() {
+                events_loop.call_user_callback_with_event_or_store_in_pending(event);
+            }
+        }
+
+        // Called when the window is resized or when the window was moved to a different screen.
+        unsafe fn emit_resize_event(state: &mut DelegateState) {
+            let rect = NSView::frame(*state.view);
+            let scale_factor = NSWindow::backingScaleFactor(*state.window) as f32;
+            let width = (scale_factor * rect.size.width as f32) as u32;
+            let height = (scale_factor * rect.size.height as f32) as u32;
+            emit_event(state, WindowEvent::Resized(width, height));
+        }
+
+        extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("winitState");
+                let state = &mut *(state as *mut DelegateState);
+                emit_event(state, WindowEvent::Closed);
+
+                // Remove the window from the events_loop.
+                if let Some(events_loop) = state.events_loop.upgrade() {
+                    let window_id = get_window_id(*state.window);
+                    events_loop.find_and_remove_window(window_id);
+                }
+            }
+            YES
+        }
+
+        extern fn window_did_resize(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("winitState");
+                let state = &mut *(state as *mut DelegateState);
+                emit_resize_event(state);
+            }
+        }
+
+        extern fn window_did_change_screen(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("winitState");
+                let state = &mut *(state as *mut DelegateState);
+                emit_resize_event(state);
+            }
+        }
+
+        extern fn window_did_become_key(this: &Object, _: Sel, _: id) {
+            unsafe {
+                // TODO: center the cursor if the window had mouse grab when it
+                // lost focus
+                let state: *mut c_void = *this.get_ivar("winitState");
+                let state = &mut *(state as *mut DelegateState);
+                emit_event(state, WindowEvent::Focused(true));
+            }
+        }
+
+        extern fn window_did_resign_key(this: &Object, _: Sel, _: id) {
+            unsafe {
+                let state: *mut c_void = *this.get_ivar("winitState");
+                let state = &mut *(state as *mut DelegateState);
+                emit_event(state, WindowEvent::Focused(false));
+            }
+        }
+
+        static mut DELEGATE_CLASS: *const Class = 0 as *const Class;
+        static INIT: std::sync::Once = std::sync::ONCE_INIT;
+
+        INIT.call_once(|| unsafe {
+            // Create new NSWindowDelegate
+            let superclass = Class::get("NSObject").unwrap();
+            let mut decl = ClassDecl::new("WinitWindowDelegate", superclass).unwrap();
+
+            // Add callback methods
+            decl.add_method(sel!(windowShouldClose:),
+                window_should_close as extern fn(&Object, Sel, id) -> BOOL);
+            decl.add_method(sel!(windowDidResize:),
+                window_did_resize as extern fn(&Object, Sel, id));
+            decl.add_method(sel!(windowDidChangeScreen:),
+                window_did_change_screen as extern fn(&Object, Sel, id));
+
+            decl.add_method(sel!(windowDidBecomeKey:),
+                window_did_become_key as extern fn(&Object, Sel, id));
+            decl.add_method(sel!(windowDidResignKey:),
+                window_did_resign_key as extern fn(&Object, Sel, id));
+
+            // Store internal state as user data
+            decl.add_ivar::<*mut c_void>("winitState");
+
+            DELEGATE_CLASS = decl.register();
+        });
+
+        unsafe {
+            DELEGATE_CLASS
+        }
+    }
+
+    fn new(state: DelegateState) -> WindowDelegate {
+        // Box the state so we can give a pointer to it
+        let mut state = Box::new(state);
+        let state_ptr: *mut DelegateState = &mut *state;
+        unsafe {
+            let delegate = IdRef::new(msg_send![WindowDelegate::class(), new]);
+
+            (&mut **delegate).set_ivar("winitState", state_ptr as *mut ::std::os::raw::c_void);
+            let _: () = msg_send![*state.window, setDelegate:*delegate];
+
+            WindowDelegate { state: state, _this: delegate }
+        }
+    }
+}
+
+impl Drop for WindowDelegate {
+    fn drop(&mut self) {
+        unsafe {
+            // Nil the window's delegate so it doesn't still reference us
+            let _: () = msg_send![*self.state.window, setDelegate:nil];
+        }
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub activation_policy: ActivationPolicy,
+}
+
+pub struct Window {
+    pub view: IdRef,
+    pub window: IdRef,
+    pub delegate: WindowDelegate,
+}
+
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        // Remove this window from the `EventLoop`s list of windows.
+        let id = self.id();
+        if let Some(ev) = self.delegate.state.events_loop.upgrade() {
+            ev.find_and_remove_window(id);
+        }
+
+        // Close the window if it has not yet been closed.
+        let nswindow = *self.window;
+        if nswindow != nil {
+            unsafe {
+                msg_send![nswindow, close];
+            }
+        }
+    }
+}
+
+impl WindowExt for Window {
+    #[inline]
+    fn get_nswindow(&self) -> *mut c_void {
+        *self.window as *mut c_void
+    }
+
+    #[inline]
+    fn get_nsview(&self) -> *mut c_void {
+        *self.view as *mut c_void
+    }
+}
+
+impl Window {
+    pub fn new(events_loop: std::sync::Weak<super::EventsLoop>,
+               win_attribs: &WindowAttributes,
+               pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window, CreationError>
+    {
+        unsafe {
+            if !msg_send![cocoa::base::class("NSThread"), isMainThread] {
+                panic!("Windows can only be created on the main thread on macOS");
+            }
+        }
+
+        let app = match Window::create_app(pl_attribs.activation_policy) {
+            Some(app) => app,
+            None      => { return Err(OsError(format!("Couldn't create NSApplication"))); },
+        };
+
+        let window = match Window::create_window(win_attribs)
+        {
+            Some(window) => window,
+            None         => { return Err(OsError(format!("Couldn't create NSWindow"))); },
+        };
+        let view = match Window::create_view(*window) {
+            Some(view) => view,
+            None       => { return Err(OsError(format!("Couldn't create NSView"))); },
+        };
+
+        unsafe {
+            if win_attribs.transparent {
+                (*window as id).setOpaque_(NO);
+                (*window as id).setBackgroundColor_(NSColor::clearColor(nil));
+            }
+
+            app.activateIgnoringOtherApps_(YES);
+            if win_attribs.visible {
+                window.makeKeyAndOrderFront_(nil);
+            } else {
+                window.makeKeyWindow();
+            }
+
+            if let Some((width, height)) = win_attribs.min_dimensions {
+                nswindow_set_min_dimensions(window.0, width.into(), height.into());
+            }
+
+            if let Some((width, height)) = win_attribs.max_dimensions {
+                nswindow_set_max_dimensions(window.0, width.into(), height.into());
+            }
+        }
+
+        let ds = DelegateState {
+            view: view.clone(),
+            window: window.clone(),
+            events_loop: events_loop,
+        };
+
+        let window = Window {
+            view: view,
+            window: window,
+            delegate: WindowDelegate::new(ds),
+        };
+
+        Ok(window)
+    }
+
+    pub fn id(&self) -> Id {
+        get_window_id(*self.window)
+    }
+
+    fn create_app(activation_policy: ActivationPolicy) -> Option<id> {
+        unsafe {
+            let app = appkit::NSApp();
+            if app == nil {
+                None
+            } else {
+                app.setActivationPolicy_(activation_policy.into());
+                app.finishLaunching();
+                Some(app)
+            }
+        }
+    }
+
+    fn create_window(attrs: &WindowAttributes) -> Option<IdRef> {
+        unsafe {
+            let screen = match attrs.monitor {
+                Some(ref monitor_id) => {
+                    let native_id = match monitor_id.get_native_identifier() {
+                        NativeMonitorId::Numeric(num) => num,
+                        _ => panic!("OS X monitors should always have a numeric native ID")
+                    };
+                    let matching_screen = {
+                        let screens = appkit::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 = appkit::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
+                    };
+                    Some(matching_screen.unwrap_or(appkit::NSScreen::mainScreen(nil)))
+                },
+                None => None
+            };
+            let frame = match screen {
+                Some(screen) => appkit::NSScreen::frame(screen),
+                None => {
+                    let (width, height) = attrs.dimensions.unwrap_or((800, 600));
+                    NSRect::new(NSPoint::new(0., 0.), NSSize::new(width as f64, height as f64))
+                }
+            };
+
+            let masks = if screen.is_some() {
+                // Fullscreen window
+                appkit::NSBorderlessWindowMask as NSUInteger |
+                appkit::NSResizableWindowMask as NSUInteger |
+                appkit::NSTitledWindowMask as NSUInteger
+            } else if attrs.decorations {
+                // Window with a titlebar
+                appkit::NSClosableWindowMask as NSUInteger |
+                appkit::NSMiniaturizableWindowMask as NSUInteger |
+                appkit::NSResizableWindowMask as NSUInteger |
+                appkit::NSTitledWindowMask as NSUInteger
+            } else {
+                // Window without a titlebar
+                appkit::NSClosableWindowMask as NSUInteger |
+                appkit::NSMiniaturizableWindowMask as NSUInteger |
+                appkit::NSResizableWindowMask as NSUInteger |
+                appkit::NSFullSizeContentViewWindowMask as NSUInteger
+            };
+
+            let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_(
+                frame,
+                masks,
+                appkit::NSBackingStoreBuffered,
+                NO,
+            ));
+            window.non_nil().map(|window| {
+                let title = IdRef::new(NSString::alloc(nil).init_str(&attrs.title));
+                window.setReleasedWhenClosed_(NO);
+                window.setTitle_(*title);
+                window.setAcceptsMouseMovedEvents_(YES);
+
+                if !attrs.decorations {
+                    window.setTitleVisibility_(appkit::NSWindowTitleVisibility::NSWindowTitleHidden);
+                    window.setTitlebarAppearsTransparent_(YES);
+                }
+
+                if screen.is_some() {
+                    window.setLevel_(appkit::NSMainMenuWindowLevel as i64 + 1);
+                }
+                else {
+                    window.center();
+                }
+                window
+            })
+        }
+    }
+
+    fn create_view(window: id) -> Option<IdRef> {
+        unsafe {
+            let view = IdRef::new(NSView::alloc(nil).init());
+            view.non_nil().map(|view| {
+                view.setWantsBestResolutionOpenGLSurface_(YES);
+                window.setContentView_(*view);
+                view
+            })
+        }
+    }
+
+    pub fn set_title(&self, title: &str) {
+        unsafe {
+            let title = IdRef::new(NSString::alloc(nil).init_str(title));
+            self.window.setTitle_(*title);
+        }
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        unsafe { NSWindow::makeKeyAndOrderFront_(*self.window, nil); }
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        unsafe { NSWindow::orderOut_(*self.window, nil); }
+    }
+
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        unsafe {
+            let content_rect = NSWindow::contentRectForFrameRect_(*self.window, NSWindow::frame(*self.window));
+
+            // TODO: consider extrapolating the calculations for the y axis to
+            // a private method
+            Some((content_rect.origin.x as i32, (CGDisplayPixelsHigh(CGMainDisplayID()) as f64 - (content_rect.origin.y + content_rect.size.height)) as i32))
+        }
+    }
+
+    pub fn set_position(&self, x: i32, y: i32) {
+        unsafe {
+            let frame = NSWindow::frame(*self.view);
+
+            // NOTE: `setFrameOrigin` might not give desirable results when
+            // setting window, as it treats bottom left as origin.
+            // `setFrameTopLeftPoint` treats top left as origin (duh), but
+            // does not equal the value returned by `get_window_position`
+            // (there is a difference by 22 for me on yosemite)
+
+            // TODO: consider extrapolating the calculations for the y axis to
+            // a private method
+            let dummy = NSRect::new(NSPoint::new(x as f64, CGDisplayPixelsHigh(CGMainDisplayID()) as f64 - (frame.size.height + y as f64)), NSSize::new(0f64, 0f64));
+            let conv = NSWindow::frameRectForContentRect_(*self.window, dummy);
+
+            // NSWindow::setFrameTopLeftPoint_(*self.window, conv.origin);
+            NSWindow::setFrameOrigin_(*self.window, conv.origin);
+        }
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        unsafe {
+            let view_frame = NSView::frame(*self.view);
+            Some((view_frame.size.width as u32, view_frame.size.height as u32))
+        }
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+        unsafe {
+            let window_frame = NSWindow::frame(*self.window);
+            Some((window_frame.size.width as u32, window_frame.size.height as u32))
+        }
+    }
+
+    #[inline]
+    pub fn set_inner_size(&self, width: u32, height: u32) {
+        unsafe {
+            NSWindow::setContentSize_(*self.window, NSSize::new(width as f64, height as f64));
+        }
+    }
+
+    #[inline]
+    pub fn platform_display(&self) -> *mut libc::c_void {
+        unimplemented!()
+    }
+
+    #[inline]
+    pub fn platform_window(&self) -> *mut libc::c_void {
+        *self.window as *mut libc::c_void
+    }
+
+    pub fn set_cursor(&self, cursor: MouseCursor) {
+        let cursor_name = match cursor {
+            MouseCursor::Arrow | MouseCursor::Default => "arrowCursor",
+            MouseCursor::Hand => "pointingHandCursor",
+            MouseCursor::Grabbing | MouseCursor::Grab => "closedHandCursor",
+            MouseCursor::Text => "IBeamCursor",
+            MouseCursor::VerticalText => "IBeamCursorForVerticalLayout",
+            MouseCursor::Copy => "dragCopyCursor",
+            MouseCursor::Alias => "dragLinkCursor",
+            MouseCursor::NotAllowed | MouseCursor::NoDrop => "operationNotAllowedCursor",
+            MouseCursor::ContextMenu => "contextualMenuCursor",
+            MouseCursor::Crosshair => "crosshairCursor",
+            MouseCursor::EResize => "resizeRightCursor",
+            MouseCursor::NResize => "resizeUpCursor",
+            MouseCursor::WResize => "resizeLeftCursor",
+            MouseCursor::SResize => "resizeDownCursor",
+            MouseCursor::EwResize | MouseCursor::ColResize => "resizeLeftRightCursor",
+            MouseCursor::NsResize | MouseCursor::RowResize => "resizeUpDownCursor",
+
+            /// TODO: Find appropriate OSX cursors
+            MouseCursor::NeResize | MouseCursor::NwResize |
+            MouseCursor::SeResize | MouseCursor::SwResize |
+            MouseCursor::NwseResize | MouseCursor::NeswResize |
+
+            MouseCursor::Cell | MouseCursor::NoneCursor |
+            MouseCursor::Wait | MouseCursor::Progress | MouseCursor::Help |
+            MouseCursor::Move | MouseCursor::AllScroll | MouseCursor::ZoomIn |
+            MouseCursor::ZoomOut => "arrowCursor",
+        };
+        let sel = Sel::register(cursor_name);
+        let cls = Class::get("NSCursor").unwrap();
+        unsafe {
+            use objc::Message;
+            let cursor: id = cls.send_message(sel, ()).unwrap();
+            let _: () = msg_send![cursor, set];
+        }
+    }
+
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+        let cls = Class::get("NSCursor").unwrap();
+
+        // TODO: Check for errors.
+        match state {
+            CursorState::Normal => {
+                let _: () = unsafe { msg_send![cls, unhide] };
+                let _: i32 = unsafe { CGAssociateMouseAndMouseCursorPosition(true) };
+                Ok(())
+            },
+            CursorState::Hide => {
+                let _: () = unsafe { msg_send![cls, hide] };
+                Ok(())
+            },
+            CursorState::Grab => {
+                let _: i32 = unsafe { CGAssociateMouseAndMouseCursorPosition(false) };
+                Ok(())
+            }
+        }
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        unsafe {
+            NSWindow::backingScaleFactor(*self.window) as f32
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+        let (window_x, window_y) = self.get_position().unwrap_or((0, 0));
+        let (cursor_x, cursor_y) = (window_x + x, window_y + y);
+
+        unsafe {
+            // TODO: Check for errors.
+            let _ = CGWarpMouseCursorPosition(appkit::CGPoint {
+                x: cursor_x as appkit::CGFloat,
+                y: cursor_y as appkit::CGFloat,
+            });
+            let _ = CGAssociateMouseAndMouseCursorPosition(true);
+        }
+
+        Ok(())
+    }
+}
+
+// Convert the `cocoa::base::id` associated with a window to a usize to use as a unique identifier
+// for the window.
+pub fn get_window_id(window_cocoa_id: cocoa::base::id) -> Id {
+    Id(window_cocoa_id as *const objc::runtime::Object as usize)
+}
+
+unsafe fn nswindow_set_min_dimensions<V: NSWindow + Copy>(
+    window: V, min_width: f64, min_height: f64)
+{
+    window.setMinSize_(NSSize {
+        width: min_width,
+        height: min_height,
+    });
+    // If necessary, resize the window to match constraint
+    let mut current_rect = NSWindow::frame(window);
+    if current_rect.size.width < min_width {
+        current_rect.size.width = min_width;
+        window.setFrame_display_(current_rect, 0)
+    }
+    if current_rect.size.height < min_height {
+        // The origin point of a rectangle is at its bottom left in Cocoa. To
+        // ensure the window's top-left point remains the same:
+        current_rect.origin.y +=
+            current_rect.size.height - min_height;
+
+        current_rect.size.height = min_height;
+        window.setFrame_display_(current_rect, 0)
+    }
+}
+
+unsafe fn nswindow_set_max_dimensions<V: NSWindow + Copy>(
+    window: V, max_width: f64, max_height: f64)
+{
+    window.setMaxSize_(NSSize {
+        width: max_width,
+        height: max_height,
+    });
+    // If necessary, resize the window to match constraint
+    let mut current_rect = NSWindow::frame(window);
+    if current_rect.size.width > max_width {
+        current_rect.size.width = max_width;
+        window.setFrame_display_(current_rect, 0)
+    }
+    if current_rect.size.height > max_height {
+        // The origin point of a rectangle is at its bottom left in
+        // Cocoa. To ensure the window's top-left point remains the
+        // same:
+        current_rect.origin.y +=
+            current_rect.size.height - max_height;
+
+        current_rect.size.height = max_height;
+        window.setFrame_display_(current_rect, 0)
+    }
+}
+
+pub struct IdRef(id);
+
+impl IdRef {
+    fn new(i: id) -> IdRef {
+        IdRef(i)
+    }
+
+    #[allow(dead_code)]
+    fn retain(i: id) -> IdRef {
+        if i != nil {
+            let _: id = unsafe { msg_send![i, retain] };
+        }
+        IdRef(i)
+    }
+
+    fn non_nil(self) -> Option<IdRef> {
+        if self.0 == nil { None } else { Some(self) }
+    }
+}
+
+impl Drop for IdRef {
+    fn drop(&mut self) {
+        if self.0 != nil {
+            let _: () = unsafe { msg_send![self.0, release] };
+        }
+    }
+}
+
+impl Deref for IdRef {
+    type Target = id;
+    fn deref<'a>(&'a self) -> &'a id {
+        &self.0
+    }
+}
+
+impl Clone for IdRef {
+    fn clone(&self) -> IdRef {
+        if self.0 != nil {
+            let _: id = unsafe { msg_send![self.0, retain] };
+        }
+        IdRef(self.0)
+    }
+}
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -0,0 +1,22 @@
+pub use self::platform::*;
+
+#[cfg(target_os = "windows")]
+#[path="windows/mod.rs"]
+mod platform;
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
+#[path="linux/mod.rs"]
+mod platform;
+#[cfg(target_os = "macos")]
+#[path="macos/mod.rs"]
+mod platform;
+#[cfg(target_os = "android")]
+#[path="android/mod.rs"]
+mod platform;
+#[cfg(target_os = "ios")]
+#[path="ios/mod.rs"]
+mod platform;
+
+#[cfg(all(not(target_os = "ios"), not(target_os = "windows"), not(target_os = "linux"),
+  not(target_os = "macos"), not(target_os = "android"), not(target_os = "dragonfly"),
+  not(target_os = "freebsd"), not(target_os = "openbsd")))]
+use this_platform_is_not_supported;
--- a/src/platform/windows/callback.rs
+++ b/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)
+        }
+    }
+}
--- a/src/platform/windows/event.rs
+++ b/src/platform/windows/event.rs
@@ -0,0 +1,210 @@
+use events::VirtualKeyCode;
+use events::ModifiersState;
+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 user32::GetKeyState(winapi::VK_SHIFT) & (1 << 15) == (1 << 15) {
+            mods.shift = true;
+        }
+        if user32::GetKeyState(winapi::VK_CONTROL) & (1 << 15) == (1 << 15) {
+            mods.ctrl = true;
+        }
+        if user32::GetKeyState(winapi::VK_MENU) & (1 << 15) == (1 << 15) {
+            mods.alt = true;
+        }
+        if (user32::GetKeyState(winapi::VK_LWIN) | user32::GetKeyState(winapi::VK_RWIN)) & (1 << 15) == (1 << 15) {
+            mods.logo = true;
+        }
+    }
+    mods
+}
+
+pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (ScanCode, Option<VirtualKeyCode>) {
+    let scancode = ((lparam >> 16) & 0xff) as u8;
+    let extended = (lparam & 0x01000000) != 0;
+    let vk = match wparam as i32 {
+        winapi::VK_SHIFT => unsafe { user32::MapVirtualKeyA(scancode as u32, MAPVK_VSC_TO_VK_EX) as i32 },
+        winapi::VK_CONTROL => if extended { winapi::VK_RCONTROL } else { winapi::VK_LCONTROL },
+        winapi::VK_MENU => if extended { winapi::VK_RMENU } else { winapi::VK_LMENU },
+        other => other
+    };
+    (scancode, match vk {
+        //winapi::VK_LBUTTON => Some(VirtualKeyCode::Lbutton),
+        //winapi::VK_RBUTTON => Some(VirtualKeyCode::Rbutton),
+        //winapi::VK_CANCEL => Some(VirtualKeyCode::Cancel),
+        //winapi::VK_MBUTTON => Some(VirtualKeyCode::Mbutton),
+        //winapi::VK_XBUTTON1 => Some(VirtualKeyCode::Xbutton1),
+        //winapi::VK_XBUTTON2 => Some(VirtualKeyCode::Xbutton2),
+        winapi::VK_BACK => Some(VirtualKeyCode::Back),
+        winapi::VK_TAB => Some(VirtualKeyCode::Tab),
+        //winapi::VK_CLEAR => Some(VirtualKeyCode::Clear),
+        winapi::VK_RETURN => Some(VirtualKeyCode::Return),
+        winapi::VK_LSHIFT => Some(VirtualKeyCode::LShift),
+        winapi::VK_RSHIFT => Some(VirtualKeyCode::RShift),
+        winapi::VK_LCONTROL => Some(VirtualKeyCode::LControl),
+        winapi::VK_RCONTROL => Some(VirtualKeyCode::RControl),
+        winapi::VK_LMENU => Some(VirtualKeyCode::LMenu),
+        winapi::VK_RMENU => Some(VirtualKeyCode::RMenu),
+        winapi::VK_PAUSE => Some(VirtualKeyCode::Pause),
+        winapi::VK_CAPITAL => Some(VirtualKeyCode::Capital),
+        winapi::VK_KANA => Some(VirtualKeyCode::Kana),
+        //winapi::VK_HANGUEL => Some(VirtualKeyCode::Hanguel),
+        //winapi::VK_HANGUL => Some(VirtualKeyCode::Hangul),
+        //winapi::VK_JUNJA => Some(VirtualKeyCode::Junja),
+        //winapi::VK_FINAL => Some(VirtualKeyCode::Final),
+        //winapi::VK_HANJA => Some(VirtualKeyCode::Hanja),
+        winapi::VK_KANJI => Some(VirtualKeyCode::Kanji),
+        winapi::VK_ESCAPE => Some(VirtualKeyCode::Escape),
+        winapi::VK_CONVERT => Some(VirtualKeyCode::Convert),
+        winapi::VK_NONCONVERT => Some(VirtualKeyCode::NoConvert),
+        //winapi::VK_ACCEPT => Some(VirtualKeyCode::Accept),
+        //winapi::VK_MODECHANGE => Some(VirtualKeyCode::Modechange),
+        winapi::VK_SPACE => Some(VirtualKeyCode::Space),
+        winapi::VK_PRIOR => Some(VirtualKeyCode::PageUp),
+        winapi::VK_NEXT => Some(VirtualKeyCode::PageDown),
+        winapi::VK_END => Some(VirtualKeyCode::End),
+        winapi::VK_HOME => Some(VirtualKeyCode::Home),
+        winapi::VK_LEFT => Some(VirtualKeyCode::Left),
+        winapi::VK_UP => Some(VirtualKeyCode::Up),
+        winapi::VK_RIGHT => Some(VirtualKeyCode::Right),
+        winapi::VK_DOWN => Some(VirtualKeyCode::Down),
+        //winapi::VK_SELECT => Some(VirtualKeyCode::Select),
+        //winapi::VK_PRINT => Some(VirtualKeyCode::Print),
+        //winapi::VK_EXECUTE => Some(VirtualKeyCode::Execute),
+        winapi::VK_SNAPSHOT => Some(VirtualKeyCode::Snapshot),
+        winapi::VK_INSERT => Some(VirtualKeyCode::Insert),
+        winapi::VK_DELETE => Some(VirtualKeyCode::Delete),
+        //winapi::VK_HELP => Some(VirtualKeyCode::Help),
+        0x30 => Some(VirtualKeyCode::Key0),
+        0x31 => Some(VirtualKeyCode::Key1),
+        0x32 => Some(VirtualKeyCode::Key2),
+        0x33 => Some(VirtualKeyCode::Key3),
+        0x34 => Some(VirtualKeyCode::Key4),
+        0x35 => Some(VirtualKeyCode::Key5),
+        0x36 => Some(VirtualKeyCode::Key6),
+        0x37 => Some(VirtualKeyCode::Key7),
+        0x38 => Some(VirtualKeyCode::Key8),
+        0x39 => Some(VirtualKeyCode::Key9),
+        0x41 => Some(VirtualKeyCode::A),
+        0x42 => Some(VirtualKeyCode::B),
+        0x43 => Some(VirtualKeyCode::C),
+        0x44 => Some(VirtualKeyCode::D),
+        0x45 => Some(VirtualKeyCode::E),
+        0x46 => Some(VirtualKeyCode::F),
+        0x47 => Some(VirtualKeyCode::G),
+        0x48 => Some(VirtualKeyCode::H),
+        0x49 => Some(VirtualKeyCode::I),
+        0x4A => Some(VirtualKeyCode::J),
+        0x4B => Some(VirtualKeyCode::K),
+        0x4C => Some(VirtualKeyCode::L),
+        0x4D => Some(VirtualKeyCode::M),
+        0x4E => Some(VirtualKeyCode::N),
+        0x4F => Some(VirtualKeyCode::O),
+        0x50 => Some(VirtualKeyCode::P),
+        0x51 => Some(VirtualKeyCode::Q),
+        0x52 => Some(VirtualKeyCode::R),
+        0x53 => Some(VirtualKeyCode::S),
+        0x54 => Some(VirtualKeyCode::T),
+        0x55 => Some(VirtualKeyCode::U),
+        0x56 => Some(VirtualKeyCode::V),
+        0x57 => Some(VirtualKeyCode::W),
+        0x58 => Some(VirtualKeyCode::X),
+        0x59 => Some(VirtualKeyCode::Y),
+        0x5A => Some(VirtualKeyCode::Z),
+        //winapi::VK_LWIN => Some(VirtualKeyCode::Lwin),
+        //winapi::VK_RWIN => Some(VirtualKeyCode::Rwin),
+        winapi::VK_APPS => Some(VirtualKeyCode::Apps),
+        winapi::VK_SLEEP => Some(VirtualKeyCode::Sleep),
+        winapi::VK_NUMPAD0 => Some(VirtualKeyCode::Numpad0),
+        winapi::VK_NUMPAD1 => Some(VirtualKeyCode::Numpad1),
+        winapi::VK_NUMPAD2 => Some(VirtualKeyCode::Numpad2),
+        winapi::VK_NUMPAD3 => Some(VirtualKeyCode::Numpad3),
+        winapi::VK_NUMPAD4 => Some(VirtualKeyCode::Numpad4),
+        winapi::VK_NUMPAD5 => Some(VirtualKeyCode::Numpad5),
+        winapi::VK_NUMPAD6 => Some(VirtualKeyCode::Numpad6),
+        winapi::VK_NUMPAD7 => Some(VirtualKeyCode::Numpad7),
+        winapi::VK_NUMPAD8 => Some(VirtualKeyCode::Numpad8),
+        winapi::VK_NUMPAD9 => Some(VirtualKeyCode::Numpad9),
+        winapi::VK_MULTIPLY => Some(VirtualKeyCode::Multiply),
+        winapi::VK_ADD => Some(VirtualKeyCode::Add),
+        //winapi::VK_SEPARATOR => Some(VirtualKeyCode::Separator),
+        winapi::VK_SUBTRACT => Some(VirtualKeyCode::Subtract),
+        winapi::VK_DECIMAL => Some(VirtualKeyCode::Decimal),
+        winapi::VK_DIVIDE => Some(VirtualKeyCode::Divide),
+        winapi::VK_F1 => Some(VirtualKeyCode::F1),
+        winapi::VK_F2 => Some(VirtualKeyCode::F2),
+        winapi::VK_F3 => Some(VirtualKeyCode::F3),
+        winapi::VK_F4 => Some(VirtualKeyCode::F4),
+        winapi::VK_F5 => Some(VirtualKeyCode::F5),
+        winapi::VK_F6 => Some(VirtualKeyCode::F6),
+        winapi::VK_F7 => Some(VirtualKeyCode::F7),
+        winapi::VK_F8 => Some(VirtualKeyCode::F8),
+        winapi::VK_F9 => Some(VirtualKeyCode::F9),
+        winapi::VK_F10 => Some(VirtualKeyCode::F10),
+        winapi::VK_F11 => Some(VirtualKeyCode::F11),
+        winapi::VK_F12 => Some(VirtualKeyCode::F12),
+        winapi::VK_F13 => Some(VirtualKeyCode::F13),
+        winapi::VK_F14 => Some(VirtualKeyCode::F14),
+        winapi::VK_F15 => Some(VirtualKeyCode::F15),
+        /*winapi::VK_F16 => Some(VirtualKeyCode::F16),
+        winapi::VK_F17 => Some(VirtualKeyCode::F17),
+        winapi::VK_F18 => Some(VirtualKeyCode::F18),
+        winapi::VK_F19 => Some(VirtualKeyCode::F19),
+        winapi::VK_F20 => Some(VirtualKeyCode::F20),
+        winapi::VK_F21 => Some(VirtualKeyCode::F21),
+        winapi::VK_F22 => Some(VirtualKeyCode::F22),
+        winapi::VK_F23 => Some(VirtualKeyCode::F23),
+        winapi::VK_F24 => Some(VirtualKeyCode::F24),*/
+        winapi::VK_NUMLOCK => Some(VirtualKeyCode::Numlock),
+        winapi::VK_SCROLL => Some(VirtualKeyCode::Scroll),
+        winapi::VK_BROWSER_BACK => Some(VirtualKeyCode::NavigateBackward),
+        winapi::VK_BROWSER_FORWARD => Some(VirtualKeyCode::NavigateForward),
+        winapi::VK_BROWSER_REFRESH => Some(VirtualKeyCode::WebRefresh),
+        winapi::VK_BROWSER_STOP => Some(VirtualKeyCode::WebStop),
+        winapi::VK_BROWSER_SEARCH => Some(VirtualKeyCode::WebSearch),
+        winapi::VK_BROWSER_FAVORITES => Some(VirtualKeyCode::WebFavorites),
+        winapi::VK_BROWSER_HOME => Some(VirtualKeyCode::WebHome),
+        winapi::VK_VOLUME_MUTE => Some(VirtualKeyCode::Mute),
+        winapi::VK_VOLUME_DOWN => Some(VirtualKeyCode::VolumeDown),
+        winapi::VK_VOLUME_UP => Some(VirtualKeyCode::VolumeUp),
+        winapi::VK_MEDIA_NEXT_TRACK => Some(VirtualKeyCode::NextTrack),
+        winapi::VK_MEDIA_PREV_TRACK => Some(VirtualKeyCode::PrevTrack),
+        winapi::VK_MEDIA_STOP => Some(VirtualKeyCode::MediaStop),
+        winapi::VK_MEDIA_PLAY_PAUSE => Some(VirtualKeyCode::PlayPause),
+        winapi::VK_LAUNCH_MAIL => Some(VirtualKeyCode::Mail),
+        winapi::VK_LAUNCH_MEDIA_SELECT => Some(VirtualKeyCode::MediaSelect),
+        /*winapi::VK_LAUNCH_APP1 => Some(VirtualKeyCode::Launch_app1),
+        winapi::VK_LAUNCH_APP2 => Some(VirtualKeyCode::Launch_app2),*/
+	winapi::VK_OEM_PLUS => Some(VirtualKeyCode::Equals),
+        winapi::VK_OEM_COMMA => Some(VirtualKeyCode::Comma),
+        winapi::VK_OEM_MINUS => Some(VirtualKeyCode::Minus),
+        winapi::VK_OEM_PERIOD => Some(VirtualKeyCode::Period),
+        /*winapi::VK_OEM_1 => Some(VirtualKeyCode::Oem_1),
+        winapi::VK_OEM_2 => Some(VirtualKeyCode::Oem_2), 
+        winapi::VK_OEM_3 => Some(VirtualKeyCode::Oem_3), 
+        winapi::VK_OEM_4 => Some(VirtualKeyCode::Oem_4), 
+        winapi::VK_OEM_5 => Some(VirtualKeyCode::Oem_5), 
+        winapi::VK_OEM_6 => Some(VirtualKeyCode::Oem_6), 
+        winapi::VK_OEM_7 => Some(VirtualKeyCode::Oem_7), 
+        winapi::VK_OEM_8 => Some(VirtualKeyCode::Oem_8), */
+        winapi::VK_OEM_102 => Some(VirtualKeyCode::OEM102),
+        /*winapi::VK_PROCESSKEY => Some(VirtualKeyCode::Processkey),
+        winapi::VK_PACKET => Some(VirtualKeyCode::Packet),
+        winapi::VK_ATTN => Some(VirtualKeyCode::Attn),
+        winapi::VK_CRSEL => Some(VirtualKeyCode::Crsel),
+        winapi::VK_EXSEL => Some(VirtualKeyCode::Exsel),
+        winapi::VK_EREOF => Some(VirtualKeyCode::Ereof),
+        winapi::VK_PLAY => Some(VirtualKeyCode::Play),
+        winapi::VK_ZOOM => Some(VirtualKeyCode::Zoom),
+        winapi::VK_NONAME => Some(VirtualKeyCode::Noname),
+        winapi::VK_PA1 => Some(VirtualKeyCode::Pa1),
+        winapi::VK_OEM_CLEAR => Some(VirtualKeyCode::Oem_clear),*/
+        _ => None
+    })
+}
--- a/src/platform/windows/init.rs
+++ b/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(())
+}
--- a/src/platform/windows/mod.rs
+++ b/src/platform/windows/mod.rs
@@ -0,0 +1,385 @@
+#![cfg(target_os = "windows")]
+
+use std::mem;
+use std::ptr;
+use std::ffi::OsStr;
+use std::os::windows::ffi::OsStrExt;
+use std::os::raw::c_int;
+use std::sync::{
+    Arc,
+    Mutex
+};
+use std::sync::mpsc::Receiver;
+use {CreationError, WindowEvent as Event, MouseCursor};
+use CursorState;
+
+use WindowAttributes;
+
+gen_api_transition!();
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub parent: Option<winapi::HWND>,
+}
+
+unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
+unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificHeadlessBuilderAttributes;
+
+pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
+
+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);
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct WindowProxy {
+    hwnd: winapi::HWND,
+}
+
+unsafe impl Send for WindowProxy {}
+unsafe impl Sync for WindowProxy {}
+
+impl WindowProxy {
+    #[inline]
+    pub fn wakeup_event_loop(&self) {
+        unsafe {
+            user32::PostMessageA(self.hwnd, *WAKEUP_MSG_ID, 0, 0);
+        }
+    }
+}
+
+impl Window {
+    /// See the docs in the crate root file.
+    pub fn new(window: &WindowAttributes, pl_attribs: &PlatformSpecificWindowBuilderAttributes)
+               -> Result<Window, CreationError>
+    {
+        init::new_window(window, pl_attribs)
+    }
+
+    /// See the docs in the crate root file.
+    ///
+    /// Calls SetWindowText on the HWND.
+    pub fn set_title(&self, text: &str) {
+        let text = OsStr::new(text).encode_wide().chain(Some(0).into_iter())
+                                   .collect::<Vec<_>>();
+
+        unsafe {
+            user32::SetWindowTextW(self.window.0, text.as_ptr() as winapi::LPCWSTR);
+        }
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        unsafe {
+            user32::ShowWindow(self.window.0, winapi::SW_SHOW);
+        }
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        unsafe {
+            user32::ShowWindow(self.window.0, winapi::SW_HIDE);
+        }
+    }
+
+    /// See the docs in the crate root file.
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        use std::mem;
+
+        let mut placement: winapi::WINDOWPLACEMENT = unsafe { mem::zeroed() };
+        placement.length = mem::size_of::<winapi::WINDOWPLACEMENT>() as winapi::UINT;
+
+        if unsafe { user32::GetWindowPlacement(self.window.0, &mut placement) } == 0 {
+            return None
+        }
+
+        let ref rect = placement.rcNormalPosition;
+        Some((rect.left as i32, rect.top as i32))
+    }
+
+    /// See the docs in the crate root file.
+    pub fn set_position(&self, x: i32, y: i32) {
+        unsafe {
+            user32::SetWindowPos(self.window.0, ptr::null_mut(), x as c_int, y as c_int,
+                                 0, 0, winapi::SWP_NOZORDER | winapi::SWP_NOSIZE);
+            user32::UpdateWindow(self.window.0);
+        }
+    }
+
+    /// See the docs in the crate root file.
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        let mut rect: winapi::RECT = unsafe { mem::uninitialized() };
+
+        if unsafe { user32::GetClientRect(self.window.0, &mut rect) } == 0 {
+            return None
+        }
+
+        Some((
+            (rect.right - rect.left) as u32,
+            (rect.bottom - rect.top) as u32
+        ))
+    }
+
+    /// See the docs in the crate root file.
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+        let mut rect: winapi::RECT = unsafe { mem::uninitialized() };
+
+        if unsafe { user32::GetWindowRect(self.window.0, &mut rect) } == 0 {
+            return None
+        }
+
+        Some((
+            (rect.right - rect.left) as u32,
+            (rect.bottom - rect.top) as u32
+        ))
+    }
+
+    /// See the docs in the crate root file.
+    pub fn set_inner_size(&self, x: u32, y: u32) {
+        unsafe {
+            // Calculate the outer size based upon the specified inner size
+            let mut rect = winapi::RECT { top: 0, left: 0, bottom: y as winapi::LONG, right: x as winapi::LONG };
+            let dw_style = user32::GetWindowLongA(self.window.0, winapi::GWL_STYLE) as winapi::DWORD;
+            let b_menu = !user32::GetMenu(self.window.0).is_null() as winapi::BOOL;
+            let dw_style_ex = user32::GetWindowLongA(self.window.0, winapi::GWL_EXSTYLE) as winapi::DWORD;
+            user32::AdjustWindowRectEx(&mut rect, dw_style, b_menu, dw_style_ex);
+            let outer_x = (rect.right - rect.left).abs() as c_int;
+            let outer_y = (rect.top - rect.bottom).abs() as c_int;
+
+            user32::SetWindowPos(self.window.0, ptr::null_mut(), 0, 0, outer_x, outer_y,
+                winapi::SWP_NOZORDER | winapi::SWP_NOREPOSITION | winapi::SWP_NOMOVE);
+            user32::UpdateWindow(self.window.0);
+        }
+    }
+
+    #[inline]
+    pub fn create_window_proxy(&self) -> WindowProxy {
+        WindowProxy { hwnd: self.window.0 }
+    }
+
+    /// See the docs in the crate root file.
+    #[inline]
+    pub fn poll_events(&self) -> PollEventsIterator {
+        PollEventsIterator {
+            window: self,
+        }
+    }
+
+    /// See the docs in the crate root file.
+    #[inline]
+    pub fn wait_events(&self) -> WaitEventsIterator {
+        WaitEventsIterator {
+            window: self,
+        }
+    }
+
+    #[inline]
+    pub fn platform_display(&self) -> *mut ::libc::c_void {
+        // What should this return on win32?
+        // It could be GetDC(NULL), but that requires a ReleaseDC()
+        // to avoid leaking the DC.
+        ptr::null_mut()
+    }
+
+    #[inline]
+    pub fn platform_window(&self) -> *mut ::libc::c_void {
+        self.window.0 as *mut ::libc::c_void
+    }
+
+    #[inline]
+    pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        let cursor_id = match _cursor {
+            MouseCursor::Arrow | MouseCursor::Default => winapi::IDC_ARROW,
+            MouseCursor::Hand => winapi::IDC_HAND,
+            MouseCursor::Crosshair => winapi::IDC_CROSS,
+            MouseCursor::Text | MouseCursor::VerticalText => winapi::IDC_IBEAM,
+            MouseCursor::NotAllowed | MouseCursor::NoDrop => winapi::IDC_NO,
+            MouseCursor::EResize => winapi::IDC_SIZEWE,
+            MouseCursor::NResize => winapi::IDC_SIZENS,
+            MouseCursor::WResize => winapi::IDC_SIZEWE,
+            MouseCursor::SResize => winapi::IDC_SIZENS,
+            MouseCursor::EwResize | MouseCursor::ColResize => winapi::IDC_SIZEWE,
+            MouseCursor::NsResize | MouseCursor::RowResize => winapi::IDC_SIZENS,
+            MouseCursor::Wait | MouseCursor::Progress => winapi::IDC_WAIT,
+            MouseCursor::Help => winapi::IDC_HELP,
+            _ => winapi::IDC_ARROW, // use arrow for the missing cases.
+        };
+
+        let mut cur = self.window_state.lock().unwrap();
+        cur.cursor = cursor_id;
+    }
+
+
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+        let mut current_state = self.window_state.lock().unwrap();
+
+        let foreground_thread_id = unsafe { user32::GetWindowThreadProcessId(self.window.0, ptr::null_mut()) };
+        let current_thread_id = unsafe { kernel32::GetCurrentThreadId() };
+
+        unsafe { user32::AttachThreadInput(foreground_thread_id, current_thread_id, 1) };
+
+        let res = match (state, current_state.cursor_state) {
+            (CursorState::Normal, CursorState::Normal) => Ok(()),
+            (CursorState::Hide, CursorState::Hide) => Ok(()),
+            (CursorState::Grab, CursorState::Grab) => Ok(()),
+
+            (CursorState::Hide, CursorState::Normal) => {
+                current_state.cursor_state = CursorState::Hide;
+                Ok(())
+            },
+
+            (CursorState::Normal, CursorState::Hide) => {
+                current_state.cursor_state = CursorState::Normal;
+                Ok(())
+            },
+
+            (CursorState::Grab, CursorState::Normal) | (CursorState::Grab, CursorState::Hide) => {
+                unsafe {
+                    let mut rect = mem::uninitialized();
+                    if user32::GetClientRect(self.window.0, &mut rect) == 0 {
+                        return Err(format!("GetWindowRect failed"));
+                    }
+                    user32::ClientToScreen(self.window.0, mem::transmute(&mut rect.left));
+                    user32::ClientToScreen(self.window.0, mem::transmute(&mut rect.right));
+                    if user32::ClipCursor(&rect) == 0 {
+                        return Err(format!("ClipCursor failed"));
+                    }
+                    current_state.cursor_state = CursorState::Grab;
+                    Ok(())
+                }
+            },
+
+            (CursorState::Normal, CursorState::Grab) => {
+                unsafe {
+                    if user32::ClipCursor(ptr::null()) == 0 {
+                        return Err(format!("ClipCursor failed"));
+                    }
+                    current_state.cursor_state = CursorState::Normal;
+                    Ok(())
+                }
+            },
+
+            _ => unimplemented!(),
+        };
+
+        unsafe { user32::AttachThreadInput(foreground_thread_id, current_thread_id, 0) };
+
+        res
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        1.0
+    }
+
+    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+        let mut point = winapi::POINT {
+            x: x,
+            y: y,
+        };
+
+        unsafe {
+            if user32::ClientToScreen(self.window.0, &mut point) == 0 {
+                return Err(());
+            }
+
+            if user32::SetCursorPos(point.x, point.y) == 0 {
+                return Err(());
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl Drop for Window {
+    #[inline]
+    fn drop(&mut self) {
+        unsafe {
+            user32::PostMessageW(self.window.0, winapi::WM_DESTROY, 0, 0);
+        }
+    }
+}
+
+pub struct PollEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for PollEventsIterator<'a> {
+    type Item = Event;
+
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        self.window.events_receiver.try_recv().ok()
+    }
+}
+
+pub struct WaitEventsIterator<'a> {
+    window: &'a Window,
+}
+
+impl<'a> Iterator for WaitEventsIterator<'a> {
+    type Item = Event;
+
+    #[inline]
+    fn next(&mut self) -> Option<Event> {
+        self.window.events_receiver.recv().ok()
+    }
+}
--- a/src/platform/windows/monitor.rs
+++ b/src/platform/windows/monitor.rs
@@ -0,0 +1,186 @@
+use winapi;
+use user32;
+
+use std::collections::VecDeque;
+use std::mem;
+
+use native_monitor::NativeMonitorId;
+
+/// Win32 implementation of the main `MonitorId` object.
+#[derive(Clone)]
+pub struct MonitorId {
+    /// The system name of the adapter.
+    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 positionned at these coordinates will overlap the monitor.
+    position: (u32, u32),
+
+    /// The current resolution in pixels on the monitor.
+    dimensions: (u32, u32),
+}
+
+struct DeviceEnumerator {
+    parent_device: *const winapi::WCHAR,
+    current_index: u32,
+}
+
+impl DeviceEnumerator {
+    fn adapters() -> DeviceEnumerator {
+        use std::ptr;
+        DeviceEnumerator {
+            parent_device: ptr::null(),
+            current_index: 0
+        }
+    }
+
+    fn monitors(adapter_name: *const winapi::WCHAR) -> DeviceEnumerator {
+        DeviceEnumerator {
+            parent_device: adapter_name,
+            current_index: 0
+        }
+    }
+}
+
+impl Iterator for DeviceEnumerator {
+    type Item = winapi::DISPLAY_DEVICEW;
+    fn next(&mut self) -> Option<winapi::DISPLAY_DEVICEW> {
+        use std::mem;
+        loop {
+            let mut output: winapi::DISPLAY_DEVICEW = unsafe { mem::zeroed() };
+            output.cb = mem::size_of::<winapi::DISPLAY_DEVICEW>() as winapi::DWORD;
+
+            if unsafe { user32::EnumDisplayDevicesW(self.parent_device,
+                self.current_index as winapi::DWORD, &mut output, 0) } == 0
+            {
+                // the device doesn't exist, which means we have finished enumerating
+                break;
+            }
+            self.current_index += 1;
+
+            if  (output.StateFlags & winapi::DISPLAY_DEVICE_ACTIVE) == 0 ||
+                (output.StateFlags & winapi::DISPLAY_DEVICE_MIRRORING_DRIVER) != 0
+            {
+                // the device is not active
+                // the Win32 api usually returns a lot of inactive devices
+                continue;
+            }
+
+            return Some(output);
+        }
+        None
+    }
+}
+
+fn wchar_as_string(wchar: &[winapi::WCHAR]) -> String {
+    String::from_utf16_lossy(wchar)
+        .trim_right_matches(0 as char)
+        .to_string()
+}
+
+/// Win32 implementation of the main `get_available_monitors` function.
+pub fn get_available_monitors() -> VecDeque<MonitorId> {
+    // return value
+    let mut result = VecDeque::new();
+
+    for adapter in DeviceEnumerator::adapters() {
+        // getting the position
+        let (position, dimensions) = unsafe {
+            let mut dev: winapi::DEVMODEW = mem::zeroed();
+            dev.dmSize = mem::size_of::<winapi::DEVMODEW>() as winapi::WORD;
+
+            if user32::EnumDisplaySettingsExW(adapter.DeviceName.as_ptr(), 
+                winapi::ENUM_CURRENT_SETTINGS,
+                &mut dev, 0) == 0
+            {
+                continue;
+            }
+
+            let point: &winapi::POINTL = mem::transmute(&dev.union1);
+            let position = (point.x as u32, point.y as u32);
+
+            let dimensions = (dev.dmPelsWidth as u32, dev.dmPelsHeight as u32);
+
+            (position, dimensions)
+        };
+
+        for (num, monitor) in DeviceEnumerator::monitors(adapter.DeviceName.as_ptr()).enumerate() {
+            // adding to the resulting list
+            result.push_back(MonitorId {
+                adapter_name: adapter.DeviceName,
+                monitor_name: wchar_as_string(&monitor.DeviceName),
+                readable_name: wchar_as_string(&monitor.DeviceString),
+                flags: monitor.StateFlags,
+                primary: (adapter.StateFlags & winapi::DISPLAY_DEVICE_PRIMARY_DEVICE) != 0 &&
+                         num == 0,
+                position: position,
+                dimensions: dimensions,
+            });
+        }
+    }
+    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.readable_name.clone())
+    }
+
+    /// See the docs of the crate root file.
+    #[inline]
+    pub fn get_native_identifier(&self) -> NativeMonitorId {
+        NativeMonitorId::Name(self.monitor_name.clone())
+    }
+
+    /// See the docs if the crate root file.
+    #[inline]
+    pub fn get_dimensions(&self) -> (u32, u32) {
+        // TODO: retreive the dimensions every time this is called
+        self.dimensions
+    }
+
+    /// This is a Win32-only function for `MonitorId` that returns the system name of the adapter
+    /// device.
+    #[inline]
+    pub fn get_adapter_name(&self) -> &[winapi::WCHAR] {
+        &self.adapter_name
+    }
+
+    /// This is a Win32-only function for `MonitorId` that returns the position of the
+    ///  monitor on the desktop.
+    /// A window that is positionned at these coordinates will overlap the monitor.
+    #[inline]
+    pub fn get_position(&self) -> (u32, u32) {
+        self.position
+    }
+}
--- a/src/window.rs
+++ b/src/window.rs
@@ -0,0 +1,359 @@
+use std::collections::vec_deque::IntoIter as VecDequeIter;
+
+use CreationError;
+use CursorState;
+use EventsLoop;
+use MouseCursor;
+use Window;
+use WindowBuilder;
+use WindowId;
+use native_monitor::NativeMonitorId;
+
+use libc;
+use platform;
+
+impl WindowBuilder {
+    /// Initializes a new `WindowBuilder` with default values.
+    #[inline]
+    pub fn new() -> WindowBuilder {
+        WindowBuilder {
+            window: Default::default(),
+            platform_specific: Default::default(),
+        }
+    }
+
+    /// Requests the window to be of specific dimensions.
+    ///
+    /// Width and height are in pixels.
+    #[inline]
+    pub fn with_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
+        self.window.dimensions = Some((width, height));
+        self
+    }
+    
+    /// Sets a minimum dimension size for the window
+    ///
+    /// Width and height are in pixels.
+    #[inline]
+    pub fn with_min_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
+        self.window.min_dimensions = Some((width, height));
+        self
+    }
+
+    /// Sets a maximum dimension size for the window
+    ///
+    /// Width and height are in pixels.
+    #[inline]
+    pub fn with_max_dimensions(mut self, width: u32, height: u32) -> WindowBuilder {
+        self.window.max_dimensions = Some((width, height));
+        self
+    }
+
+    /// Requests a specific title for the window.
+    #[inline]
+    pub fn with_title<T: Into<String>>(mut self, title: T) -> WindowBuilder {
+        self.window.title = title.into();
+        self
+    }
+
+    /// 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: MonitorId) -> WindowBuilder {
+        let MonitorId(monitor) = monitor;
+        self.window.monitor = Some(monitor);
+        self
+    }
+
+    /// Sets whether the window will be initially hidden or visible.
+    #[inline]
+    pub fn with_visibility(mut self, visible: bool) -> WindowBuilder {
+        self.window.visible = visible;
+        self
+    }
+
+    /// Sets whether the background of the window should be transparent.
+    #[inline]
+    pub fn with_transparency(mut self, transparent: bool) -> WindowBuilder {
+        self.window.transparent = transparent;
+        self
+    }
+
+    /// Sets whether the window should have a border, a title bar, etc.
+    #[inline]
+    pub fn with_decorations(mut self, decorations: bool) -> WindowBuilder {
+        self.window.decorations = decorations;
+        self
+    }
+
+    /// Enables multitouch
+    #[inline]
+    pub fn with_multitouch(mut self) -> WindowBuilder {
+        self.window.multitouch = true;
+        self
+    }
+
+    /// Builds the window.
+    ///
+    /// 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> {
+        // 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
+        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 OpenGL context, and a Window for platforms where this is appropriate.
+    ///
+    /// This function is equivalent to `WindowBuilder::new().build(events_loop)`.
+    ///
+    /// Error should be very rare and only occur in case of permission denied, incompatible system,
+    ///  out of memory, etc.
+    #[inline]
+    pub fn new(events_loop: &EventsLoop) -> Result<Window, CreationError> {
+        let builder = WindowBuilder::new();
+        builder.build(events_loop)
+    }
+
+    /// Modifies the title of the window.
+    ///
+    /// This is a no-op if the window has already been closed.
+    #[inline]
+    pub fn set_title(&self, title: &str) {
+        self.window.set_title(title)
+    }
+
+    /// Shows the window if it was hidden.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - Has no effect on Android
+    ///
+    #[inline]
+    pub fn show(&self) {
+        self.window.show()
+    }
+
+    /// Hides the window if it was visible.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - Has no effect on Android
+    ///
+    #[inline]
+    pub fn hide(&self) {
+        self.window.hide()
+    }
+
+    /// Returns the position of the top-left hand corner of the window relative to the
+    ///  top-left hand corner of the desktop.
+    ///
+    /// Note that the top-left hand corner of the desktop is not necessarily the same as
+    ///  the screen. If the user uses a desktop with multiple monitors, the top-left hand corner
+    ///  of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
+    ///
+    /// The coordinates can be negative if the top-left hand corner of the window is outside
+    ///  of the visible screen region.
+    ///
+    /// Returns `None` if the window no longer exists.
+    #[inline]
+    pub fn get_position(&self) -> Option<(i32, i32)> {
+        self.window.get_position()
+    }
+
+    /// Modifies the position of the window.
+    ///
+    /// See `get_position` for more informations about the coordinates.
+    ///
+    /// This is a no-op if the window has already been closed.
+    #[inline]
+    pub fn set_position(&self, x: i32, y: i32) {
+        self.window.set_position(x, y)
+    }
+
+    /// 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.
+    ///
+    /// DEPRECATED
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<(u32, u32)> {
+        self.window.get_inner_size()
+    }
+    
+    /// Returns the size in points of the client area of the window.
+    ///
+    /// The client area is the content of the window, excluding the title bar and borders.
+    /// To get the dimensions of the frame buffer when calling `glViewport`, multiply with hidpi factor.
+    ///
+    /// 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.
+    ///
+    /// The client area is the content of the window, excluding the title bar and borders.
+    /// These are the dimensions of the frame buffer, and the dimensions that you should use
+    ///  when you call `glViewport`.
+    ///
+    /// Returns `None` if the window no longer exists.
+    #[inline]
+    pub fn get_inner_size_pixels(&self) -> Option<(u32, u32)> {
+        self.window.get_inner_size().map(|(x, y)| {
+            let hidpi = self.hidpi_factor();
+            ((x as f32 * hidpi) as u32, (y as f32 * hidpi) as u32)
+        })
+    }
+
+    /// Returns the size in pixels of the window.
+    ///
+    /// These dimensions include title bar and borders. If you don't want these, you should use
+    ///  use `get_inner_size` instead.
+    ///
+    /// Returns `None` if the window no longer exists.
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<(u32, u32)> {
+        self.window.get_outer_size()
+    }
+
+    /// Modifies the inner size of the window.
+    ///
+    /// See `get_inner_size` for more informations about the values.
+    ///
+    /// This is a no-op if the window has already been closed.
+    #[inline]
+    pub fn set_inner_size(&self, x: u32, y: u32) {
+        self.window.set_inner_size(x, y)
+    }
+
+    /// DEPRECATED. Gets the native platform specific display for this window.
+    /// This is typically only required when integrating with
+    /// other libraries that need this information.
+    #[deprecated]
+    #[inline]
+    pub unsafe fn platform_display(&self) -> *mut libc::c_void {
+        self.window.platform_display()
+    }
+
+    /// DEPRECATED. Gets the native platform specific window handle. This is
+    /// typically only required when integrating with other libraries
+    /// that need this information.
+    #[deprecated]
+    #[inline]
+    pub unsafe fn platform_window(&self) -> *mut libc::c_void {
+        self.window.platform_window()
+    }
+
+    /// Modifies the mouse cursor of the window.
+    /// Has no effect on Android.
+    pub fn set_cursor(&self, cursor: MouseCursor) {
+        self.window.set_cursor(cursor);
+    }
+
+    /// Returns the ratio between the backing framebuffer resolution and the
+    /// window size in screen pixels. This is typically one for a normal display
+    /// and two for a retina display.
+    #[inline]
+    pub fn hidpi_factor(&self) -> f32 {
+        self.window.hidpi_factor()
+    }
+
+    /// Changes the position of the cursor in window coordinates.
+    #[inline]
+    pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
+        self.window.set_cursor_position(x, y)
+    }
+
+    /// Sets how glutin handles the cursor. See the documentation of `CursorState` for details.
+    ///
+    /// Has no effect on Android.
+    #[inline]
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+        self.window.set_cursor_state(state)
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        WindowId(self.window.id())
+    }
+}
+
+/// An iterator for the list of available monitors.
+// Implementation note: we retreive the list once, then serve each element by one by one.
+// This may change in the future.
+pub struct AvailableMonitorsIter {
+    data: VecDequeIter<platform::MonitorId>,
+}
+
+impl Iterator for AvailableMonitorsIter {
+    type Item = MonitorId;
+
+    #[inline]
+    fn next(&mut self) -> Option<MonitorId> {
+        self.data.next().map(|id| MonitorId(id))
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.data.size_hint()
+    }
+}
+
+/// 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.
+    #[inline]
+    pub fn get_name(&self) -> Option<String> {
+        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) {
+        let &MonitorId(ref id) = self;
+        id.get_dimensions()
+    }
+}
--- a/taplo.toml
+++ b/taplo.toml
@@ -1,5 +0,0 @@
-[formatting]
-allowed_blank_lines = 1
-column_width = 100
-indent_string = '    '
-reorder_keys = true
--- a/tests/events_loop.rs
+++ b/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>();
+}
--- a/tests/window_proxy_send.rs
+++ b/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>();
+}
--- a/typos.toml
+++ b/typos.toml
@@ -1,10 +0,0 @@
-# documentation: https://github.com/crate-ci/typos/blob/master/docs/reference.md
-
-[default.extend-identifiers]
-TME_LEAVE = "TME_LEAVE"             # From windows_sys::Win32::UI::Input::KeyboardAndMouse::TME_LEAVE
-XF86_Calculater = "XF86_Calculater" # From xkbcommon_dl::keysyms::XF86_Calculater
-ptd = "ptd"                         # From windows_sys::Win32::System::Com::FORMATETC { ptd, ..}
-requestor = "requestor"             # From x11_dl::xlib::XSelectionEvent { requestor ..}
-
-[files]
-extend-exclude = ["*.drawio"]
--- a/winit-android/Cargo.toml
+++ b/winit-android/Cargo.toml
@@ -1,35 +0,0 @@
-[package]
-description = "Winit's Android backend"
-documentation = "https://docs.rs/winit-android"
-edition.workspace = true
-license.workspace = true
-name = "winit-android"
-repository.workspace = true
-rust-version.workspace = true
-version.workspace = true
-
-[features]
-game-activity = ["android-activity/game-activity"]
-native-activity = ["android-activity/native-activity"]
-serde = ["dep:serde", "bitflags/serde", "smol_str/serde", "dpi/serde", "winit-core/serde"]
-
-[dependencies]
-bitflags.workspace = true
-dpi.workspace = true
-rwh_06.workspace = true
-serde = { workspace = true, optional = true }
-smol_str.workspace = true
-tracing.workspace = true
-winit-core.workspace = true
-
-# Platform-specific
-[target.'cfg(target_os = "android")'.dependencies]
-android-activity.workspace = true
-ndk.workspace = true
-
-[dev-dependencies]
-winit.workspace = true
-
-[package.metadata.docs.rs]
-features = ["serde", "native-activity"]
-targets = ["aarch64-linux-android"]
--- a/Show More
+++ b/Show More