Publish 0.6.4

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

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

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

Fixes #167.

.cargo/config.toml

@@ -1,2 +0,0 @@
-[alias]
-run-wasm = ["run", "--release", "--package", "run-wasm", "--"]

.github/CODEOWNERS

@@ -1,34 +0,0 @@
-# Android
-/src/platform/android.rs            @msiglreith @MarijnS95
-/src/platform_impl/android          @msiglreith @MarijnS95
-
-# iOS
-/src/platform/ios.rs                @madsmtm
-/src/platform_impl/ios              @madsmtm
-
-# Unix
-/src/platform_impl/linux/mod.rs     @kchibisov
-
-# Wayland
-/src/platform/wayland.rs            @kchibisov
-/src/platform_impl/linux/wayland    @kchibisov
-
-# X11
-/src/platform/x11.rs                @kchibisov @notgull
-/src/platform_impl/linux/x11        @kchibisov @notgull
-
-# macOS
-/src/platform/macos.rs              @madsmtm
-/src/platform_impl/macos            @madsmtm
-
-# Web
-/src/platform/web.rs                @daxpedda
-/src/platform_impl/web              @daxpedda
-
-# Windows
-/src/platform/windows.rs            @msiglreith
-/src/platform_impl/windows          @msiglreith
-
-# Orbital (Redox OS)
-/src/platform/orbital.rs            @jackpot51
-/src/platform_impl/orbital          @jackpot51

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +0,0 @@
-- [ ] Tested on all platforms changed
-- [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users
-- [ ] Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
-- [ ] Created or updated an example program if it would help users understand this functionality
-- [ ] Updated [feature matrix](https://github.com/rust-windowing/winit/blob/master/FEATURES.md), if new features were added or implemented

.github/workflows/ci.yml

@@ -1,203 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-    branches: [master]
-
-jobs:
-  fmt:
-    name: Check formatting
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: rustfmt
-    - name: Check Formatting
-      run: cargo fmt -- --check
-
-  tests:
-    name: Test ${{ matrix.toolchain }} ${{ matrix.platform.name }}
-    runs-on: ${{ matrix.platform.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain: [stable, nightly, '1.70.0']
-        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',              target: x86_64-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:
-          # Android is tested on stable-3
-          - toolchain: '1.70.0'
-            platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
-        include:
-          - toolchain: '1.70.0'
-            platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
-          - toolchain: 'nightly'
-            platform: {
-              name:       'web Atomic',
-              target:     wasm32-unknown-unknown,
-              os:         ubuntu-latest,
-              options:    '-Zbuild-std=panic_abort,std',
-              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 }}'
-
-      OPTIONS: --target=${{ matrix.platform.target }} ${{ matrix.platform.options }}
-      CMD: ${{ matrix.platform.cmd }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - 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@v3
-      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@v3
-      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: 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: Build tests
-      if: >
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.70.0'
-      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') &&
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.70.0'
-      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 -- -Dwarnings
-
-    - name: Build tests with serde enabled
-      if: >
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test --no-run $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') &&
-        !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test $OPTIONS --features serde
-
-    - name: Check docs.rs documentation
-      if: matrix.toolchain == 'nightly'
-      run: cargo doc --no-deps $OPTIONS --features=rwh_04,rwh_05,rwh_06,serde,mint,android-native-activity
-      env:
-        RUSTDOCFLAGS: '--deny=warnings ${{ matrix.platform.rustflags }} --cfg=docsrs'
-
-    # See restore step above
-    - name: Save cache of cargo folder
-      uses: actions/cache/save@v3
-      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: x86_64-apple-darwin }
-          - { name: 'Redox OS', target: x86_64-unknown-redox }
-          - { name: 'web', target: wasm32-unknown-unknown }
-          - { name: 'Windows', target: x86_64-pc-windows-gnu }
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: EmbarkStudios/cargo-deny-action@v1
-      with:
-        command: check
-        log-level: error
-        arguments: --all-features --target ${{ matrix.platform.target }}

.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@v3
-
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly
-
-      - name: Run Rustdoc
-        env:
-          RUSTDOCFLAGS: --crate-version master --cfg=docsrs
-        run: |
-          cargo doc --no-deps -Z rustdoc-map -Z rustdoc-scrape-examples --features=rwh_04,rwh_05,rwh_06,serde,mint,android-native-activity
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v4
-
-      - 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@v3
-        with:
-          path: target/doc
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.gitignore

@@ -1,10 +1,4 @@
 Cargo.lock
 target/
-rls/
-.vscode/
 *~
-*.wasm
-*.ts
-*.js
 #*#
-.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deps/apk-builder"]
+	path = deps/apk-builder
+	url = https://github.com/tomaka/android-rs-glue

.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}

CONTRIBUTING.md

@@ -1,183 +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 upstream 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 new API proposals should go into the issue first. When in
-doubt contact us on [matrix][matrix] or via opening an issue.
-
-### 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.
-
-#### Creating commits
-
-When creating a commit, follow these general rules:
-  - Try to limit the first line (title) of the commit message to 50 characters,
-    but not more than 60 characters.
-  - The commit starts with an uppercase latter and everything else must be
-    lowercase, unless you quote a symbol, like `Window`.
-  - Use the body of the commit message to actually explain what your patch does
-    and why it is useful. Even if your patch is a one line fix, the description
-    is not limited in length and may span over multiple paragraphs. Use proper
-    English syntax, grammar and punctuation. The body is generally wrapped
-    at 72 characters.
-  - If you're a downstream user and your fixing your issue, consider to link it
-    like `Links: URL` in the end of the commit message.
-  - Try to address only one issue/topic per commit.
-  - Prefer describing your changes in imperative mood, e.g. *"make xyzzy do
-    frotz"* instead of *"[This patch] makes xyzzy do frotz"* or *"[I] changed
-    xyzzy to do frotz"*, as if you are giving orders to the codebase to change
-    its behaviour.
-  - When fixing an issue from https://github.com/rust-windowing/winit/issues,
-    ensure to have it include in the end of the commit. See other commits
-    on how it's done.
-  - When in doubt, follow the format and layout of the recent existing commits.
-
-The maintainers will fixup your commit message when applying the patch, but it's
-still recommended to follow the rules above to make the life of maintainers
-easier.
-
-If you want to communicate something to reviewers, but it doesn't belong to
-the commit message, write that under `--` on PR body. Your PR could look like:
-
-  ```
-  TITLE (matches commit title)
-
-  Body (matches commit body)
-
-  --
-
-  Your arbitrary message goes here.
-
-  Various checkboxes PR template required you to fill.
-  ```
-
-#### Handling review
-
-During the review process certain events could require an action from your side,
-to communication more efficient the common patterns and reactions are described
-below.
-
-_Event:_ The CI fails to build, but it looks like not your fault. Not
-communicating so, could result into maintainers not looking into your patch,
-unless they CI that CI pass.\
-_Desired behavior:_ Write a message saying roughly the following "The CI failure
-is unrelated", so maintainers will fix it for you.
-
-_Event:_ Collaborator requested review on your PR.\
-_Desired behavior:_ Once you address the request, you _should_ re-request review
-with the github's UI. If you don't agree with what maintainer suggested, you
-should object that 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:_ Discusses with maintainer 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.
-
-[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, experience level,
-and reasons to be winit maintainer in the first place. To ensure that winit's
-code quality is not decreasing 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 maintainer must ensure that the external contributions meet the winit's
-quality standards. If it's not, it **is maintainer's responsibility** to bring
-it on par, which includes:
-
-  - Decline the patch if it tries to achieve short term goals instead of solving
-    the problem in general. In such case maintainer must communicate that **as
-    early as possible**, so contributors don't spend their time on something
-    that won't be accepted in the end.
-  - 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, maintainer must always give a 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 contributor might not agree with what you did.
-  - Be more explicit on how things should be done if you doesn't like the
-    approach.
-  - Suggest to finish PR for them if they're absent for a while and you need the
-    proposed changes to move forward with something. In such case maintainer
-    must preserve attribution with `Co-authored-by`, `Suggested-by`, or keep
-    the original commiter.
-  - Rebase their work for them when massive changes to 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.
-
-When contributor is _regular_ in winit, the maintainer should slowly start
-requiring contributor to match *maintainer* quality standards when writing
-patches and commit messages.
-
-### Contributing
-
-When submitting a patch maintainer should follow the general contributing
-guidelines, however all soft rules (e.g `Try to`), become strict.
-
-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.
-
-### 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. In the branch, the version is bumped to `v0.2.0`
-  4. The new commit in the branch is tagged `v0.2.0`
-  5. The version is pushed to crates.io
-  6. A GitHub release is created for the `v0.2.0` tag
-  7. 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 3-7 of the regular release example
-
-[CODEOWNERS]: .github/CODEOWNERS

Cargo.toml

@@ -1,278 +1,43 @@
 [package]
 name = "winit"
-version = "0.29.12"
-authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
+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"
 readme = "README.md"
+repository = "https://github.com/tomaka/winit"
 documentation = "https://docs.rs/winit"
 categories = ["gui"]
-rust-version.workspace = true
-repository.workspace = true
-license.workspace = true
-edition.workspace = true
-
-[package.metadata.docs.rs]
-features = [
-    "rwh_04",
-    "rwh_05",
-    "rwh_06",
-    "serde",
-    "mint",
-    # Enabled to get docs to compile
-    "android-native-activity",
-]
-# These are all tested in CI
-targets = [
-    # Windows
-    "i686-pc-windows-msvc",
-    "x86_64-pc-windows-msvc",
-    # macOS
-    "x86_64-apple-darwin",
-    # Unix (X11 & Wayland)
-    "i686-unknown-linux-gnu",
-    "x86_64-unknown-linux-gnu",
-    # iOS
-    "x86_64-apple-ios",
-    # Android
-    "aarch64-linux-android",
-    # Web
-    "wasm32-unknown-unknown",
-]
-rustdoc-args = ["--cfg", "docsrs"]
-
-# Features are documented in either `lib.rs` or under `winit::platform`.
-[features]
-default = ["rwh_06", "x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
-x11 = ["x11-dl", "bytemuck", "percent-encoding", "xkbcommon-dl/x11", "x11rb"]
-wayland = ["wayland-client", "wayland-backend", "wayland-protocols", "wayland-protocols-plasma", "sctk", "ahash", "memmap2"]
-wayland-dlopen = ["wayland-backend/dlopen"]
-wayland-csd-adwaita = ["sctk-adwaita", "sctk-adwaita/ab_glyph"]
-wayland-csd-adwaita-crossfont = ["sctk-adwaita", "sctk-adwaita/crossfont"]
-wayland-csd-adwaita-notitle = ["sctk-adwaita"]
-android-native-activity = ["android-activity/native-activity"]
-android-game-activity = ["android-activity/game-activity"]
-serde = ["dep:serde", "cursor-icon/serde", "smol_str/serde", "dpi/serde"]
-mint = ["dpi/mint"]
-rwh_04 = ["dep:rwh_04", "ndk/rwh_04"]
-rwh_05 = ["dep:rwh_05", "ndk/rwh_05"]
-rwh_06 = ["dep:rwh_06", "ndk/rwh_06"]
-
-[build-dependencies]
-cfg_aliases = "0.2.0"
 
 [dependencies]
-bitflags = "2"
-cursor-icon = "1.1.0"
-rwh_04 = { package = "raw-window-handle", version = "0.4", optional = true }
-rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = ["std"], optional = true }
-rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"], optional = true }
-serde = { workspace = true, optional = true }
-smol_str = "0.2.0"
-dpi = { path = "dpi" }
-tracing = { version = "0.1.40", default_features = false }
+lazy_static = "0.2.2"
+libc = "0.2"
+shared_library = "0.1.5"
 
-[dev-dependencies]
-image = { version = "0.24.0", default-features = false, features = ["png"] }
-tracing = { version = "0.1.40", default_features = false, features = ["log"] }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-winit = { path = ".", features = ["rwh_05"] }
+[target.'cfg(target_os = "android")'.dependencies.android_glue]
+version = "0.2"
 
-[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dev-dependencies]
-softbuffer = { version = "0.3.0", default-features = false, features = ["x11", "x11-dlopen", "wayland", "wayland-dlopen"] }
-
-[target.'cfg(target_os = "android")'.dependencies]
-android-activity = "0.5.0"
-ndk = { version = "0.8.0", default-features = false }
-ndk-sys = "0.5.0"
-
-[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
-core-foundation = "0.9.3"
-objc2 = "0.5.0"
+[target.'cfg(target_os = "ios")'.dependencies]
+objc = "0.2"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.23.1"
-
-[target.'cfg(target_os = "macos")'.dependencies.icrate]
-version = "0.1.0"
-features = [
-    "dispatch",
-    "Foundation",
-    "Foundation_NSArray",
-    "Foundation_NSAttributedString",
-    "Foundation_NSMutableAttributedString",
-    "Foundation_NSData",
-    "Foundation_NSDictionary",
-    "Foundation_NSString",
-    "Foundation_NSProcessInfo",
-    "Foundation_NSThread",
-    "Foundation_NSNumber",
-    "AppKit",
-    "AppKit_NSAppearance",
-    "AppKit_NSApplication",
-    "AppKit_NSBitmapImageRep",
-    "AppKit_NSButton",
-    "AppKit_NSColor",
-    "AppKit_NSControl",
-    "AppKit_NSCursor",
-    "AppKit_NSEvent",
-    "AppKit_NSGraphicsContext",
-    "AppKit_NSImage",
-    "AppKit_NSImageRep",
-    "AppKit_NSMenu",
-    "AppKit_NSMenuItem",
-    "AppKit_NSPasteboard",
-    "AppKit_NSResponder",
-    "AppKit_NSScreen",
-    "AppKit_NSTextInputContext",
-    "AppKit_NSView",
-    "AppKit_NSWindow",
-    "AppKit_NSWindowTabGroup",
-]
-
-[target.'cfg(target_os = "ios")'.dependencies.icrate]
-version = "0.1.0"
-features = [
-    "dispatch",
-    "Foundation",
-    "Foundation_NSArray",
-    "Foundation_NSString",
-    "Foundation_NSProcessInfo",
-    "Foundation_NSThread",
-    "Foundation_NSSet",
-]
+objc = "0.2"
+cgl = "0.2"
+cocoa = "=0.5.2"
+core-foundation = "0.2"
+core-graphics = "0.4"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-unicode-segmentation = "1.7.1"
+winapi = "0.2"
+shell32-sys = "0.1"
+gdi32-sys = "0.1"
+user32-sys = "~0.1.2"
+kernel32-sys = "0.2"
+dwmapi-sys = "0.1"
 
-[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
-version = "0.48"
-features = [
-    "Win32_Devices_HumanInterfaceDevice",
-    "Win32_Foundation",
-    "Win32_Globalization",
-    "Win32_Graphics_Dwm",
-    "Win32_Graphics_Gdi",
-    "Win32_Media",
-    "Win32_System_Com_StructuredStorage",
-    "Win32_System_Com",
-    "Win32_System_LibraryLoader",
-    "Win32_System_Ole",
-    "Win32_System_SystemInformation",
-    "Win32_System_SystemServices",
-    "Win32_System_Threading",
-    "Win32_System_WindowsProgramming",
-    "Win32_UI_Accessibility",
-    "Win32_UI_Controls",
-    "Win32_UI_HiDpi",
-    "Win32_UI_Input_Ime",
-    "Win32_UI_Input_KeyboardAndMouse",
-    "Win32_UI_Input_Pointer",
-    "Win32_UI_Input_Touch",
-    "Win32_UI_Shell",
-    "Win32_UI_TextServices",
-    "Win32_UI_WindowsAndMessaging",
-]
-
-[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_os = "ios", target_os = "macos"))))'.dependencies]
-ahash = { version = "0.8.7", features = ["no-rng"], optional = true }
-bytemuck = { version = "1.13.1", default-features = false, optional = true }
-calloop = "0.12.3"
-libc = "0.2.64"
-memmap2 = { version = "0.9.0", optional = true }
-percent-encoding = { version = "2.0", optional = true }
-rustix = { version = "0.38.4", default-features = false, features = ["std", "system", "thread", "process"] }
-sctk = { package = "smithay-client-toolkit", version = "0.18.0", default-features = false, features = ["calloop"], optional = true }
-sctk-adwaita = { version = "0.8.0", default_features = false, optional = true }
-wayland-backend = { version = "0.3.0", default_features = false, features = ["client_system"], optional = true }
-wayland-client = { version = "0.31.1", optional = true }
-wayland-protocols = { version = "0.31.0", features = [ "staging"], optional = true }
-wayland-protocols-plasma = { version = "0.2.0", features = [ "client" ], optional = true }
-x11-dl = { version = "2.18.5", optional = true }
-x11rb = { version = "0.13.0", default-features = false, features = ["allow-unsafe-code", "dl-libxcb", "randr", "resource_manager", "xinput", "xkb"], optional = true }
-xkbcommon-dl = "0.4.2"
-
-[target.'cfg(target_os = "redox")'.dependencies]
-orbclient = { version = "0.3.47", default-features = false }
-redox_syscall = "0.4.1"
-
-[target.'cfg(target_family = "wasm")'.dependencies.web_sys]
-package = "web-sys"
-version = "0.3.64"
-features = [
-    'AbortController',
-    'AbortSignal',
-    'Blob',
-    'console',
-    'CssStyleDeclaration',
-    'Document',
-    'DomException',
-    'DomRect',
-    'DomRectReadOnly',
-    'Element',
-    'Event',
-    'EventTarget',
-    'FocusEvent',
-    'HtmlCanvasElement',
-    'HtmlElement',
-    'HtmlImageElement',
-    'ImageBitmap',
-    'ImageBitmapOptions',
-    'ImageBitmapRenderingContext',
-    'ImageData',
-    'IntersectionObserver',
-    'IntersectionObserverEntry',
-    'KeyboardEvent',
-    'MediaQueryList',
-    'MessageChannel',
-    'MessagePort',
-    'Node',
-    'PageTransitionEvent',
-    'PointerEvent',
-    'PremultiplyAlpha',
-    'ResizeObserver',
-    'ResizeObserverBoxOptions',
-    'ResizeObserverEntry',
-    'ResizeObserverOptions',
-    'ResizeObserverSize',
-    'VisibilityState',
-    'Window',
-    'WheelEvent',
-    'Url',
-]
-
-[target.'cfg(target_family = "wasm")'.dependencies]
-js-sys = "0.3.64"
-pin-project = "1"
-wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
-web-time = "1"
-
-[target.'cfg(all(target_family = "wasm", target_feature = "atomics"))'.dependencies]
-atomic-waker = "1"
-concurrent-queue = { version = "2", default-features = false }
-
-[target.'cfg(target_family = "wasm")'.dev-dependencies]
-console_log = "1"
-web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
-
-[[example]]
-doc-scrape-examples = true
-name = "window"
-
-[workspace]
-resolver = "2"
-members = [
-    "dpi",
-    "run-wasm",
-]
-
-[workspace.package]
-rust-version = "1.70.0"
-repository = "https://github.com/rust-windowing/winit"
-license = "Apache-2.0"
-edition = "2021"
-
-[workspace.dependencies]
-serde = { version = "1", features = ["serde_derive"] }
-mint = "0.5.6"
+[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"

FEATURES.md

@@ -1,248 +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.
-
-# Features
-
-## Extending this section
-
-If your PR makes notable changes to Winit's features, please update this section as follows:
-
-- If your PR adds a new feature, add a brief description to the relevant section. If the feature is a core
-  feature, add a row to the feature matrix and describe what platforms the feature has been implemented on.
-
-- If your PR begins a new API rework, add a row to the `Pending API Reworks` table. If the PR implements the
-  API rework on all relevant platforms, please move it to the `Completed API Reworks` table.
-
-- If your PR implements an already-existing feature on a new platform, either mark the feature as *completed*,
-  or mark it as *mostly completed* and link to an issue describing the problems with the implementation.
-
-## Core
-
-### Windowing
-- **Window initialization**: Winit allows the creation of a window
-- **Providing pointer to init OpenGL**: Winit provides the necessary pointers to initialize a working opengl context
-- **Providing pointer to init Vulkan**: Same as OpenGL but for Vulkan
-- **Window decorations**: The windows created by winit are properly decorated, and the decorations can
-  be deactivated
-- **Window decorations toggle**: Decorations can be turned on or off after window creation
-- **Window resizing**: The windows created by winit can be resized and generate the appropriate events
-  when they are. The application can precisely control its window size if desired.
-- **Window resize increments**: When the window gets resized, the application can choose to snap the window's
-  size to specific values.
-- **Window transparency**: Winit allows the creation of windows with a transparent background.
-- **Window maximization**: The windows created by winit can be maximized upon creation.
-- **Window maximization toggle**: The windows created by winit can be maximized and unmaximized after
-  creation.
-- **Window minimization**: The windows created by winit can be minimized after creation.
-- **Fullscreen**: The windows created by winit can be put into fullscreen mode.
-- **Fullscreen toggle**: The windows created by winit can be switched to and from fullscreen after
-  creation.
-- **Exclusive fullscreen**: Winit allows changing the video mode of the monitor
-  for fullscreen windows and, if applicable, captures the monitor for exclusive
-  use by this application.
-- **HiDPI support**: Winit assists developers in appropriately scaling HiDPI content.
-- **Popup / modal windows**: Windows can be created relative to the client area of other windows, and parent
-  windows can be disabled in favor of popup windows. This feature also guarantees that popup windows
-  get drawn above their owner.
-
-
-### System Information
-- **Monitor list**: Retrieve the list of monitors and their metadata, including which one is primary.
-- **Video mode query**: Monitors can be queried for their supported fullscreen video modes (consisting of resolution, refresh rate, and bit depth).
-
-### Input Handling
-- **Mouse events**: Generating mouse events associated with pointer motion, click, and scrolling events.
-- **Mouse set location**: Forcibly changing the location of the pointer.
-- **Cursor locking**: Locking the cursor inside the window so it cannot move.
-- **Cursor confining**: Confining the cursor to the window bounds so it cannot leave them.
-- **Cursor icon**: Changing the cursor icon or hiding the cursor.
-- **Cursor image**: Changing the cursor to your own image.
-- **Cursor hittest**: Handle or ignore mouse events for a window.
-- **Touch events**: Single-touch events.
-- **Touch pressure**: Touch events contain information about the amount of force being applied.
-- **Multitouch**: Multi-touch events, including cancellation of a gesture.
-- **Keyboard events**: Properly processing keyboard events using the user-specified keymap and
-  translating keypresses into UTF-8 characters, handling dead keys and IMEs.
-- **Drag & Drop**: Dragging content into winit, detecting when content enters, drops, or if the drop is cancelled.
-- **Raw Device Events**: Capturing input from input devices without any OS filtering.
-- **Gamepad/Joystick events**: Capturing input from gamepads and joysticks.
-- **Device movement events**: Capturing input from the device gyroscope and accelerometer.
-
-## Platform
-### Windows
-* Setting the name of the internal window class
-* Setting the taskbar icon
-* Setting the parent window
-* Setting a menu bar
-* `WS_EX_NOREDIRECTIONBITMAP` support
-* Theme the title bar according to Windows 10 Dark Mode setting or set a preferred theme
-* Changing a system-drawn backdrop
-* Setting the window border color
-* Setting the title bar background color
-* Setting the title color
-* Setting the corner rounding preference
-
-### macOS
-* Window activation policy
-* Window movable by background
-* Transparent titlebar
-* Hidden titlebar
-* Hidden titlebar buttons
-* Full-size content view
-* Accepts first mouse
-* Set a preferred theme and get current theme.
-
-### Unix
-* Window urgency
-* X11 Window Class
-* X11 Override Redirect Flag
-* GTK Theme Variant
-* Base window size
-* Setting the X11 parent window
-
-### iOS
-* Get the `UIScreen` object pointer
-* Setting the `UIView` hidpi factor
-* Valid orientations
-* Home indicator visibility
-* Status bar visibility and style
-* Deferring system gestures
-* Getting the device idiom
-* Getting the preferred video mode
-
-### Web
-* Get if the systems preferred color scheme is "dark"
-
-## Compatibility Matrix
-
-Legend:
-
-- ✔️: Works as intended
-- ▢: Mostly works, but some bugs are known
-- ❌: Missing feature or large bugs making it unusable
-- **N/A**: Not applicable for this platform
-- ❓: Unknown status
-
-### Windowing
-|Feature                          |Windows|MacOS   |Linux x11   |Linux Wayland  |Android|iOS    |Web      |Redox OS|
-|-------------------------------- | ----- | ----   | -------    | -----------   | ----- | ----- | -------- | ------ |
-|Window initialization            |✔️     |✔️     |▢[#5]      |✔️             |▢[#33]|▢[#33] |✔️        |✔️      |
-|Providing pointer to init OpenGL |✔️     |✔️     |✔️         |✔️             |✔️     |✔️    |**N/A**|✔️      |
-|Providing pointer to init Vulkan |✔️     |✔️     |✔️         |✔️             |✔️     |❓     |**N/A**|**N/A** |
-|Window decorations               |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|✔️      |
-|Window decorations toggle        |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Window resizing                  |✔️     |✔️     |✔️         |✔️        |**N/A**|**N/A**|✔️        |✔️      |
-|Window resize increments         |❌     |✔️     |✔️         |❌             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Window transparency              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|N/A        |✔️      |
-|Window blur                      |❌    |❌    |❌        |✔️             |**N/A**|**N/A**|N/A        |❌     |
-|Window maximization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Window maximization toggle       |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Window minimization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Fullscreen                       |✔️     |✔️     |✔️         |✔️             |**N/A**|✔️     |✔️        |**N/A** |
-|Fullscreen toggle                |✔️     |✔️     |✔️         |✔️             |**N/A**|✔️     |✔️        |**N/A** |
-|Exclusive fullscreen             |✔️     |✔️     |✔️         |**N/A**         |❌    |✔️     |**N/A**|**N/A** |
-|HiDPI support                    |✔️     |✔️     |✔️         |✔️             |✔️     |✔️    |✔️    |❌      |
-|Popup windows                    |❌     |❌     |❌         |❌             |❌    |❌     |**N/A**|**N/A** |
-
-### System information
-|Feature          |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS      |Web      |Redox OS|
-|---------------- | ----- | ---- | ------- | ----------- | ----- | ------- | -------- | ------ |
-|Monitor list     |✔️    |✔️    |✔️       |✔️          |✔️     |✔️      |**N/A**|❌      |
-|Video mode query |✔️    |✔️    |✔️       |✔️          |✔️     |✔️      |**N/A**|❌      |
-
-### Input handling
-|Feature                 |Windows   |MacOS   |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
-|----------------------- | -----    | ----   | ------- | ----------- | ----- | ----- | -------- | ------ |
-|Mouse events            |✔️       |▢[#63]  |✔️       |✔️          |**N/A**|**N/A**|✔️        |✔️      |
-|Mouse set location      |✔️       |✔️      |✔️       |✔️(when locked)  |**N/A**|**N/A**|**N/A**|**N/A** |
-|Cursor locking          |❌       |✔️      |❌       |✔️          |**N/A**|**N/A**|✔️        |❌      |
-|Cursor confining        |✔️       |❌      |✔️       |✔️          |**N/A**|**N/A**|❌       |❌      |
-|Cursor icon             |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|✔️        |**N/A** |
-|Cursor image            |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|✔️        |**N/A** |
-|Cursor hittest          |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|❌        |❌      |
-|Touch events            |✔️       |❌      |✔️       |✔️          |✔️    |✔️     |✔️        |**N/A** |
-|Touch pressure          |✔️       |❌      |❌       |❌          |❌    |✔️     |✔️        |**N/A** |
-|Multitouch              |✔️       |❌      |✔️       |✔️          |✔️    |✔️     |❌        |**N/A** |
-|Keyboard events         |✔️       |✔️      |✔️       |✔️          |✔️    |❌     |✔️        |✔️      |
-|Drag & Drop             |▢[#720]  |▢[#720] |▢[#720]  |▢[#720]   |**N/A**|**N/A**|❓        |**N/A** |
-|Raw Device Events       |▢[#750]  |▢[#750] |▢[#750]  |❌          |❌    |❌     |❓        |**N/A** |
-|Gamepad/Joystick events |❌[#804] |❌      |❌       |❌          |❌    |❌     |❓        |**N/A** |
-|Device movement events  |❓        |❓       |❓       |❓           |❌    |❌     |❓        |**N/A** |
-|Drag window with cursor |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|**N/A**   |**N/A** |
-|Resize with cursor      |✔️       |❌       |✔️       |✔️       |**N/A**|**N/A**|**N/A**   |**N/A** |
-
-### Pending API Reworks
-Changes in the API that have been agreed upon but aren't implemented across all platforms.
-
-|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
-|------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ |
-|New API for HiDPI ([#315] [#319])   |✔️      |✔️     |✔️        |✔️            |✔️      |✔️      |❓        |❓      |
-|Event Loop 2.0 ([#459])             |✔️      |✔️     |✔️        |✔️            |✔️      |✔️      |❓        |✔️       |
-|Keyboard Input 2.0 ([#753])         |✔️      |✔️     |✔️        |✔️            |✔️      |❌     |✔️         |✔️       |
-
-### Completed API Reworks
-|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
-|------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ |
-
-[#165]: https://github.com/rust-windowing/winit/issues/165
-[#219]: https://github.com/rust-windowing/winit/issues/219
-[#242]: https://github.com/rust-windowing/winit/issues/242
-[#306]: https://github.com/rust-windowing/winit/issues/306
-[#315]: https://github.com/rust-windowing/winit/issues/315
-[#319]: https://github.com/rust-windowing/winit/issues/319
-[#33]: https://github.com/rust-windowing/winit/issues/33
-[#459]: https://github.com/rust-windowing/winit/issues/459
-[#5]: https://github.com/rust-windowing/winit/issues/5
-[#63]: https://github.com/rust-windowing/winit/issues/63
-[#720]: https://github.com/rust-windowing/winit/issues/720
-[#721]: https://github.com/rust-windowing/winit/issues/721
-[#750]: https://github.com/rust-windowing/winit/issues/750
-[#753]: https://github.com/rust-windowing/winit/issues/753
-[#804]: https://github.com/rust-windowing/winit/issues/804

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

README.md

@@ -1,66 +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)
-[![Master Docs](https://img.shields.io/github/actions/workflow/status/rust-windowing/winit/docs.yml?branch=master&label=master%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.29.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. If you don't get an answer there, try [![Libera.Chat](https://img.shields.io/badge/libera.chat-%23winit-red.svg)](https://web.libera.chat/#winit).
-
-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.
 
-## MSRV Policy
+```rust
+extern crate winit;
 
-This crate's Minimum Supported Rust Version (MSRV) is **1.70**. 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
-
-The exception is 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.
-
-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://rust-windowing.github.io/winit/winit/platform/index.html) module for platform-specific usage.

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

build.rs

@@ -1,24 +0,0 @@
-use cfg_aliases::cfg_aliases;
-
-fn main() {
-    // The script doesn't depend on our code
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Setup cfg aliases
-    cfg_aliases! {
-        // Systems.
-        android_platform: { target_os = "android" },
-        web_platform: { all(target_family = "wasm", target_os = "unknown") },
-        macos_platform: { target_os = "macos" },
-        ios_platform: { target_os = "ios" },
-        windows_platform: { target_os = "windows" },
-        apple: { any(target_os = "ios", target_os = "macos") },
-        free_unix: { all(unix, not(apple), not(android_platform), not(target_os = "emscripten")) },
-        redox: { target_os = "redox" },
-
-        // Native displays.
-        x11_platform: { all(feature = "x11", free_unix, not(redox)) },
-        wayland_platform: { all(feature = "wayland", free_unix, not(redox)) },
-        orbital_platform: { redox },
-    }
-}

clippy.toml

@@ -1,15 +0,0 @@
-disallowed-methods = [
-    { path = "web_sys::window", reason = "is not available in every context" },
-    { path = "web_sys::HtmlCanvasElement::width", reason = "Winit shouldn't touch the internal canvas size" },
-    { path = "web_sys::HtmlCanvasElement::height", reason = "Winit shouldn't touch the internal canvas size" },
-    { path = "web_sys::HtmlCanvasElement::set_width", reason = "Winit shouldn't touch the internal canvas size" },
-    { path = "web_sys::HtmlCanvasElement::set_height", reason = "Winit shouldn't touch the internal canvas size" },
-    { path = "web_sys::Window::document", reason = "cache this to reduce calls to JS" },
-    { path = "web_sys::Window::get_computed_style", reason = "cache this to reduce calls to JS" },
-    { path = "web_sys::HtmlElement::style", reason = "cache this to reduce calls to JS" },
-    { path = "web_sys::Element::request_fullscreen", reason = "Doesn't account for compatibility with Safari" },
-    { path = "web_sys::Document::exit_fullscreen", reason = "Doesn't account for compatibility with Safari" },
-    { path = "web_sys::Document::fullscreen_element", reason = "Doesn't account for compatibility with Safari" },
-    { path = "icrate::AppKit::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." },
-    { path = "icrate::AppKit::NSWindow::setFrameTopLeftPoint", reason = "Not sufficient when working with Winit's coordinate system, use `flip_window_screen_coordinates` instead" },
-]

deny.toml

@@ -1,63 +0,0 @@
-# https://embarkstudios.github.io/cargo-deny/
-# cargo install cargo-deny
-# cargo update && cargo deny --all-features --log-level error --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
-targets = [
-    { 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" },
-    { 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" },
-]
-
-
-[advisories]
-vulnerability = "deny"
-unmaintained = "warn"
-yanked = "deny"
-ignore = []
-
-
-[bans]
-multiple-versions = "deny"
-wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny/issues/241 is fixed
-deny = []
-skip = [
-    { name = "raw-window-handle" },    # we intentionally have multiple versions of this
-    { name = "bitflags" },             # the ecosystem is in the process of migrating.
-    { name = "libloading" },           # x11rb uses a different version until the next update
-]
-skip-tree = []
-
-
-[licenses]
-private = { ignore = true }
-unlicensed = "deny"
-allow-osi-fsf-free = "neither"
-confidence-threshold = 0.92 # We want really high confidence when inferring licenses from text
-copyleft = "deny"
-allow = [
-    "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html
-    "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)
-    "BSL-1.0",                        # https://tldrlegal.com/license/boost-software-license-1.0-explained
-    "CC0-1.0",                        # https://creativecommons.org/publicdomain/zero/1.0/
-    "ISC",                            # https://tldrlegal.com/license/-isc-license
-    "LicenseRef-UFL-1.0",             # https://tldrlegal.com/license/ubuntu-font-license,-1.0 - no official SPDX, see https://github.com/emilk/egui/issues/2321
-    "MIT-0",                          # https://choosealicense.com/licenses/mit-0/
-    "MIT",                            # https://tldrlegal.com/license/mit-license
-    "MPL-2.0",                        # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux.
-    "OFL-1.1",                        # https://spdx.org/licenses/OFL-1.1.html
-    "OpenSSL",                        # https://www.openssl.org/source/license.html - used on Linux
-    "Unicode-DFS-2016",               # https://spdx.org/licenses/Unicode-DFS-2016.html
-    "Zlib",                           # https://tldrlegal.com/license/zlib-libpng-license-(zlib)
-]

docs/res/ATTRIBUTION.md

@@ -1,11 +0,0 @@
-# Image Attribution
-
-These images are used in the documentation of `winit`.
-
-## keyboard_*.svg
-
-These files are a modified version of "[ANSI US QWERTY (Windows)](https://commons.wikimedia.org/wiki/File:ANSI_US_QWERTY_(Windows).svg)"
-by [Tomiĉo] (https://commons.wikimedia.org/wiki/User:Tomi%C4%89o). It was
-originally released under the [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.en)
-License. Minor modifications have been made by [John Nunley](https://github.com/notgull),
-which have been released under the same license as a derivative work.

dpi/Cargo.toml

@@ -1,39 +0,0 @@
-[package]
-name = "dpi"
-version = "0.0.0"
-description = "Types for handling UI scaling"
-keywords = ["DPI", "HiDPI", "scale-factor"]
-categories = ["gui"]
-rust-version.workspace = true
-repository.workspace = true
-license.workspace = true
-edition.workspace = true
-
-[features]
-serde = ["dep:serde"]
-mint = ["dep:mint"]
-
-[dependencies]
-serde = { workspace = true, optional = true }
-mint = { workspace = true, optional = true }
-
-[package.metadata.docs.rs]
-features = ["serde", "mint"]
-# These are all tested in CI
-targets = [
-    # Windows
-    "i686-pc-windows-msvc",
-    "x86_64-pc-windows-msvc",
-    # macOS
-    "x86_64-apple-darwin",
-    # Unix (X11 & Wayland)
-    "i686-unknown-linux-gnu",
-    "x86_64-unknown-linux-gnu",
-    # iOS
-    "x86_64-apple-ios",
-    # Android
-    "aarch64-linux-android",
-    # Web
-    "wasm32-unknown-unknown",
-]
-rustdoc-args = ["--cfg", "docsrs"]

dpi/LICENSE

@@ -1 +0,0 @@
-../LICENSE

dpi/src/lib.rs

@@ -1,939 +0,0 @@
-//! # DPI
-//!
-//! ## Why should I care about UI scaling?
-//!
-//! Modern computer screens don't have a consistent relationship between resolution and size.
-//! 1920x1080 is a common resolution for both desktop and mobile screens, despite mobile screens
-//! typically being less than a quarter the size of their desktop counterparts. Moreover, neither
-//! desktop nor mobile screens have consistent resolutions within their own size classes - common
-//! mobile screens range from below 720p to above 1440p, and desktop screens range from 720p to 5K
-//! and beyond.
-//!
-//! Given that, it's a mistake to assume that 2D content will only be displayed on screens with
-//! a consistent pixel density. If you were to render a 96-pixel-square image on a 1080p screen and
-//! then render the same image on a similarly-sized 4K screen, the 4K rendition would only take up
-//! about a quarter of the physical space as it did on the 1080p screen. That issue is especially
-//! problematic with text rendering, where quarter-sized text becomes a significant legibility
-//! problem.
-//!
-//! Failure to account for the scale factor can create a significantly degraded user experience.
-//! Most notably, it can make users feel like they have bad eyesight, which will potentially cause
-//! them to think about growing elderly, resulting in them having an existential crisis. Once users
-//! enter that state, they will no longer be focused on your application.
-//!
-//! ## How should I handle it?
-//!
-//! The solution to this problem is to account for the device's *scale factor*. The scale factor is
-//! the factor UI elements should be scaled by to be consistent with the rest of the user's system -
-//! for example, a button that's usually 50 pixels across would be 100 pixels across on a device
-//! with a scale factor of `2.0`, or 75 pixels across with a scale factor of `1.5`.
-//!
-//! Many UI systems, such as CSS, expose DPI-dependent units like [points] or [picas]. That's
-//! usually a mistake since there's no consistent mapping between the scale factor and the screen's
-//! actual DPI. Unless printing to a physical medium, you should work in scaled pixels rather
-//! than any DPI-dependent units.
-//!
-//! ### Position and Size types
-//!
-//! The [`PhysicalPosition`] / [`PhysicalSize`] types correspond with the actual pixels on the
-//! device, and the [`LogicalPosition`] / [`LogicalSize`] types correspond to the physical pixels
-//! divided by the scale factor.
-//!
-//! The position and size types are generic over their exact pixel type, `P`, to allow the
-//! API to have integer precision where appropriate (e.g. most window manipulation functions) and
-//! floating precision when necessary (e.g. logical sizes for fractional scale factors and touch
-//! input). If `P` is a floating-point type, please do not cast the values with `as {int}`. Doing so
-//! will truncate the fractional part of the float rather than properly round to the nearest
-//! integer. Use the provided `cast` function or [`From`]/[`Into`] conversions, which handle the
-//! rounding properly. Note that precision loss will still occur when rounding from a float to an
-//! int, although rounding lessens the problem.
-//!
-//! ## Cargo Features
-//!
-//! This crate provides the following Cargo features:
-//!
-//! * `serde`: Enables serialization/deserialization of certain types with
-//!   [Serde](https://crates.io/crates/serde).
-//! * `mint`: Enables mint (math interoperability standard types) conversions.
-//!
-//!
-//! [points]: https://en.wikipedia.org/wiki/Point_(typography)
-//! [picas]: https://en.wikipedia.org/wiki/Pica_(typography)
-
-#![cfg_attr(
-    docsrs,
-    feature(doc_auto_cfg, doc_cfg_hide),
-    doc(cfg_hide(doc, docsrs))
-)]
-#![forbid(unsafe_code)]
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-pub trait Pixel: Copy + Into<f64> {
-    fn from_f64(f: f64) -> Self;
-    fn cast<P: Pixel>(self) -> P {
-        P::from_f64(self.into())
-    }
-}
-
-impl Pixel for u8 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as u8
-    }
-}
-impl Pixel for u16 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as u16
-    }
-}
-impl Pixel for u32 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as u32
-    }
-}
-impl Pixel for i8 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as i8
-    }
-}
-impl Pixel for i16 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as i16
-    }
-}
-impl Pixel for i32 {
-    fn from_f64(f: f64) -> Self {
-        f.round() as i32
-    }
-}
-impl Pixel for f32 {
-    fn from_f64(f: f64) -> Self {
-        f as f32
-    }
-}
-impl Pixel for f64 {
-    fn from_f64(f: f64) -> Self {
-        f
-    }
-}
-
-/// Checks that the scale factor is a normal positive `f64`.
-///
-/// All functions that take a scale factor assert that this will return `true`. If you're sourcing scale factors from
-/// anywhere other than winit, it's recommended to validate them using this function before passing them to winit;
-/// otherwise, you risk panics.
-#[inline]
-pub fn validate_scale_factor(scale_factor: f64) -> bool {
-    scale_factor.is_sign_positive() && scale_factor.is_normal()
-}
-
-/// A position represented in logical pixels.
-///
-/// The position is stored as floats, so please be careful. Casting floats to integers truncates the
-/// fractional part, which can cause noticeable issues. To help with that, an `Into<(i32, i32)>`
-/// implementation is provided which does the rounding for you.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct LogicalPosition<P> {
-    pub x: P,
-    pub y: P,
-}
-
-impl<P> LogicalPosition<P> {
-    #[inline]
-    pub const fn new(x: P, y: P) -> Self {
-        LogicalPosition { x, y }
-    }
-}
-
-impl<P: Pixel> LogicalPosition<P> {
-    #[inline]
-    pub fn from_physical<T: Into<PhysicalPosition<X>>, X: Pixel>(
-        physical: T,
-        scale_factor: f64,
-    ) -> Self {
-        physical.into().to_logical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_physical<X: Pixel>(&self, scale_factor: f64) -> PhysicalPosition<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let x = self.x.into() * scale_factor;
-        let y = self.y.into() * scale_factor;
-        PhysicalPosition::new(x, y).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> LogicalPosition<X> {
-        LogicalPosition {
-            x: self.x.cast(),
-            y: self.y.cast(),
-        }
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<(X, X)> for LogicalPosition<P> {
-    fn from((x, y): (X, X)) -> LogicalPosition<P> {
-        LogicalPosition::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<LogicalPosition<P>> for (X, X) {
-    fn from(p: LogicalPosition<P>) -> (X, X) {
-        (p.x.cast(), p.y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<[X; 2]> for LogicalPosition<P> {
-    fn from([x, y]: [X; 2]) -> LogicalPosition<P> {
-        LogicalPosition::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<LogicalPosition<P>> for [X; 2] {
-    fn from(p: LogicalPosition<P>) -> [X; 2] {
-        [p.x.cast(), p.y.cast()]
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<mint::Point2<P>> for LogicalPosition<P> {
-    fn from(p: mint::Point2<P>) -> Self {
-        Self::new(p.x, p.y)
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<LogicalPosition<P>> for mint::Point2<P> {
-    fn from(p: LogicalPosition<P>) -> Self {
-        mint::Point2 { x: p.x, y: p.y }
-    }
-}
-
-/// A position represented in physical pixels.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct PhysicalPosition<P> {
-    pub x: P,
-    pub y: P,
-}
-
-impl<P> PhysicalPosition<P> {
-    #[inline]
-    pub const fn new(x: P, y: P) -> Self {
-        PhysicalPosition { x, y }
-    }
-}
-
-impl<P: Pixel> PhysicalPosition<P> {
-    #[inline]
-    pub fn from_logical<T: Into<LogicalPosition<X>>, X: Pixel>(
-        logical: T,
-        scale_factor: f64,
-    ) -> Self {
-        logical.into().to_physical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_logical<X: Pixel>(&self, scale_factor: f64) -> LogicalPosition<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let x = self.x.into() / scale_factor;
-        let y = self.y.into() / scale_factor;
-        LogicalPosition::new(x, y).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> PhysicalPosition<X> {
-        PhysicalPosition {
-            x: self.x.cast(),
-            y: self.y.cast(),
-        }
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<(X, X)> for PhysicalPosition<P> {
-    fn from((x, y): (X, X)) -> PhysicalPosition<P> {
-        PhysicalPosition::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<PhysicalPosition<P>> for (X, X) {
-    fn from(p: PhysicalPosition<P>) -> (X, X) {
-        (p.x.cast(), p.y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<[X; 2]> for PhysicalPosition<P> {
-    fn from([x, y]: [X; 2]) -> PhysicalPosition<P> {
-        PhysicalPosition::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<PhysicalPosition<P>> for [X; 2] {
-    fn from(p: PhysicalPosition<P>) -> [X; 2] {
-        [p.x.cast(), p.y.cast()]
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<mint::Point2<P>> for PhysicalPosition<P> {
-    fn from(p: mint::Point2<P>) -> Self {
-        Self::new(p.x, p.y)
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<PhysicalPosition<P>> for mint::Point2<P> {
-    fn from(p: PhysicalPosition<P>) -> Self {
-        mint::Point2 { x: p.x, y: p.y }
-    }
-}
-
-/// A size represented in logical pixels.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct LogicalSize<P> {
-    pub width: P,
-    pub height: P,
-}
-
-impl<P> LogicalSize<P> {
-    #[inline]
-    pub const fn new(width: P, height: P) -> Self {
-        LogicalSize { width, height }
-    }
-}
-
-impl<P: Pixel> LogicalSize<P> {
-    #[inline]
-    pub fn from_physical<T: Into<PhysicalSize<X>>, X: Pixel>(
-        physical: T,
-        scale_factor: f64,
-    ) -> Self {
-        physical.into().to_logical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_physical<X: Pixel>(&self, scale_factor: f64) -> PhysicalSize<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let width = self.width.into() * scale_factor;
-        let height = self.height.into() * scale_factor;
-        PhysicalSize::new(width, height).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> LogicalSize<X> {
-        LogicalSize {
-            width: self.width.cast(),
-            height: self.height.cast(),
-        }
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<(X, X)> for LogicalSize<P> {
-    fn from((x, y): (X, X)) -> LogicalSize<P> {
-        LogicalSize::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<LogicalSize<P>> for (X, X) {
-    fn from(s: LogicalSize<P>) -> (X, X) {
-        (s.width.cast(), s.height.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<[X; 2]> for LogicalSize<P> {
-    fn from([x, y]: [X; 2]) -> LogicalSize<P> {
-        LogicalSize::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<LogicalSize<P>> for [X; 2] {
-    fn from(s: LogicalSize<P>) -> [X; 2] {
-        [s.width.cast(), s.height.cast()]
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<mint::Vector2<P>> for LogicalSize<P> {
-    fn from(v: mint::Vector2<P>) -> Self {
-        Self::new(v.x, v.y)
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<LogicalSize<P>> for mint::Vector2<P> {
-    fn from(s: LogicalSize<P>) -> Self {
-        mint::Vector2 {
-            x: s.width,
-            y: s.height,
-        }
-    }
-}
-
-/// A size represented in physical pixels.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct PhysicalSize<P> {
-    pub width: P,
-    pub height: P,
-}
-
-impl<P> PhysicalSize<P> {
-    #[inline]
-    pub const fn new(width: P, height: P) -> Self {
-        PhysicalSize { width, height }
-    }
-}
-
-impl<P: Pixel> PhysicalSize<P> {
-    #[inline]
-    pub fn from_logical<T: Into<LogicalSize<X>>, X: Pixel>(logical: T, scale_factor: f64) -> Self {
-        logical.into().to_physical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_logical<X: Pixel>(&self, scale_factor: f64) -> LogicalSize<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let width = self.width.into() / scale_factor;
-        let height = self.height.into() / scale_factor;
-        LogicalSize::new(width, height).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> PhysicalSize<X> {
-        PhysicalSize {
-            width: self.width.cast(),
-            height: self.height.cast(),
-        }
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<(X, X)> for PhysicalSize<P> {
-    fn from((x, y): (X, X)) -> PhysicalSize<P> {
-        PhysicalSize::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<PhysicalSize<P>> for (X, X) {
-    fn from(s: PhysicalSize<P>) -> (X, X) {
-        (s.width.cast(), s.height.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<[X; 2]> for PhysicalSize<P> {
-    fn from([x, y]: [X; 2]) -> PhysicalSize<P> {
-        PhysicalSize::new(x.cast(), y.cast())
-    }
-}
-
-impl<P: Pixel, X: Pixel> From<PhysicalSize<P>> for [X; 2] {
-    fn from(s: PhysicalSize<P>) -> [X; 2] {
-        [s.width.cast(), s.height.cast()]
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<mint::Vector2<P>> for PhysicalSize<P> {
-    fn from(v: mint::Vector2<P>) -> Self {
-        Self::new(v.x, v.y)
-    }
-}
-
-#[cfg(feature = "mint")]
-impl<P: Pixel> From<PhysicalSize<P>> for mint::Vector2<P> {
-    fn from(s: PhysicalSize<P>) -> Self {
-        mint::Vector2 {
-            x: s.width,
-            y: s.height,
-        }
-    }
-}
-
-/// A size that's either physical or logical.
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum Size {
-    Physical(PhysicalSize<u32>),
-    Logical(LogicalSize<f64>),
-}
-
-impl Size {
-    pub fn new<S: Into<Size>>(size: S) -> Size {
-        size.into()
-    }
-
-    pub fn to_logical<P: Pixel>(&self, scale_factor: f64) -> LogicalSize<P> {
-        match *self {
-            Size::Physical(size) => size.to_logical(scale_factor),
-            Size::Logical(size) => size.cast(),
-        }
-    }
-
-    pub fn to_physical<P: Pixel>(&self, scale_factor: f64) -> PhysicalSize<P> {
-        match *self {
-            Size::Physical(size) => size.cast(),
-            Size::Logical(size) => size.to_physical(scale_factor),
-        }
-    }
-
-    pub fn clamp<S: Into<Size>>(input: S, min: S, max: S, scale_factor: f64) -> Size {
-        let (input, min, max) = (
-            input.into().to_physical::<f64>(scale_factor),
-            min.into().to_physical::<f64>(scale_factor),
-            max.into().to_physical::<f64>(scale_factor),
-        );
-
-        let width = input.width.clamp(min.width, max.width);
-        let height = input.height.clamp(min.height, max.height);
-
-        PhysicalSize::new(width, height).into()
-    }
-}
-
-impl<P: Pixel> From<PhysicalSize<P>> for Size {
-    #[inline]
-    fn from(size: PhysicalSize<P>) -> Size {
-        Size::Physical(size.cast())
-    }
-}
-
-impl<P: Pixel> From<LogicalSize<P>> for Size {
-    #[inline]
-    fn from(size: LogicalSize<P>) -> Size {
-        Size::Logical(size.cast())
-    }
-}
-
-/// A position that's either physical or logical.
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum Position {
-    Physical(PhysicalPosition<i32>),
-    Logical(LogicalPosition<f64>),
-}
-
-impl Position {
-    pub fn new<S: Into<Position>>(position: S) -> Position {
-        position.into()
-    }
-
-    pub fn to_logical<P: Pixel>(&self, scale_factor: f64) -> LogicalPosition<P> {
-        match *self {
-            Position::Physical(position) => position.to_logical(scale_factor),
-            Position::Logical(position) => position.cast(),
-        }
-    }
-
-    pub fn to_physical<P: Pixel>(&self, scale_factor: f64) -> PhysicalPosition<P> {
-        match *self {
-            Position::Physical(position) => position.cast(),
-            Position::Logical(position) => position.to_physical(scale_factor),
-        }
-    }
-}
-
-impl<P: Pixel> From<PhysicalPosition<P>> for Position {
-    #[inline]
-    fn from(position: PhysicalPosition<P>) -> Position {
-        Position::Physical(position.cast())
-    }
-}
-
-impl<P: Pixel> From<LogicalPosition<P>> for Position {
-    #[inline]
-    fn from(position: LogicalPosition<P>) -> Position {
-        Position::Logical(position.cast())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashSet;
-
-    macro_rules! test_pixel_int_impl {
-        ($($name:ident => $ty:ty),*) => {$(
-            #[test]
-            fn $name() {
-                assert_eq!(
-                    <$ty as Pixel>::from_f64(37.0),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::from_f64(37.4),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::from_f64(37.5),
-                    38,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::from_f64(37.9),
-                    38,
-                );
-
-                assert_eq!(
-                    <$ty as Pixel>::cast::<u8>(37),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::cast::<u16>(37),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::cast::<u32>(37),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::cast::<i8>(37),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::cast::<i16>(37),
-                    37,
-                );
-                assert_eq!(
-                    <$ty as Pixel>::cast::<i32>(37),
-                    37,
-                );
-            }
-        )*};
-    }
-
-    test_pixel_int_impl! {
-        test_pixel_int_u8 => u8,
-        test_pixel_int_u16 => u16,
-        test_pixel_int_u32 => u32,
-        test_pixel_int_i8 => i8,
-        test_pixel_int_i16 => i16
-    }
-
-    macro_rules! assert_approx_eq {
-        ($a:expr, $b:expr $(,)?) => {
-            assert!(
-                ($a - $b).abs() < 0.001,
-                "{} is not approximately equal to {}",
-                $a,
-                $b
-            );
-        };
-    }
-
-    macro_rules! test_pixel_float_impl {
-    ($($name:ident => $ty:ty),*) => {$(
-        #[test]
-        fn $name() {
-            assert_approx_eq!(
-                <$ty as Pixel>::from_f64(37.0),
-                37.0,
-            );
-            assert_approx_eq!(
-                <$ty as Pixel>::from_f64(37.4),
-                37.4,
-            );
-            assert_approx_eq!(
-                <$ty as Pixel>::from_f64(37.5),
-                37.5,
-            );
-            assert_approx_eq!(
-                <$ty as Pixel>::from_f64(37.9),
-                37.9,
-            );
-
-            assert_eq!(
-                <$ty as Pixel>::cast::<u8>(37.0),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u8>(37.4),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u8>(37.5),
-                38,
-            );
-
-            assert_eq!(
-                <$ty as Pixel>::cast::<u16>(37.0),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u16>(37.4),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u16>(37.5),
-                38,
-            );
-
-            assert_eq!(
-                <$ty as Pixel>::cast::<u32>(37.0),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u32>(37.4),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<u32>(37.5),
-                38,
-            );
-
-            assert_eq!(
-                <$ty as Pixel>::cast::<i8>(37.0),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<i8>(37.4),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<i8>(37.5),
-                38,
-            );
-
-            assert_eq!(
-                <$ty as Pixel>::cast::<i16>(37.0),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<i16>(37.4),
-                37,
-            );
-            assert_eq!(
-                <$ty as Pixel>::cast::<i16>(37.5),
-                38,
-            );
-        }
-    )*};
-}
-
-    test_pixel_float_impl! {
-        test_pixel_float_f32 => f32,
-        test_pixel_float_f64 => f64
-    }
-
-    #[test]
-    fn test_validate_scale_factor() {
-        assert!(validate_scale_factor(1.0));
-        assert!(validate_scale_factor(2.0));
-        assert!(validate_scale_factor(3.0));
-        assert!(validate_scale_factor(1.5));
-        assert!(validate_scale_factor(0.5));
-
-        assert!(!validate_scale_factor(0.0));
-        assert!(!validate_scale_factor(-1.0));
-        assert!(!validate_scale_factor(f64::INFINITY));
-        assert!(!validate_scale_factor(f64::NAN));
-        assert!(!validate_scale_factor(f64::NEG_INFINITY));
-    }
-
-    #[test]
-    fn test_logical_position() {
-        let log_pos = LogicalPosition::new(1.0, 2.0);
-        assert_eq!(log_pos.to_physical::<u32>(1.0), PhysicalPosition::new(1, 2));
-        assert_eq!(log_pos.to_physical::<u32>(2.0), PhysicalPosition::new(2, 4));
-        assert_eq!(log_pos.cast::<u32>(), LogicalPosition::new(1, 2));
-        assert_eq!(
-            log_pos,
-            LogicalPosition::from_physical(PhysicalPosition::new(1.0, 2.0), 1.0)
-        );
-        assert_eq!(
-            log_pos,
-            LogicalPosition::from_physical(PhysicalPosition::new(2.0, 4.0), 2.0)
-        );
-        assert_eq!(
-            LogicalPosition::from((2.0, 2.0)),
-            LogicalPosition::new(2.0, 2.0)
-        );
-        assert_eq!(
-            LogicalPosition::from([2.0, 3.0]),
-            LogicalPosition::new(2.0, 3.0)
-        );
-
-        let x: (f64, f64) = log_pos.into();
-        assert_eq!(x, (1.0, 2.0));
-        let x: [f64; 2] = log_pos.into();
-        assert_eq!(x, [1.0, 2.0]);
-    }
-
-    #[test]
-    fn test_physical_position() {
-        assert_eq!(
-            PhysicalPosition::from_logical(LogicalPosition::new(1.0, 2.0), 1.0),
-            PhysicalPosition::new(1, 2)
-        );
-        assert_eq!(
-            PhysicalPosition::from_logical(LogicalPosition::new(2.0, 4.0), 0.5),
-            PhysicalPosition::new(1, 2)
-        );
-        assert_eq!(
-            PhysicalPosition::from((2.0, 2.0)),
-            PhysicalPosition::new(2.0, 2.0)
-        );
-        assert_eq!(
-            PhysicalPosition::from([2.0, 3.0]),
-            PhysicalPosition::new(2.0, 3.0)
-        );
-
-        let x: (f64, f64) = PhysicalPosition::new(1, 2).into();
-        assert_eq!(x, (1.0, 2.0));
-        let x: [f64; 2] = PhysicalPosition::new(1, 2).into();
-        assert_eq!(x, [1.0, 2.0]);
-    }
-
-    #[test]
-    fn test_logical_size() {
-        let log_size = LogicalSize::new(1.0, 2.0);
-        assert_eq!(log_size.to_physical::<u32>(1.0), PhysicalSize::new(1, 2));
-        assert_eq!(log_size.to_physical::<u32>(2.0), PhysicalSize::new(2, 4));
-        assert_eq!(log_size.cast::<u32>(), LogicalSize::new(1, 2));
-        assert_eq!(
-            log_size,
-            LogicalSize::from_physical(PhysicalSize::new(1.0, 2.0), 1.0)
-        );
-        assert_eq!(
-            log_size,
-            LogicalSize::from_physical(PhysicalSize::new(2.0, 4.0), 2.0)
-        );
-        assert_eq!(LogicalSize::from((2.0, 2.0)), LogicalSize::new(2.0, 2.0));
-        assert_eq!(LogicalSize::from([2.0, 3.0]), LogicalSize::new(2.0, 3.0));
-
-        let x: (f64, f64) = log_size.into();
-        assert_eq!(x, (1.0, 2.0));
-        let x: [f64; 2] = log_size.into();
-        assert_eq!(x, [1.0, 2.0]);
-    }
-
-    #[test]
-    fn test_physical_size() {
-        assert_eq!(
-            PhysicalSize::from_logical(LogicalSize::new(1.0, 2.0), 1.0),
-            PhysicalSize::new(1, 2)
-        );
-        assert_eq!(
-            PhysicalSize::from_logical(LogicalSize::new(2.0, 4.0), 0.5),
-            PhysicalSize::new(1, 2)
-        );
-        assert_eq!(PhysicalSize::from((2.0, 2.0)), PhysicalSize::new(2.0, 2.0));
-        assert_eq!(PhysicalSize::from([2.0, 3.0]), PhysicalSize::new(2.0, 3.0));
-
-        let x: (f64, f64) = PhysicalSize::new(1, 2).into();
-        assert_eq!(x, (1.0, 2.0));
-        let x: [f64; 2] = PhysicalSize::new(1, 2).into();
-        assert_eq!(x, [1.0, 2.0]);
-    }
-
-    #[test]
-    fn test_size() {
-        assert_eq!(
-            Size::new(PhysicalSize::new(1, 2)),
-            Size::Physical(PhysicalSize::new(1, 2))
-        );
-        assert_eq!(
-            Size::new(LogicalSize::new(1.0, 2.0)),
-            Size::Logical(LogicalSize::new(1.0, 2.0))
-        );
-
-        assert_eq!(
-            Size::new(PhysicalSize::new(1, 2)).to_logical::<f64>(1.0),
-            LogicalSize::new(1.0, 2.0)
-        );
-        assert_eq!(
-            Size::new(PhysicalSize::new(1, 2)).to_logical::<f64>(2.0),
-            LogicalSize::new(0.5, 1.0)
-        );
-        assert_eq!(
-            Size::new(LogicalSize::new(1.0, 2.0)).to_logical::<f64>(1.0),
-            LogicalSize::new(1.0, 2.0)
-        );
-
-        assert_eq!(
-            Size::new(PhysicalSize::new(1, 2)).to_physical::<u32>(1.0),
-            PhysicalSize::new(1, 2)
-        );
-        assert_eq!(
-            Size::new(PhysicalSize::new(1, 2)).to_physical::<u32>(2.0),
-            PhysicalSize::new(1, 2)
-        );
-        assert_eq!(
-            Size::new(LogicalSize::new(1.0, 2.0)).to_physical::<u32>(1.0),
-            PhysicalSize::new(1, 2)
-        );
-        assert_eq!(
-            Size::new(LogicalSize::new(1.0, 2.0)).to_physical::<u32>(2.0),
-            PhysicalSize::new(2, 4)
-        );
-
-        let small = Size::Physical((1, 2).into());
-        let medium = Size::Logical((3, 4).into());
-        let medium_physical = Size::new(medium.to_physical::<u32>(1.0));
-        let large = Size::Physical((5, 6).into());
-        assert_eq!(Size::clamp(medium, small, large, 1.0), medium_physical);
-        assert_eq!(Size::clamp(small, medium, large, 1.0), medium_physical);
-        assert_eq!(Size::clamp(large, small, medium, 1.0), medium_physical);
-    }
-
-    #[test]
-    fn test_position() {
-        assert_eq!(
-            Position::new(PhysicalPosition::new(1, 2)),
-            Position::Physical(PhysicalPosition::new(1, 2))
-        );
-        assert_eq!(
-            Position::new(LogicalPosition::new(1.0, 2.0)),
-            Position::Logical(LogicalPosition::new(1.0, 2.0))
-        );
-
-        assert_eq!(
-            Position::new(PhysicalPosition::new(1, 2)).to_logical::<f64>(1.0),
-            LogicalPosition::new(1.0, 2.0)
-        );
-        assert_eq!(
-            Position::new(PhysicalPosition::new(1, 2)).to_logical::<f64>(2.0),
-            LogicalPosition::new(0.5, 1.0)
-        );
-        assert_eq!(
-            Position::new(LogicalPosition::new(1.0, 2.0)).to_logical::<f64>(1.0),
-            LogicalPosition::new(1.0, 2.0)
-        );
-
-        assert_eq!(
-            Position::new(PhysicalPosition::new(1, 2)).to_physical::<u32>(1.0),
-            PhysicalPosition::new(1, 2)
-        );
-        assert_eq!(
-            Position::new(PhysicalPosition::new(1, 2)).to_physical::<u32>(2.0),
-            PhysicalPosition::new(1, 2)
-        );
-        assert_eq!(
-            Position::new(LogicalPosition::new(1.0, 2.0)).to_physical::<u32>(1.0),
-            PhysicalPosition::new(1, 2)
-        );
-        assert_eq!(
-            Position::new(LogicalPosition::new(1.0, 2.0)).to_physical::<u32>(2.0),
-            PhysicalPosition::new(2, 4)
-        );
-    }
-
-    // Eat coverage for the Debug impls et al
-    #[test]
-    fn ensure_attrs_do_not_panic() {
-        let _ = format!("{:?}", LogicalPosition::<u32>::default().clone());
-        HashSet::new().insert(LogicalPosition::<u32>::default());
-
-        let _ = format!("{:?}", PhysicalPosition::<u32>::default().clone());
-        HashSet::new().insert(PhysicalPosition::<u32>::default());
-
-        let _ = format!("{:?}", LogicalSize::<u32>::default().clone());
-        HashSet::new().insert(LogicalSize::<u32>::default());
-
-        let _ = format!("{:?}", PhysicalSize::<u32>::default().clone());
-        HashSet::new().insert(PhysicalSize::<u32>::default());
-
-        let _ = format!("{:?}", Size::Physical((1, 2).into()).clone());
-        let _ = format!("{:?}", Position::Physical((1, 2).into()).clone());
-    }
-}

examples/child_window.rs

@@ -1,94 +0,0 @@
-#[cfg(all(
-    feature = "rwh_06",
-    any(x11_platform, macos_platform, windows_platform)
-))]
-#[allow(deprecated)]
-fn main() -> Result<(), impl std::error::Error> {
-    use std::collections::HashMap;
-
-    use winit::dpi::{LogicalPosition, LogicalSize, Position};
-    use winit::event::{ElementState, Event, KeyEvent, WindowEvent};
-    use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::raw_window_handle::HasRawWindowHandle;
-    use winit::window::Window;
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    fn spawn_child_window(parent: &Window, event_loop: &ActiveEventLoop) -> Window {
-        let parent = parent.raw_window_handle().unwrap();
-        let mut window_attributes = Window::default_attributes()
-            .with_title("child window")
-            .with_inner_size(LogicalSize::new(200.0f32, 200.0f32))
-            .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
-            .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 mut windows = HashMap::new();
-
-    let event_loop: EventLoop<()> = EventLoop::new().unwrap();
-    let mut parent_window_id = None;
-
-    event_loop.run(move |event: Event<()>, event_loop| {
-        match event {
-            Event::Resumed => {
-                let attributes = Window::default_attributes()
-                    .with_title("parent window")
-                    .with_position(Position::Logical(LogicalPosition::new(0.0, 0.0)))
-                    .with_inner_size(LogicalSize::new(640.0f32, 480.0f32));
-                let window = event_loop.create_window(attributes).unwrap();
-
-                parent_window_id = Some(window.id());
-
-                println!("Parent window id: {parent_window_id:?})");
-                windows.insert(window.id(), window);
-            }
-            Event::WindowEvent { window_id, event } => match event {
-                WindowEvent::CloseRequested => {
-                    windows.clear();
-                    event_loop.exit();
-                }
-                WindowEvent::CursorEntered { 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 parent_window = windows.get(&parent_window_id.unwrap()).unwrap();
-                    let child_window = spawn_child_window(parent_window, event_loop);
-                    let child_id = child_window.id();
-                    println!("Child window created with id: {child_id:?}");
-                    windows.insert(child_id, child_window);
-                }
-                WindowEvent::RedrawRequested => {
-                    if let Some(window) = windows.get(&window_id) {
-                        fill::fill_window(window);
-                    }
-                }
-                _ => (),
-            },
-            _ => (),
-        }
-    })
-}
-
-#[cfg(all(
-    feature = "rwh_06",
-    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.");
-}

examples/control_flow.rs

@@ -1,132 +0,0 @@
-#![allow(clippy::single_match)]
-
-use std::thread;
-#[cfg(not(web_platform))]
-use std::time;
-#[cfg(web_platform)]
-use web_time as time;
-
-use winit::{
-    event::{ElementState, Event, KeyEvent, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    keyboard::{Key, NamedKey},
-    window::Window,
-};
-
-#[path = "util/fill.rs"]
-mod fill;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Mode {
-    Wait,
-    WaitUntil,
-    Poll,
-}
-
-const WAIT_TIME: time::Duration = time::Duration::from_millis(100);
-const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(100);
-
-fn main() -> Result<(), impl std::error::Error> {
-    tracing_subscriber::fmt::init();
-
-    println!("Press '1' to switch to Wait mode.");
-    println!("Press '2' to switch to WaitUntil mode.");
-    println!("Press '3' to switch to Poll mode.");
-    println!("Press 'R' to toggle request_redraw() calls.");
-    println!("Press 'Esc' to close the window.");
-
-    let event_loop = EventLoop::new().unwrap();
-
-    let mut mode = Mode::Wait;
-    let mut request_redraw = false;
-    let mut wait_cancelled = false;
-    let mut close_requested = false;
-
-    let mut window = None;
-    event_loop.run(move |event, event_loop| {
-        use winit::event::StartCause;
-        println!("{event:?}");
-        match event {
-            Event::NewEvents(start_cause) => {
-                wait_cancelled = match start_cause {
-                    StartCause::WaitCancelled { .. } => mode == Mode::WaitUntil,
-                    _ => false,
-                }
-            }
-            Event::Resumed => {
-                let window_attributes = Window::default_attributes().with_title(
-                    "Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.",
-                );
-                window = Some(event_loop.create_window(window_attributes).unwrap());
-            }
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => {
-                    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") => {
-                        mode = Mode::Wait;
-                        println!("\nmode: {mode:?}\n");
-                    }
-                    Key::Character("2") => {
-                        mode = Mode::WaitUntil;
-                        println!("\nmode: {mode:?}\n");
-                    }
-                    Key::Character("3") => {
-                        mode = Mode::Poll;
-                        println!("\nmode: {mode:?}\n");
-                    }
-                    Key::Character("r") => {
-                        request_redraw = !request_redraw;
-                        println!("\nrequest_redraw: {request_redraw}\n");
-                    }
-                    Key::Named(NamedKey::Escape) => {
-                        close_requested = true;
-                    }
-                    _ => (),
-                },
-                WindowEvent::RedrawRequested => {
-                    let window = window.as_ref().unwrap();
-                    window.pre_present_notify();
-                    fill::fill_window(window);
-                }
-                _ => (),
-            },
-            Event::AboutToWait => {
-                if request_redraw && !wait_cancelled && !close_requested {
-                    window.as_ref().unwrap().request_redraw();
-                }
-
-                match mode {
-                    Mode::Wait => event_loop.set_control_flow(ControlFlow::Wait),
-                    Mode::WaitUntil => {
-                        if !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 close_requested {
-                    event_loop.exit();
-                }
-            }
-            _ => (),
-        }
-    })
-}

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()
+            },
+            _ => ()
+        }
+    });
+}

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(),
+                    _ => ()
+                }
+            },
+        }
+    });
+}

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);
+                    },
+
+                    _ => (),
+                }
+            },
+        }
+    });
+}

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(),
+            _ => ()
+        }
+    });
+}

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();
+                }
+            },
+            _ => (),
+        }
+    })
+}

examples/pump_events.rs

@@ -1,75 +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, thread::sleep, time::Duration};
-
-    use winit::{
-        event::{Event, WindowEvent},
-        event_loop::EventLoop,
-        platform::pump_events::{EventLoopExtPumpEvents, PumpStatus},
-        window::Window,
-    };
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    let mut event_loop = EventLoop::new().unwrap();
-
-    tracing_subscriber::fmt::init();
-
-    let mut window = None;
-
-    loop {
-        let timeout = Some(Duration::ZERO);
-        let status = event_loop.pump_events(timeout, |event, event_loop| {
-            if let Event::WindowEvent { event, .. } = &event {
-                // Print only Window events to reduce noise
-                println!("{event:?}");
-            }
-
-            match event {
-                Event::Resumed => {
-                    let window_attributes =
-                        Window::default_attributes().with_title("A fantastic window!");
-                    window = Some(event_loop.create_window(window_attributes).unwrap());
-                }
-                Event::WindowEvent { event, .. } => {
-                    let window = window.as_ref().unwrap();
-                    match event {
-                        WindowEvent::CloseRequested => event_loop.exit(),
-                        WindowEvent::RedrawRequested => fill::fill_window(window),
-                        _ => (),
-                    }
-                }
-                Event::AboutToWait => {
-                    window.as_ref().unwrap().request_redraw();
-                }
-                _ => (),
-            }
-        });
-
-        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.");
-}

examples/run_on_demand.rs

@@ -1,90 +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<(), impl std::error::Error> {
-    use std::time::Duration;
-
-    use winit::{
-        error::EventLoopError,
-        event::{Event, WindowEvent},
-        event_loop::EventLoop,
-        platform::run_on_demand::EventLoopExtRunOnDemand,
-        window::{Window, WindowId},
-    };
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    #[derive(Default)]
-    struct App {
-        window_id: Option<WindowId>,
-        window: Option<Window>,
-    }
-
-    tracing_subscriber::fmt::init();
-    let mut event_loop = EventLoop::new().unwrap();
-
-    fn run_app(event_loop: &mut EventLoop<()>, idx: usize) -> Result<(), EventLoopError> {
-        let mut app = App::default();
-
-        event_loop.run_on_demand(move |event, event_loop| {
-            println!("Run {idx}: {:?}", event);
-
-            if let Some(window) = &app.window {
-                match event {
-                    Event::WindowEvent {
-                        event: WindowEvent::CloseRequested,
-                        window_id,
-                    } if window.id() == window_id => {
-                        println!("--------------------------------------------------------- Window {idx} CloseRequested");
-                        fill::cleanup_window(window);
-                        app.window = None;
-                    }
-                    Event::AboutToWait => window.request_redraw(),
-                    Event::WindowEvent {
-                        event: WindowEvent::RedrawRequested,
-                        ..
-                    }  => {
-                        fill::fill_window(window);
-                    }
-                    _ => (),
-                }
-            } else if let Some(id) = app.window_id {
-                match event {
-                    Event::WindowEvent {
-                        event: WindowEvent::Destroyed,
-                        window_id,
-                    } if id == window_id => {
-                        println!("--------------------------------------------------------- Window {idx} Destroyed");
-                        app.window_id = None;
-                        event_loop.exit();
-                    }
-                    _ => (),
-                }
-            } else if let Event::Resumed = event {
-                let window_attributes = Window::default_attributes()
-                        .with_title("Fantastic window number one!")
-                        .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0));
-                let window = event_loop.create_window(window_attributes).unwrap();
-                app.window_id = Some(window.id());
-                app.window = Some(window);
-            }
-        })
-    }
-
-    run_app(&mut event_loop, 1)?;
-
-    println!("--------------------------------------------------------- Finished first loop");
-    println!("--------------------------------------------------------- Waiting 5 seconds");
-    std::thread::sleep(Duration::from_secs(5));
-
-    let ret = run_app(&mut event_loop, 2);
-    println!("--------------------------------------------------------- Finished second loop");
-    ret
-}
-
-#[cfg(not(any(windows_platform, macos_platform, x11_platform, wayland_platform,)))]
-fn main() {
-    println!("This example is not supported on this platform");
-}

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(),
+            _ => ()
+        }
+    });
+}

examples/util/fill.rs

@@ -1,116 +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;
-pub use platform::fill_window;
-
-#[cfg(all(feature = "rwh_05", not(any(target_os = "android", target_os = "ios"))))]
-mod platform {
-    use std::cell::RefCell;
-    use std::collections::HashMap;
-    use std::mem::ManuallyDrop;
-    use std::num::NonZeroU32;
-
-    use softbuffer::{Context, Surface};
-    use winit::window::Window;
-    use winit::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: Context,
-
-        /// The hash map of window IDs to surfaces.
-        surfaces: HashMap<WindowId, Surface>,
-    }
-
-    impl GraphicsContext {
-        fn new(w: &Window) -> Self {
-            Self {
-                context: unsafe { Context::new(w) }.expect("Failed to create a softbuffer context"),
-                surfaces: HashMap::new(),
-            }
-        }
-
-        fn create_surface(&mut self, window: &Window) -> &mut Surface {
-            self.surfaces.entry(window.id()).or_insert_with(|| {
-                unsafe { Surface::new(&self.context, window) }
-                    .expect("Failed to create a softbuffer surface")
-            })
-        }
-
-        fn destroy_surface(&mut self, window: &Window) {
-            self.surfaces.remove(&window.id());
-        }
-    }
-
-    pub fn fill_window(window: &Window) {
-        GC.with(|gc| {
-            let size = window.inner_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.
-            const DARK_GRAY: u32 = 0xFF181818;
-
-            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(DARK_GRAY);
-            buffer
-                .present()
-                .expect("Failed to present the softbuffer buffer");
-        })
-    }
-
-    #[allow(dead_code)]
-    pub fn cleanup_window(window: &Window) {
-        GC.with(|gc| {
-            let mut gc = gc.borrow_mut();
-            if let Some(context) = gc.as_mut() {
-                context.destroy_surface(window);
-            }
-        });
-    }
-}
-
-#[cfg(not(all(feature = "rwh_05", not(any(target_os = "android", target_os = "ios")))))]
-mod platform {
-    pub fn fill_window(_window: &winit::window::Window) {
-        // No-op on mobile platforms.
-    }
-
-    #[allow(dead_code)]
-    pub fn cleanup_window(_window: &winit::window::Window) {
-        // No-op on mobile platforms.
-    }
-}

examples/window.rs

@@ -1,980 +1,19 @@
-//! Simple winit application.
+extern crate winit;
 
-use std::collections::HashMap;
-use std::error::Error;
-use std::fmt;
-use std::fmt::Debug;
-#[cfg(not(any(android_platform, ios_platform)))]
-use std::num::NonZeroU32;
-use std::path::Path;
+fn main() {
+    let events_loop = winit::EventsLoop::new();
 
-use cursor_icon::CursorIcon;
-#[cfg(not(any(android_platform, ios_platform)))]
-use rwh_05::HasRawDisplayHandle;
-#[cfg(not(any(android_platform, ios_platform)))]
-use softbuffer::{Context, Surface};
+    let window = winit::WindowBuilder::new()
+        .with_title("A fantastic window!")
+        .build(&events_loop)
+        .unwrap();
 
-use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize};
-use winit::event::{DeviceEvent, DeviceId, Event, Ime, WindowEvent};
-use winit::event::{MouseButton, MouseScrollDelta};
-use winit::event_loop::{ActiveEventLoop, EventLoop};
-use winit::keyboard::{Key, ModifiersState};
-use winit::window::{
-    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
-    Theme,
-};
-use winit::window::{Window, WindowId};
-
-#[cfg(macos_platform)]
-use winit::platform::macos::{OptionAsAlt, WindowAttributesExtMacOS, WindowExtMacOS};
-#[cfg(any(x11_platform, wayland_platform))]
-use winit::platform::startup_notify::{
-    self, EventLoopExtStartupNotify, WindowAttributesExtStartupNotify, WindowExtStartupNotify,
-};
-
-/// The amount of points to around the window for drag resize direction calculations.
-const BORDER_SIZE: f64 = 20.;
-
-fn main() -> Result<(), Box<dyn Error>> {
-    let event_loop = EventLoop::<UserEvent>::with_user_event().build()?;
-    let _event_loop_proxy = event_loop.create_proxy();
-
-    // Wire the user event from another thread.
-    #[cfg(not(web_platform))]
-    std::thread::spawn(move || {
-        // Wake up the `event_loop` once every second and dispatch a custom event
-        // from a different thread.
-        println!("Starting to send user event every second");
-        loop {
-            let _ = _event_loop_proxy.send_event(UserEvent::WakeUp);
-            std::thread::sleep(std::time::Duration::from_secs(1));
-        }
-    });
-
-    let mut state = Application::new(&event_loop);
-
-    event_loop.run(move |event, event_loop| match event {
-        Event::NewEvents(_) => (),
-        Event::Resumed => {
-            println!("Resumed the event loop");
-            state.dump_monitors(event_loop);
-
-            // Create initial window.
-            state
-                .create_window(event_loop, None)
-                .expect("failed to create initial window");
-
-            state.print_help();
-        }
-        Event::AboutToWait => {
-            if state.windows.is_empty() {
-                println!("No windows left, exiting...");
-                event_loop.exit();
-            }
-        }
-        Event::WindowEvent { window_id, event } => {
-            state.handle_window_event(event_loop, window_id, event)
-        }
-        Event::DeviceEvent { device_id, event } => {
-            state.handle_device_event(event_loop, device_id, event)
-        }
-        Event::UserEvent(event) => {
-            println!("User event: {event:?}");
-        }
-        Event::Suspended | Event::LoopExiting | Event::MemoryWarning => (),
-    })?;
-
-    Ok(())
-}
-
-#[allow(dead_code)]
-#[derive(Debug, Clone, Copy)]
-enum UserEvent {
-    WakeUp,
-}
-
-/// Application state and event handling.
-struct Application {
-    /// Custom cursors assets.
-    custom_cursors: Vec<CustomCursor>,
-    /// Application icon.
-    icon: Icon,
-    windows: HashMap<WindowId, WindowState>,
-    /// Drawing context.
-    ///
-    /// With OpenGL it could be EGLDisplay.
-    #[cfg(not(any(android_platform, ios_platform)))]
-    context: Context,
-}
-
-impl Application {
-    fn new<T>(event_loop: &EventLoop<T>) -> Self {
-        // SAFETY: the context is dropped inside the loop, since the state we're using
-        // is moved inside the closure.
-        #[cfg(not(any(android_platform, ios_platform)))]
-        let context = unsafe { Context::from_raw(event_loop.raw_display_handle()).unwrap() };
-
-        // You'll have to choose an icon size at your own discretion. On X11, the desired size varies
-        // by WM, and on Windows, you still have to account for screen scaling. Here we use 32px,
-        // since it seems to work well enough in most cases. Be careful about going too high, or
-        // you'll be bitten by the low-quality downscaling built into the WM.
-        let path = concat!(env!("CARGO_MANIFEST_DIR"), "/examples/data/icon.png");
-
-        let icon = load_icon(Path::new(path));
-
-        println!("Loading cursor assets");
-        let custom_cursors = vec![
-            event_loop.create_custom_cursor(decode_cursor(include_bytes!("data/cross.png"))),
-            event_loop.create_custom_cursor(decode_cursor(include_bytes!("data/cross2.png"))),
-            event_loop.create_custom_cursor(decode_cursor(include_bytes!("data/gradient.png"))),
-        ];
-
-        Self {
-            #[cfg(not(any(android_platform, ios_platform)))]
-            context,
-            custom_cursors,
-            icon,
-            windows: Default::default(),
-        }
-    }
-
-    fn create_window(
-        &mut self,
-        event_loop: &ActiveEventLoop,
-        _tab_id: Option<String>,
-    ) -> Result<WindowId, Box<dyn Error>> {
-        // TODO read-out activation token.
-
-        #[allow(unused_mut)]
-        let mut window_attributes = Window::default_attributes()
-            .with_title("Winit window")
-            .with_transparent(true)
-            .with_window_icon(Some(self.icon.clone()));
-
-        #[cfg(any(x11_platform, wayland_platform))]
-        if let Some(token) = event_loop.read_token_from_env() {
-            startup_notify::reset_activation_token_env();
-            println!("Using token {:?} to activate a window", token);
-            window_attributes = window_attributes.with_activation_token(token);
-        }
-
-        #[cfg(macos_platform)]
-        if let Some(tab_id) = _tab_id {
-            window_attributes = window_attributes.with_tabbing_identifier(&tab_id);
-        }
-
-        let window = event_loop.create_window(window_attributes)?;
-
-        #[cfg(ios_platform)]
-        {
-            use winit::platform::ios::WindowExtIOS;
-            window.recognize_doubletap_gesture(true);
-            window.recognize_pinch_gesture(true);
-            window.recognize_rotation_gesture(true);
-        }
-
-        let window_state = WindowState::new(self, window)?;
-        let window_id = window_state.window.id();
-        println!("Created new window with id={window_id:?}");
-        self.windows.insert(window_id, window_state);
-        Ok(window_id)
-    }
-
-    fn handle_action(&mut self, event_loop: &ActiveEventLoop, window_id: WindowId, action: Action) {
-        // let cursor_position = self.cursor_position;
-        let window = self.windows.get_mut(&window_id).unwrap();
-        println!("Executing action: {action:?}");
-        match action {
-            Action::CloseWindow => {
-                let _ = self.windows.remove(&window_id);
-            }
-            Action::CreateNewWindow => {
-                #[cfg(any(x11_platform, wayland_platform))]
-                if let Err(err) = window.window.request_activation_token() {
-                    println!("Failed to get activation token: {err}");
-                } else {
-                    return;
-                }
-
-                if let Err(err) = self.create_window(event_loop, None) {
-                    eprintln!("Error creating new window: {err}");
-                }
-            }
-            Action::ToggleResizeIncrements => window.toggle_resize_increments(),
-            Action::ToggleCursorVisibility => window.toggle_cursor_visibility(),
-            Action::ToggleResizable => window.toggle_resizable(),
-            Action::ToggleDecorations => window.toggle_decorations(),
-            Action::ToggleFullscreen => window.toggle_fullscreen(),
-            Action::ToggleMaximize => window.toggle_maximize(),
-            Action::ToggleImeInput => window.toggle_ime(),
-            Action::Minimize => window.minimize(),
-            Action::NextCursor => window.next_cursor(),
-            Action::NextCustomCursor => window.next_custom_cursor(&self.custom_cursors),
-            Action::CycleCursorGrab => window.cycle_cursor_grab(),
-            Action::DragWindow => window.drag_window(),
-            Action::DragResizeWindow => window.drag_resize_window(),
-            Action::ShowWindowMenu => window.show_menu(),
-            Action::PrintHelp => self.print_help(),
-            #[cfg(macos_platform)]
-            Action::CycleOptionAsAlt => window.cycle_option_as_alt(),
-            #[cfg(macos_platform)]
-            Action::CreateNewTab => {
-                let tab_id = window.window.tabbing_identifier();
-                if let Err(err) = self.create_window(event_loop, Some(tab_id)) {
-                    eprintln!("Error creating new window: {err}");
-                }
-            }
-        }
-    }
-
-    fn handle_window_event(
-        &mut self,
-        event_loop: &ActiveEventLoop,
-        window_id: WindowId,
-        event: WindowEvent,
-    ) {
-        let window = match self.windows.get_mut(&window_id) {
-            Some(window) => window,
-            None => return,
-        };
+    events_loop.run_forever(|event| {
+        println!("{:?}", event);
 
         match event {
-            WindowEvent::Resized(size) => {
-                window.resize(size);
-            }
-            WindowEvent::Focused(focused) => {
-                if focused {
-                    println!("Window={window_id:?} fosused");
-                } else {
-                    println!("Window={window_id:?} unfosused");
-                }
-            }
-            WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
-                println!("Window={window_id:?} changed scale to {scale_factor}");
-            }
-            WindowEvent::ThemeChanged(theme) => {
-                println!("Theme changed to {theme:?}");
-                window.set_theme(theme);
-            }
-            WindowEvent::RedrawRequested => {
-                if let Err(err) = window.draw() {
-                    eprintln!("Error drawing window: {err}");
-                }
-            }
-            WindowEvent::Occluded(occluded) => {
-                window.set_occluded(occluded);
-            }
-            WindowEvent::CloseRequested => {
-                println!("Closing Window={window_id:?}");
-                self.windows.remove(&window_id);
-            }
-            WindowEvent::ModifiersChanged(modifiers) => {
-                window.modifiers = modifiers.state();
-                println!("Modifiers changed to {:?}", window.modifiers);
-            }
-            WindowEvent::MouseWheel { delta, .. } => match delta {
-                MouseScrollDelta::LineDelta(x, y) => {
-                    println!("Mouse wheel Line Delta: ({x},{y})");
-                }
-                MouseScrollDelta::PixelDelta(px) => {
-                    println!("Mouse wheel Pixel Delta: ({},{})", px.x, px.y);
-                }
-            },
-            WindowEvent::KeyboardInput {
-                event,
-                is_synthetic: false,
-                ..
-            } => {
-                let mods = window.modifiers;
-
-                // Dispatch actions only on press.
-                if event.state.is_pressed() {
-                    let action = if let Key::Character(ch) = event.logical_key.as_ref() {
-                        Self::process_key_binding(&ch.to_uppercase(), &mods)
-                    } else {
-                        None
-                    };
-
-                    if let Some(action) = action {
-                        self.handle_action(event_loop, window_id, action);
-                    }
-                }
-            }
-            WindowEvent::MouseInput { button, state, .. } => {
-                let mods = window.modifiers;
-                if let Some(action) = state
-                    .is_pressed()
-                    .then(|| Self::process_mouse_binding(button, &mods))
-                    .flatten()
-                {
-                    self.handle_action(event_loop, window_id, action);
-                }
-            }
-            WindowEvent::CursorLeft { .. } => {
-                println!("Cursor left Window={window_id:?}");
-                window.cursor_left();
-            }
-            WindowEvent::CursorMoved { position, .. } => {
-                println!("Moved cursor to {position:?}");
-                window.cursor_moved(position);
-            }
-            WindowEvent::ActivationTokenDone { token: _token, .. } => {
-                #[cfg(any(x11_platform, wayland_platform))]
-                {
-                    startup_notify::set_activation_token_env(_token);
-                    if let Err(err) = self.create_window(event_loop, None) {
-                        eprintln!("Error creating new window: {err}");
-                    }
-                }
-            }
-            WindowEvent::Ime(event) => match event {
-                Ime::Enabled => println!("IME enabled for Window={window_id:?}"),
-                Ime::Preedit(text, caret_pos) => {
-                    println!("Preedit: {}, with caret at {:?}", text, caret_pos);
-                }
-                Ime::Commit(text) => {
-                    println!("Commited: {}", text);
-                }
-                Ime::Disabled => println!("IME disabled for Window={window_id:?}"),
-            },
-            WindowEvent::PinchGesture { delta, .. } => {
-                window.zoom += delta;
-                let zoom = window.zoom;
-                if delta > 0.0 {
-                    println!("Zoomed in {delta:.5} (now: {zoom:.5})");
-                } else {
-                    println!("Zoomed out {delta:.5} (now: {zoom:.5})");
-                }
-            }
-            WindowEvent::RotationGesture { delta, .. } => {
-                window.rotated += delta;
-                let rotated = window.rotated;
-                if delta > 0.0 {
-                    println!("Rotated counterclockwise {delta:.5} (now: {rotated:.5})");
-                } else {
-                    println!("Rotated clockwise {delta:.5} (now: {rotated:.5})");
-                }
-            }
-            WindowEvent::DoubleTapGesture { .. } => {
-                println!("Smart zoom");
-            }
-            WindowEvent::TouchpadPressure { .. }
-            | WindowEvent::HoveredFileCancelled
-            | WindowEvent::KeyboardInput { .. }
-            | WindowEvent::CursorEntered { .. }
-            | WindowEvent::AxisMotion { .. }
-            | WindowEvent::DroppedFile(_)
-            | WindowEvent::HoveredFile(_)
-            | WindowEvent::Destroyed
-            | WindowEvent::Touch(_)
-            | WindowEvent::Moved(_) => (),
+            winit::Event::WindowEvent { event: winit::WindowEvent::Closed, .. } => events_loop.interrupt(),
+            _ => ()
         }
-    }
-
-    fn handle_device_event(&mut self, _: &ActiveEventLoop, _: DeviceId, event: DeviceEvent) {
-        println!("Device event: {event:?}");
-    }
-
-    fn dump_monitors(&self, event_loop: &ActiveEventLoop) {
-        println!("Monitors information");
-        let primary_monitor = event_loop.primary_monitor();
-        for monitor in event_loop.available_monitors() {
-            let intro = if primary_monitor.as_ref() == Some(&monitor) {
-                "Primary monitor"
-            } else {
-                "Monitor"
-            };
-
-            if let Some(name) = monitor.name() {
-                println!("{intro}: {name}");
-            } else {
-                println!("{intro}: [no name]");
-            }
-
-            let PhysicalSize { width, height } = monitor.size();
-            print!("  Current mode: {width}x{height}");
-            if let Some(m_hz) = monitor.refresh_rate_millihertz() {
-                println!(" @ {}.{} Hz", m_hz / 1000, m_hz % 1000);
-            } else {
-                println!();
-            }
-
-            let PhysicalPosition { x, y } = monitor.position();
-            println!("  Position: {x},{y}");
-
-            println!("  Scale factor: {}", monitor.scale_factor());
-
-            println!("  Available modes (width x height x bit-depth):");
-            for mode in monitor.video_modes() {
-                let PhysicalSize { width, height } = mode.size();
-                let bits = mode.bit_depth();
-                let m_hz = mode.refresh_rate_millihertz();
-                println!(
-                    "    {width}x{height}x{bits} @ {}.{} Hz",
-                    m_hz / 1000,
-                    m_hz % 1000
-                );
-            }
-        }
-    }
-
-    /// Process the key binding.
-    fn process_key_binding(key: &str, mods: &ModifiersState) -> Option<Action> {
-        KEY_BINDINGS.iter().find_map(|binding| {
-            binding
-                .is_triggered_by(&key, mods)
-                .then_some(binding.action)
-        })
-    }
-
-    /// Process mouse binding.
-    fn process_mouse_binding(button: MouseButton, mods: &ModifiersState) -> Option<Action> {
-        MOUSE_BINDINGS.iter().find_map(|binding| {
-            binding
-                .is_triggered_by(&button, mods)
-                .then_some(binding.action)
-        })
-    }
-
-    fn print_help(&self) {
-        println!("Keyboard bindings:");
-        for binding in KEY_BINDINGS {
-            println!(
-                "{}{:<10} - {} ({})",
-                modifiers_to_string(binding.mods),
-                binding.trigger,
-                binding.action,
-                binding.action.help(),
-            );
-        }
-        println!("Mouse bindings:");
-        for binding in MOUSE_BINDINGS {
-            println!(
-                "{}{:<10} - {} ({})",
-                modifiers_to_string(binding.mods),
-                mouse_button_to_string(binding.trigger),
-                binding.action,
-                binding.action.help(),
-            );
-        }
-    }
+    });
 }
-
-/// State of the window.
-struct WindowState {
-    /// IME input.
-    ime: bool,
-    /// Render surface.
-    ///
-    /// NOTE: This surface must be dropped before the `Window`.
-    #[cfg(not(any(android_platform, ios_platform)))]
-    surface: Surface,
-    /// The actual winit Window.
-    window: Window,
-    /// The window theme we're drawing with.
-    theme: Theme,
-    /// Cursor position over the window.
-    cursor_position: Option<PhysicalPosition<f64>>,
-    /// Window modifiers state.
-    modifiers: ModifiersState,
-    /// Occlusion state of the window.
-    occluded: bool,
-    /// Current cursor grab mode.
-    cursor_grab: CursorGrabMode,
-    /// The amount of zoom into window.
-    zoom: f64,
-    /// The amount of rotation of the window.
-    rotated: f32,
-
-    #[cfg(macos_platform)]
-    option_as_alt: OptionAsAlt,
-
-    // Cursor states.
-    named_idx: usize,
-    custom_idx: usize,
-    cursor_hidden: bool,
-}
-
-impl WindowState {
-    fn new(application: &Application, window: Window) -> Result<Self, Box<dyn Error>> {
-        // SAFETY: the surface is dropped before the `window` which provided it with handle, thus
-        // it doesn't outlive it.
-        #[cfg(not(any(android_platform, ios_platform)))]
-        let surface = unsafe { Surface::new(&application.context, &window)? };
-
-        let theme = window.theme().unwrap_or(Theme::Dark);
-        println!("Theme: {theme:?}");
-        let named_idx = 0;
-        window.set_cursor(CURSORS[named_idx]);
-
-        // Allow IME out of the box.
-        let ime = true;
-        window.set_ime_allowed(ime);
-
-        let size = window.inner_size();
-        let mut state = Self {
-            #[cfg(macos_platform)]
-            option_as_alt: window.option_as_alt(),
-            custom_idx: application.custom_cursors.len() - 1,
-            cursor_grab: CursorGrabMode::None,
-            named_idx,
-            #[cfg(not(any(android_platform, ios_platform)))]
-            surface,
-            window,
-            theme,
-            ime,
-            cursor_position: Default::default(),
-            cursor_hidden: Default::default(),
-            modifiers: Default::default(),
-            occluded: Default::default(),
-            rotated: Default::default(),
-            zoom: Default::default(),
-        };
-
-        state.resize(size);
-        Ok(state)
-    }
-
-    pub fn toggle_ime(&mut self) {
-        self.ime = !self.ime;
-        self.window.set_ime_allowed(self.ime);
-        if let Some(position) = self.ime.then_some(self.cursor_position).flatten() {
-            self.window
-                .set_ime_cursor_area(position, PhysicalSize::new(20, 20));
-        }
-    }
-
-    pub fn minimize(&mut self) {
-        self.window.set_minimized(true);
-    }
-
-    pub fn cursor_moved(&mut self, position: PhysicalPosition<f64>) {
-        self.cursor_position = Some(position);
-        if self.ime {
-            self.window
-                .set_ime_cursor_area(position, PhysicalSize::new(20, 20));
-        }
-    }
-
-    pub fn cursor_left(&mut self) {
-        self.cursor_position = None;
-    }
-
-    /// Toggle maximized.
-    fn toggle_maximize(&self) {
-        let maximized = self.window.is_maximized();
-        self.window.set_maximized(!maximized);
-    }
-
-    /// Toggle window decorations.
-    fn toggle_decorations(&self) {
-        let decorated = self.window.is_decorated();
-        self.window.set_decorations(!decorated);
-    }
-
-    /// Toggle window resizable state.
-    fn toggle_resizable(&self) {
-        let resizable = self.window.is_resizable();
-        self.window.set_resizable(!resizable);
-    }
-
-    /// Toggle cursor visibility
-    fn toggle_cursor_visibility(&mut self) {
-        self.cursor_hidden = !self.cursor_hidden;
-        self.window.set_cursor_visible(!self.cursor_hidden);
-    }
-
-    /// Toggle resize increments on a window.
-    fn toggle_resize_increments(&mut self) {
-        let new_increments = match self.window.resize_increments() {
-            Some(_) => None,
-            None => Some(LogicalSize::new(25.0, 25.0)),
-        };
-        println!("Had increments: {}", new_increments.is_none());
-        self.window.set_resize_increments(new_increments);
-    }
-
-    /// Toggle fullscreen.
-    fn toggle_fullscreen(&self) {
-        let fullscreen = if self.window.fullscreen().is_some() {
-            None
-        } else {
-            Some(Fullscreen::Borderless(None))
-        };
-
-        self.window.set_fullscreen(fullscreen);
-    }
-
-    /// Cycle through the grab modes ignoring errors.
-    fn cycle_cursor_grab(&mut self) {
-        self.cursor_grab = match self.cursor_grab {
-            CursorGrabMode::None => CursorGrabMode::Confined,
-            CursorGrabMode::Confined => CursorGrabMode::Locked,
-            CursorGrabMode::Locked => CursorGrabMode::None,
-        };
-        println!("Changing cursor grab mode to {:?}", self.cursor_grab);
-        if let Err(err) = self.window.set_cursor_grab(self.cursor_grab) {
-            eprintln!("Error setting cursor grab: {err}");
-        }
-    }
-
-    #[cfg(macos_platform)]
-    fn cycle_option_as_alt(&mut self) {
-        self.option_as_alt = match self.option_as_alt {
-            OptionAsAlt::None => OptionAsAlt::OnlyLeft,
-            OptionAsAlt::OnlyLeft => OptionAsAlt::OnlyRight,
-            OptionAsAlt::OnlyRight => OptionAsAlt::Both,
-            OptionAsAlt::Both => OptionAsAlt::None,
-        };
-        println!("Setting option as alt {:?}", self.option_as_alt);
-        self.window.set_option_as_alt(self.option_as_alt);
-    }
-
-    /// Pick the next cursor.
-    fn next_cursor(&mut self) {
-        self.named_idx = (self.named_idx + 1) % CURSORS.len();
-        println!("Setting cursor to \"{:?}\"", CURSORS[self.named_idx]);
-        self.window
-            .set_cursor(Cursor::Icon(CURSORS[self.named_idx]));
-    }
-
-    /// Pick the next custom cursor.
-    fn next_custom_cursor(&mut self, custom_cursors: &[CustomCursor]) {
-        self.custom_idx = (self.custom_idx + 1) % custom_cursors.len();
-        let cursor = Cursor::Custom(custom_cursors[self.custom_idx].clone());
-        self.window.set_cursor(cursor);
-    }
-
-    /// Resize the window to the new size.
-    fn resize(&mut self, _size: PhysicalSize<u32>) {
-        #[cfg(not(any(android_platform, ios_platform)))]
-        {
-            let (width, height) =
-                match (NonZeroU32::new(_size.width), NonZeroU32::new(_size.height)) {
-                    (Some(width), Some(height)) => (width, height),
-                    _ => return,
-                };
-            self.surface
-                .resize(width, height)
-                .expect("failed to resize inner buffer");
-        }
-        self.window.request_redraw();
-    }
-
-    /// Change the theme.
-    fn set_theme(&mut self, theme: Theme) {
-        self.theme = theme;
-        self.window.request_redraw();
-    }
-
-    /// Show window menu.
-    fn show_menu(&self) {
-        if let Some(position) = self.cursor_position {
-            self.window.show_window_menu(position);
-        }
-    }
-
-    /// Drag the window.
-    fn drag_window(&self) {
-        if let Err(err) = self.window.drag_window() {
-            println!("Error starting window drag: {err}");
-        } else {
-            println!("Dragging window Window={:?}", self.window.id());
-        }
-    }
-
-    /// Drag-resize the window.
-    fn drag_resize_window(&self) {
-        let position = match self.cursor_position {
-            Some(position) => position,
-            None => {
-                println!("Drag-resize requires cursor to be inside the window");
-                return;
-            }
-        };
-
-        let win_size = self.window.inner_size();
-        let border_size = BORDER_SIZE * self.window.scale_factor();
-
-        let x_direction = if position.x < border_size {
-            ResizeDirection::West
-        } else if position.x > (win_size.width as f64 - border_size) {
-            ResizeDirection::East
-        } else {
-            // Use arbitrary direction instead of None for simplicity.
-            ResizeDirection::SouthEast
-        };
-
-        let y_direction = if position.y < border_size {
-            ResizeDirection::North
-        } else if position.y > (win_size.height as f64 - border_size) {
-            ResizeDirection::South
-        } else {
-            // Use arbitrary direction instead of None for simplicity.
-            ResizeDirection::SouthEast
-        };
-
-        let direction = match (x_direction, y_direction) {
-            (ResizeDirection::West, ResizeDirection::North) => ResizeDirection::NorthWest,
-            (ResizeDirection::West, ResizeDirection::South) => ResizeDirection::SouthWest,
-            (ResizeDirection::West, _) => ResizeDirection::West,
-            (ResizeDirection::East, ResizeDirection::North) => ResizeDirection::NorthEast,
-            (ResizeDirection::East, ResizeDirection::South) => ResizeDirection::SouthEast,
-            (ResizeDirection::East, _) => ResizeDirection::East,
-            (_, ResizeDirection::South) => ResizeDirection::South,
-            (_, ResizeDirection::North) => ResizeDirection::North,
-            _ => return,
-        };
-
-        if let Err(err) = self.window.drag_resize_window(direction) {
-            println!("Error starting window drag-resize: {err}");
-        } else {
-            println!("Drag-resizing window Window={:?}", self.window.id());
-        }
-    }
-
-    /// Change window occlusion state.
-    fn set_occluded(&mut self, occluded: bool) {
-        self.occluded = occluded;
-        if !occluded {
-            self.window.request_redraw();
-        }
-    }
-
-    /// Draw the window contents.
-    #[cfg(not(any(android_platform, ios_platform)))]
-    fn draw(&mut self) -> Result<(), Box<dyn Error>> {
-        if self.occluded {
-            println!("Skipping drawing occluded window={:?}", self.window.id());
-            return Ok(());
-        }
-
-        const WHITE: u32 = 0xFFFFFFFF;
-        const DARK_GRAY: u32 = 0xFF181818;
-
-        let color = match self.theme {
-            Theme::Light => WHITE,
-            Theme::Dark => DARK_GRAY,
-        };
-
-        let mut buffer = self.surface.buffer_mut()?;
-        buffer.fill(color);
-        self.window.pre_present_notify();
-        buffer.present()?;
-        Ok(())
-    }
-
-    #[cfg(any(android_platform, ios_platform))]
-    fn draw(&mut self) -> Result<(), Box<dyn Error>> {
-        println!("Drawing but without rendering...");
-        Ok(())
-    }
-}
-
-struct Binding<T: Eq> {
-    trigger: T,
-    mods: ModifiersState,
-    action: Action,
-}
-
-impl<T: Eq> Binding<T> {
-    const fn new(trigger: T, mods: ModifiersState, action: Action) -> Self {
-        Self {
-            trigger,
-            mods,
-            action,
-        }
-    }
-
-    fn is_triggered_by(&self, trigger: &T, mods: &ModifiersState) -> bool {
-        &self.trigger == trigger && &self.mods == mods
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Action {
-    CloseWindow,
-    ToggleCursorVisibility,
-    CreateNewWindow,
-    ToggleResizeIncrements,
-    ToggleImeInput,
-    ToggleDecorations,
-    ToggleResizable,
-    ToggleFullscreen,
-    ToggleMaximize,
-    Minimize,
-    NextCursor,
-    NextCustomCursor,
-    CycleCursorGrab,
-    PrintHelp,
-    DragWindow,
-    DragResizeWindow,
-    ShowWindowMenu,
-    #[cfg(macos_platform)]
-    CycleOptionAsAlt,
-    #[cfg(macos_platform)]
-    CreateNewTab,
-}
-
-impl Action {
-    fn help(&self) -> &'static str {
-        match self {
-            Action::CloseWindow => "Close window",
-            Action::ToggleCursorVisibility => "Hide cursor",
-            Action::CreateNewWindow => "Create new window",
-            Action::ToggleImeInput => "Toggle IME input",
-            Action::ToggleDecorations => "Toggle decorations",
-            Action::ToggleResizable => "Toggle window resizable state",
-            Action::ToggleFullscreen => "Toggle fullscreen",
-            Action::ToggleMaximize => "Maximize",
-            Action::Minimize => "Minimize",
-            Action::ToggleResizeIncrements => "Use resize increments when resizing window",
-            Action::NextCursor => "Advance the cursor to the next value",
-            Action::NextCustomCursor => "Advance custom cursor to the next value",
-            Action::CycleCursorGrab => "Cycle through cursor grab mode",
-            Action::PrintHelp => "Print help",
-            Action::DragWindow => "Start window drag",
-            Action::DragResizeWindow => "Start window drag-resize",
-            Action::ShowWindowMenu => "Show window menu",
-            #[cfg(macos_platform)]
-            Action::CycleOptionAsAlt => "Cycle option as alt mode",
-            #[cfg(macos_platform)]
-            Action::CreateNewTab => "Create new tab",
-        }
-    }
-}
-
-impl fmt::Display for Action {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Debug::fmt(&self, f)
-    }
-}
-
-fn decode_cursor(bytes: &[u8]) -> CustomCursorSource {
-    let img = image::load_from_memory(bytes).unwrap().to_rgba8();
-    let samples = img.into_flat_samples();
-    let (_, w, h) = samples.extents();
-    let (w, h) = (w as u16, h as u16);
-    CustomCursor::from_rgba(samples.samples, w, h, w / 2, h / 2).unwrap()
-}
-
-fn load_icon(path: &Path) -> Icon {
-    let (icon_rgba, icon_width, icon_height) = {
-        let image = image::open(path)
-            .expect("Failed to open icon path")
-            .into_rgba8();
-        let (width, height) = image.dimensions();
-        let rgba = image.into_raw();
-        (rgba, width, height)
-    };
-    Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
-}
-
-fn modifiers_to_string(mods: ModifiersState) -> String {
-    let mut mods_line = String::new();
-    // Always add + since it's printed as a part of the bindings.
-    for (modifier, desc) in [
-        (ModifiersState::SUPER, "Super+"),
-        (ModifiersState::ALT, "Alt+"),
-        (ModifiersState::CONTROL, "Ctrl+"),
-        (ModifiersState::SHIFT, "Shift+"),
-    ] {
-        if !mods.contains(modifier) {
-            continue;
-        }
-
-        mods_line.push_str(desc);
-    }
-    mods_line
-}
-
-fn mouse_button_to_string(button: MouseButton) -> &'static str {
-    match button {
-        MouseButton::Left => "LMB",
-        MouseButton::Right => "RMB",
-        MouseButton::Middle => "MMB",
-        MouseButton::Back => "Back",
-        MouseButton::Forward => "Forward",
-        MouseButton::Other(_) => "",
-    }
-}
-
-/// Cursor list to cycle through.
-const CURSORS: &[CursorIcon] = &[
-    CursorIcon::Default,
-    CursorIcon::Crosshair,
-    CursorIcon::Pointer,
-    CursorIcon::Move,
-    CursorIcon::Text,
-    CursorIcon::Wait,
-    CursorIcon::Help,
-    CursorIcon::Progress,
-    CursorIcon::NotAllowed,
-    CursorIcon::ContextMenu,
-    CursorIcon::Cell,
-    CursorIcon::VerticalText,
-    CursorIcon::Alias,
-    CursorIcon::Copy,
-    CursorIcon::NoDrop,
-    CursorIcon::Grab,
-    CursorIcon::Grabbing,
-    CursorIcon::AllScroll,
-    CursorIcon::ZoomIn,
-    CursorIcon::ZoomOut,
-    CursorIcon::EResize,
-    CursorIcon::NResize,
-    CursorIcon::NeResize,
-    CursorIcon::NwResize,
-    CursorIcon::SResize,
-    CursorIcon::SeResize,
-    CursorIcon::SwResize,
-    CursorIcon::WResize,
-    CursorIcon::EwResize,
-    CursorIcon::NsResize,
-    CursorIcon::NeswResize,
-    CursorIcon::NwseResize,
-    CursorIcon::ColResize,
-    CursorIcon::RowResize,
-];
-
-const KEY_BINDINGS: &[Binding<&'static str>] = &[
-    Binding::new("Q", ModifiersState::CONTROL, Action::CloseWindow),
-    Binding::new("H", ModifiersState::CONTROL, Action::PrintHelp),
-    Binding::new("F", ModifiersState::CONTROL, Action::ToggleFullscreen),
-    Binding::new("D", ModifiersState::CONTROL, Action::ToggleDecorations),
-    Binding::new("I", ModifiersState::CONTROL, Action::ToggleImeInput),
-    Binding::new("L", ModifiersState::CONTROL, Action::CycleCursorGrab),
-    Binding::new("P", ModifiersState::CONTROL, Action::ToggleResizeIncrements),
-    Binding::new("R", ModifiersState::CONTROL, Action::ToggleResizable),
-    // M.
-    Binding::new("M", ModifiersState::CONTROL, Action::ToggleMaximize),
-    Binding::new("M", ModifiersState::ALT, Action::Minimize),
-    // N.
-    Binding::new("N", ModifiersState::CONTROL, Action::CreateNewWindow),
-    // C.
-    Binding::new("C", ModifiersState::CONTROL, Action::NextCursor),
-    Binding::new("C", ModifiersState::ALT, Action::NextCustomCursor),
-    Binding::new("Z", ModifiersState::CONTROL, Action::ToggleCursorVisibility),
-    #[cfg(macos_platform)]
-    Binding::new("T", ModifiersState::SUPER, Action::CreateNewTab),
-    #[cfg(macos_platform)]
-    Binding::new("O", ModifiersState::CONTROL, Action::CycleOptionAsAlt),
-];
-
-const MOUSE_BINDINGS: &[Binding<MouseButton>] = &[
-    Binding::new(
-        MouseButton::Left,
-        ModifiersState::ALT,
-        Action::DragResizeWindow,
-    ),
-    Binding::new(
-        MouseButton::Left,
-        ModifiersState::CONTROL,
-        Action::DragWindow,
-    ),
-    Binding::new(
-        MouseButton::Right,
-        ModifiersState::CONTROL,
-        Action::ShowWindowMenu,
-    ),
-];

examples/x11_embed.rs

@@ -1,60 +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::{
-        event::{Event, WindowEvent},
-        event_loop::EventLoop,
-        platform::x11::WindowAttributesExtX11,
-        window::Window,
-    };
-
-    #[path = "util/fill.rs"]
-    mod fill;
-
-    // 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()?;
-
-    let mut window = None;
-    event_loop.run(move |event, event_loop| match event {
-        Event::Resumed => {
-            let window_attributes = Window::default_attributes()
-                .with_title("An embedded window!")
-                .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
-                .with_embed_parent_window(parent_window_id);
-
-            window = Some(event_loop.create_window(window_attributes).unwrap());
-        }
-        Event::WindowEvent { event, .. } => {
-            let window = window.as_ref().unwrap();
-
-            match event {
-                WindowEvent::CloseRequested => event_loop.exit(),
-                WindowEvent::RedrawRequested => {
-                    window.pre_present_notify();
-                    fill::fill_window(window);
-                }
-                _ => (),
-            }
-        }
-        Event::AboutToWait => {
-            window.as_ref().unwrap().request_redraw();
-        }
-        _ => (),
-    })?;
-
-    Ok(())
-}
-
-#[cfg(not(x11_platform))]
-fn main() -> Result<(), Box<dyn Error>> {
-    println!("This example is only supported on X11 platforms.");
-    Ok(())
-}

run-wasm/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "run-wasm"
-version = "0.1.0"
-rust-version.workspace = true
-repository.workspace = true
-license.workspace = true
-edition.workspace = true
-publish = false
-
-[dependencies]
-cargo-run-wasm = "0.2.0"

run-wasm/src/main.rs

@@ -1,3 +0,0 @@
-fn main() {
-    cargo_run_wasm::run_wasm_with_css("body { margin: 0px; }");
-}

rustfmt.toml

@@ -1,3 +0,0 @@
-force_explicit_abi=true
-use_field_init_shorthand=true
-# merge_imports=true

src/api_transition.rs

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

src/cursor.rs

@@ -1,289 +0,0 @@
-use core::fmt;
-use std::hash::Hasher;
-use std::sync::Arc;
-use std::{error::Error, hash::Hash};
-
-use cursor_icon::CursorIcon;
-
-use crate::platform_impl::{PlatformCustomCursor, PlatformCustomCursorSource};
-
-/// The maximum width and height for a cursor when using [`CustomCursor::from_rgba`].
-pub const MAX_CURSOR_SIZE: u16 = 2048;
-
-const PIXEL_SIZE: usize = 4;
-
-/// See [`Window::set_cursor()`](crate::window::Window::set_cursor) for more details.
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub enum Cursor {
-    Icon(CursorIcon),
-    Custom(CustomCursor),
-}
-
-impl Default for Cursor {
-    fn default() -> Self {
-        Self::Icon(CursorIcon::default())
-    }
-}
-
-impl From<CursorIcon> for Cursor {
-    fn from(icon: CursorIcon) -> Self {
-        Self::Icon(icon)
-    }
-}
-
-impl From<CustomCursor> for Cursor {
-    fn from(custom: CustomCursor) -> Self {
-        Self::Custom(custom)
-    }
-}
-
-/// Use a custom image as a cursor (mouse pointer).
-///
-/// Is guaranteed to be cheap to clone.
-///
-/// ## Platform-specific
-///
-/// **Web**: Some browsers have limits on cursor sizes usually at 128x128.
-///
-/// # Example
-///
-/// ```no_run
-/// # use winit::event_loop::ActiveEventLoop;
-/// # use winit::window::Window;
-/// # fn scope(event_loop: &ActiveEventLoop, window: &Window) {
-/// use winit::window::CustomCursor;
-///
-/// let w = 10;
-/// let h = 10;
-/// let rgba = vec![255; (w * h * 4) as usize];
-///
-/// #[cfg(not(target_family = "wasm"))]
-/// let source = CustomCursor::from_rgba(rgba, w, h, w / 2, h / 2).unwrap();
-///
-/// #[cfg(target_family = "wasm")]
-/// let source = {
-///     use winit::platform::web::CustomCursorExtWebSys;
-///     CustomCursor::from_url(String::from("http://localhost:3000/cursor.png"), 0, 0)
-/// };
-///
-/// let custom_cursor = event_loop.create_custom_cursor(source);
-///
-/// window.set_cursor(custom_cursor.clone());
-/// # }
-/// ```
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct CustomCursor {
-    /// Platforms should make sure this is cheap to clone.
-    pub(crate) inner: PlatformCustomCursor,
-}
-
-impl CustomCursor {
-    /// Creates a new cursor from an rgba buffer.
-    ///
-    /// The alpha channel is assumed to be **not** premultiplied.
-    pub fn from_rgba(
-        rgba: impl Into<Vec<u8>>,
-        width: u16,
-        height: u16,
-        hotspot_x: u16,
-        hotspot_y: u16,
-    ) -> Result<CustomCursorSource, BadImage> {
-        let _span = tracing::debug_span!(
-            "winit::Cursor::from_rgba",
-            width,
-            height,
-            hotspot_x,
-            hotspot_y
-        )
-        .entered();
-
-        Ok(CustomCursorSource {
-            inner: PlatformCustomCursorSource::from_rgba(
-                rgba.into(),
-                width,
-                height,
-                hotspot_x,
-                hotspot_y,
-            )?,
-        })
-    }
-}
-
-/// Source for [`CustomCursor`].
-///
-/// See [`CustomCursor`] for more details.
-#[derive(Debug)]
-pub struct CustomCursorSource {
-    pub(crate) inner: PlatformCustomCursorSource,
-}
-
-/// An error produced when using [`CustomCursor::from_rgba`] with invalid arguments.
-#[derive(Debug, Clone)]
-pub enum BadImage {
-    /// Produced when the image dimensions are larger than [`MAX_CURSOR_SIZE`]. This doesn't
-    /// guarantee that the cursor will work, but should avoid many platform and device specific
-    /// limits.
-    TooLarge { width: u16, height: u16 },
-    /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
-    /// safely interpreted as 32bpp RGBA pixels.
-    ByteCountNotDivisibleBy4 { byte_count: usize },
-    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
-    /// At least one of your arguments is incorrect.
-    DimensionsVsPixelCount {
-        width: u16,
-        height: u16,
-        width_x_height: u64,
-        pixel_count: u64,
-    },
-    /// Produced when the hotspot is outside the image bounds
-    HotspotOutOfBounds {
-        width: u16,
-        height: u16,
-        hotspot_x: u16,
-        hotspot_y: u16,
-    },
-}
-
-impl fmt::Display for BadImage {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            BadImage::TooLarge { width, height } => write!(f,
-                "The specified dimensions ({width:?}x{height:?}) are too large. The maximum is {MAX_CURSOR_SIZE:?}x{MAX_CURSOR_SIZE:?}.",
-            ),
-            BadImage::ByteCountNotDivisibleBy4 { byte_count } => write!(f,
-                "The length of the `rgba` argument ({byte_count:?}) isn't divisible by 4, making it impossible to interpret as 32bpp RGBA pixels.",
-            ),
-            BadImage::DimensionsVsPixelCount {
-                width,
-                height,
-                width_x_height,
-                pixel_count,
-            } => write!(f,
-                "The specified dimensions ({width:?}x{height:?}) don't match the number of pixels supplied by the `rgba` argument ({pixel_count:?}). For those dimensions, the expected pixel count is {width_x_height:?}.",
-            ),
-            BadImage::HotspotOutOfBounds {
-                width,
-                height,
-                hotspot_x,
-                hotspot_y,
-            } => write!(f,
-                "The specified hotspot ({hotspot_x:?}, {hotspot_y:?}) is outside the image bounds ({width:?}x{height:?}).",
-            ),
-        }
-    }
-}
-
-impl Error for BadImage {}
-
-/// Platforms export this directly as `PlatformCustomCursorSource` if they need to only work with
-/// images.
-#[allow(dead_code)]
-#[derive(Debug)]
-pub(crate) struct OnlyCursorImageSource(pub(crate) CursorImage);
-
-#[allow(dead_code)]
-impl OnlyCursorImageSource {
-    pub(crate) fn from_rgba(
-        rgba: Vec<u8>,
-        width: u16,
-        height: u16,
-        hotspot_x: u16,
-        hotspot_y: u16,
-    ) -> Result<Self, BadImage> {
-        CursorImage::from_rgba(rgba, width, height, hotspot_x, hotspot_y).map(Self)
-    }
-}
-
-/// Platforms export this directly as `PlatformCustomCursor` if they don't implement caching.
-#[derive(Debug, Clone)]
-pub(crate) struct OnlyCursorImage(pub(crate) Arc<CursorImage>);
-
-impl Hash for OnlyCursorImage {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        Arc::as_ptr(&self.0).hash(state);
-    }
-}
-
-impl PartialEq for OnlyCursorImage {
-    fn eq(&self, other: &Self) -> bool {
-        Arc::ptr_eq(&self.0, &other.0)
-    }
-}
-
-impl Eq for OnlyCursorImage {}
-
-#[derive(Debug)]
-#[allow(dead_code)]
-pub(crate) struct CursorImage {
-    pub(crate) rgba: Vec<u8>,
-    pub(crate) width: u16,
-    pub(crate) height: u16,
-    pub(crate) hotspot_x: u16,
-    pub(crate) hotspot_y: u16,
-}
-
-impl CursorImage {
-    pub(crate) fn from_rgba(
-        rgba: Vec<u8>,
-        width: u16,
-        height: u16,
-        hotspot_x: u16,
-        hotspot_y: u16,
-    ) -> Result<Self, BadImage> {
-        if width > MAX_CURSOR_SIZE || height > MAX_CURSOR_SIZE {
-            return Err(BadImage::TooLarge { width, height });
-        }
-
-        if rgba.len() % PIXEL_SIZE != 0 {
-            return Err(BadImage::ByteCountNotDivisibleBy4 {
-                byte_count: rgba.len(),
-            });
-        }
-
-        let pixel_count = (rgba.len() / PIXEL_SIZE) as u64;
-        let width_x_height = width as u64 * height as u64;
-        if pixel_count != width_x_height {
-            return Err(BadImage::DimensionsVsPixelCount {
-                width,
-                height,
-                width_x_height,
-                pixel_count,
-            });
-        }
-
-        if hotspot_x >= width || hotspot_y >= height {
-            return Err(BadImage::HotspotOutOfBounds {
-                width,
-                height,
-                hotspot_x,
-                hotspot_y,
-            });
-        }
-
-        Ok(CursorImage {
-            rgba,
-            width,
-            height,
-            hotspot_x,
-            hotspot_y,
-        })
-    }
-}
-
-// Platforms that don't support cursors will export this as `PlatformCustomCursor`.
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct NoCustomCursor;
-
-#[allow(dead_code)]
-impl NoCustomCursor {
-    pub(crate) fn from_rgba(
-        rgba: Vec<u8>,
-        width: u16,
-        height: u16,
-        hotspot_x: u16,
-        hotspot_y: u16,
-    ) -> Result<Self, BadImage> {
-        CursorImage::from_rgba(rgba, width, height, hotspot_x, hotspot_y)?;
-        Ok(Self)
-    }
-}

src/error.rs

@@ -1,139 +0,0 @@
-use std::{error, fmt};
-
-use crate::platform_impl;
-
-// TODO: Rename
-/// An error that may be generated when requesting Winit state
-#[derive(Debug)]
-pub enum ExternalError {
-    /// The operation is not supported by the backend.
-    NotSupported(NotSupportedError),
-    /// The operation was ignored.
-    Ignored,
-    /// The OS cannot perform the operation.
-    Os(OsError),
-}
-
-/// The error type for when the requested operation is not supported by the backend.
-#[derive(Clone)]
-pub struct NotSupportedError {
-    _marker: (),
-}
-
-/// The error type for when the OS cannot perform the requested operation.
-#[derive(Debug)]
-pub struct OsError {
-    line: u32,
-    file: &'static str,
-    error: platform_impl::OsError,
-}
-
-/// A general error that may occur while running the Winit event loop
-#[derive(Debug)]
-pub enum EventLoopError {
-    /// The operation is not supported by the backend.
-    NotSupported(NotSupportedError),
-    /// The OS cannot perform the operation.
-    Os(OsError),
-    /// The event loop can't be re-created.
-    RecreationAttempt,
-    /// Application has exit with an error status.
-    ExitFailure(i32),
-}
-
-impl From<OsError> for EventLoopError {
-    fn from(value: OsError) -> Self {
-        Self::Os(value)
-    }
-}
-
-impl NotSupportedError {
-    #[inline]
-    #[allow(dead_code)]
-    pub(crate) fn new() -> NotSupportedError {
-        NotSupportedError { _marker: () }
-    }
-}
-
-impl OsError {
-    #[allow(dead_code)]
-    pub(crate) fn new(line: u32, file: &'static str, error: platform_impl::OsError) -> OsError {
-        OsError { line, file, error }
-    }
-}
-
-#[allow(unused_macros)]
-macro_rules! os_error {
-    ($error:expr) => {{
-        crate::error::OsError::new(line!(), file!(), $error)
-    }};
-}
-
-impl fmt::Display for OsError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.pad(&format!(
-            "os error at {}:{}: {}",
-            self.file, self.line, self.error
-        ))
-    }
-}
-
-impl fmt::Display for ExternalError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            ExternalError::NotSupported(e) => e.fmt(f),
-            ExternalError::Ignored => write!(f, "Operation was ignored"),
-            ExternalError::Os(e) => e.fmt(f),
-        }
-    }
-}
-
-impl fmt::Debug for NotSupportedError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.debug_struct("NotSupportedError").finish()
-    }
-}
-
-impl fmt::Display for NotSupportedError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.pad("the requested operation is not supported by Winit")
-    }
-}
-
-impl fmt::Display for EventLoopError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            EventLoopError::RecreationAttempt => write!(f, "EventLoop can't be recreated"),
-            EventLoopError::NotSupported(e) => e.fmt(f),
-            EventLoopError::Os(e) => e.fmt(f),
-            EventLoopError::ExitFailure(status) => write!(f, "Exit Failure: {status}"),
-        }
-    }
-}
-
-impl error::Error for OsError {}
-impl error::Error for ExternalError {}
-impl error::Error for NotSupportedError {}
-impl error::Error for EventLoopError {}
-
-#[cfg(test)]
-mod tests {
-    #![allow(clippy::redundant_clone)]
-
-    use super::*;
-
-    // Eat attributes for testing
-    #[test]
-    fn ensure_fmt_does_not_panic() {
-        let _ = format!(
-            "{:?}, {}",
-            NotSupportedError::new(),
-            NotSupportedError::new().clone()
-        );
-        let _ = format!(
-            "{:?}, {}",
-            ExternalError::NotSupported(NotSupportedError::new()),
-            ExternalError::NotSupported(NotSupportedError::new())
-        );
-    }
-}

src/event_loop.rs

@@ -1,632 +0,0 @@
-//! The [`EventLoop`] struct and assorted supporting types, including
-//! [`ControlFlow`].
-//!
-//! If you want to send custom events to the event loop, use
-//! [`EventLoop::create_proxy`] to acquire an [`EventLoopProxy`] and call its
-//! [`send_event`](`EventLoopProxy::send_event`) method.
-//!
-//! See the root-level documentation for information on how to create and use an event loop to
-//! handle events.
-use std::marker::PhantomData;
-#[cfg(any(x11_platform, wayland_platform))]
-use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::{error, fmt};
-
-#[cfg(not(web_platform))]
-use std::time::{Duration, Instant};
-#[cfg(web_platform)]
-use web_time::{Duration, Instant};
-
-use crate::error::{EventLoopError, OsError};
-use crate::window::{CustomCursor, CustomCursorSource, Window, WindowAttributes};
-use crate::{event::Event, monitor::MonitorHandle, platform_impl};
-
-/// Provides a way to retrieve events from the system and from the windows that were registered to
-/// the events loop.
-///
-/// An `EventLoop` can be seen more or less as a "context". Calling [`EventLoop::new`]
-/// initializes everything that will be required to create windows. For example on Linux creating
-/// an event loop opens a connection to the X or Wayland server.
-///
-/// To wake up an `EventLoop` from a another thread, see the [`EventLoopProxy`] docs.
-///
-/// Note that this cannot be shared across threads (due to platform-dependant logic
-/// forbidding it), as such it is neither [`Send`] nor [`Sync`]. If you need cross-thread access, the
-/// [`Window`] created from this _can_ be sent to an other thread, and the
-/// [`EventLoopProxy`] allows you to wake up an `EventLoop` from another thread.
-///
-/// [`Window`]: crate::window::Window
-pub struct EventLoop<T: 'static> {
-    pub(crate) event_loop: platform_impl::EventLoop<T>,
-    pub(crate) _marker: PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-/// Target that associates windows with an [`EventLoop`].
-///
-/// This type exists to allow you to create new windows while Winit executes
-/// your callback.
-pub struct ActiveEventLoop {
-    pub(crate) p: platform_impl::ActiveEventLoop,
-    pub(crate) _marker: PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-/// Object that allows building the event loop.
-///
-/// This is used to make specifying options that affect the whole application
-/// easier. But note that constructing multiple event loops is not supported.
-///
-/// This can be created using [`EventLoop::new`] or [`EventLoop::with_user_event`].
-#[derive(Default)]
-pub struct EventLoopBuilder<T: 'static> {
-    pub(crate) platform_specific: platform_impl::PlatformSpecificEventLoopAttributes,
-    _p: PhantomData<T>,
-}
-
-static EVENT_LOOP_CREATED: AtomicBool = AtomicBool::new(false);
-
-impl EventLoopBuilder<()> {
-    /// Start building a new event loop.
-    #[inline]
-    #[deprecated = "use `EventLoop::builder` instead"]
-    pub fn new() -> Self {
-        EventLoop::builder()
-    }
-}
-
-impl<T> EventLoopBuilder<T> {
-    /// Builds a new event loop.
-    ///
-    /// ***For cross-platform compatibility, the [`EventLoop`] must be created on the main thread,
-    /// and only once per application.***
-    ///
-    /// Calling this function will result in display backend initialisation.
-    ///
-    /// ## Panics
-    ///
-    /// Attempting to create the event loop off the main thread will panic. This
-    /// restriction isn't strictly necessary on all platforms, but is imposed to
-    /// eliminate any nasty surprises when porting to platforms that require it.
-    /// `EventLoopBuilderExt::any_thread` functions are exposed in the relevant
-    /// [`platform`] module if the target platform supports creating an event
-    /// loop on any thread.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Wayland/X11:** to prevent running under `Wayland` or `X11` unset `WAYLAND_DISPLAY`
-    ///                    or `DISPLAY` respectively when building the event loop.
-    /// - **Android:** must be configured with an `AndroidApp` from `android_main()` by calling
-    ///     [`.with_android_app(app)`] before calling `.build()`, otherwise it'll panic.
-    ///
-    /// [`platform`]: crate::platform
-    #[cfg_attr(
-        android,
-        doc = "[`.with_android_app(app)`]: crate::platform::android::EventLoopBuilderExtAndroid::with_android_app"
-    )]
-    #[cfg_attr(
-        not(android),
-        doc = "[`.with_android_app(app)`]: #only-available-on-android"
-    )]
-    #[inline]
-    pub fn build(&mut self) -> Result<EventLoop<T>, EventLoopError> {
-        let _span = tracing::debug_span!("winit::EventLoopBuilder::build").entered();
-
-        if EVENT_LOOP_CREATED.swap(true, Ordering::Relaxed) {
-            return Err(EventLoopError::RecreationAttempt);
-        }
-
-        // Certain platforms accept a mutable reference in their API.
-        #[allow(clippy::unnecessary_mut_passed)]
-        Ok(EventLoop {
-            event_loop: platform_impl::EventLoop::new(&mut self.platform_specific)?,
-            _marker: PhantomData,
-        })
-    }
-
-    #[cfg(web_platform)]
-    pub(crate) fn allow_event_loop_recreation() {
-        EVENT_LOOP_CREATED.store(false, Ordering::Relaxed);
-    }
-}
-
-impl<T> fmt::Debug for EventLoop<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("EventLoop { .. }")
-    }
-}
-
-impl fmt::Debug for ActiveEventLoop {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("ActiveEventLoop { .. }")
-    }
-}
-
-/// Set through [`ActiveEventLoop::set_control_flow()`].
-///
-/// Indicates the desired behavior of the event loop after [`Event::AboutToWait`] is emitted.
-///
-/// Defaults to [`Wait`].
-///
-/// [`Wait`]: Self::Wait
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
-pub enum ControlFlow {
-    /// When the current loop iteration finishes, immediately begin a new iteration regardless of
-    /// whether or not new events are available to process.
-    Poll,
-
-    /// When the current loop iteration finishes, suspend the thread until another event arrives.
-    #[default]
-    Wait,
-
-    /// When the current loop iteration finishes, suspend the thread until either another event
-    /// arrives or the given time is reached.
-    ///
-    /// Useful for implementing efficient timers. Applications which want to render at the display's
-    /// native refresh rate should instead use [`Poll`] and the VSync functionality of a graphics API
-    /// to reduce odds of missed frames.
-    ///
-    /// [`Poll`]: Self::Poll
-    WaitUntil(Instant),
-}
-
-impl ControlFlow {
-    /// Creates a [`ControlFlow`] that waits until a timeout has expired.
-    ///
-    /// In most cases, this is set to [`WaitUntil`]. However, if the timeout overflows, it is
-    /// instead set to [`Wait`].
-    ///
-    /// [`WaitUntil`]: Self::WaitUntil
-    /// [`Wait`]: Self::Wait
-    pub fn wait_duration(timeout: Duration) -> Self {
-        match Instant::now().checked_add(timeout) {
-            Some(instant) => Self::WaitUntil(instant),
-            None => Self::Wait,
-        }
-    }
-}
-
-impl EventLoop<()> {
-    /// Create the event loop.
-    ///
-    /// This is an alias of `EventLoop::builder().build()`.
-    #[inline]
-    pub fn new() -> Result<EventLoop<()>, EventLoopError> {
-        Self::builder().build()
-    }
-
-    /// Start building a new event loop.
-    ///
-    /// This returns an [`EventLoopBuilder`], to allow configuring the event loop before creation.
-    ///
-    /// To get the actual event loop, call [`build`][EventLoopBuilder::build] on that.
-    #[inline]
-    pub fn builder() -> EventLoopBuilder<()> {
-        Self::with_user_event()
-    }
-}
-
-impl<T> EventLoop<T> {
-    /// Start building a new event loop, with the given type as the user event
-    /// type.
-    pub fn with_user_event() -> EventLoopBuilder<T> {
-        EventLoopBuilder {
-            platform_specific: Default::default(),
-            _p: PhantomData,
-        }
-    }
-
-    /// Runs the event loop in the calling thread and calls the given `event_handler` closure
-    /// to dispatch any pending events.
-    ///
-    /// See the [`set_control_flow()`] docs on how to change the event loop's behavior.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **iOS:** Will never return to the caller and so values not passed to this function will
-    ///   *not* be dropped before the process exits.
-    /// - **Web:** Will _act_ as if it never returns to the caller by throwing a Javascript exception
-    ///   (that Rust doesn't see) that will also mean that the rest of the function is never executed
-    ///   and any values not passed to this function will *not* be dropped.
-    ///
-    ///   Web applications are recommended to use
-    #[cfg_attr(
-        web_platform,
-        doc = "[`EventLoopExtWebSys::spawn()`][crate::platform::web::EventLoopExtWebSys::spawn()]"
-    )]
-    #[cfg_attr(not(web_platform), doc = "`EventLoopExtWebSys::spawn()`")]
-    ///   [^1] instead of [`run()`] to avoid the need
-    ///   for the Javascript exception trick, and to make it clearer that the event loop runs
-    ///   asynchronously (via the browser's own, internal, event loop) and doesn't block the
-    ///   current thread of execution like it does on other platforms.
-    ///
-    ///   This function won't be available with `target_feature = "exception-handling"`.
-    ///
-    /// [`set_control_flow()`]: ActiveEventLoop::set_control_flow()
-    /// [`run()`]: Self::run()
-    /// [^1]: `EventLoopExtWebSys::spawn()` is only available on Web.
-    #[inline]
-    #[cfg(not(all(web_platform, target_feature = "exception-handling")))]
-    pub fn run<F>(self, event_handler: F) -> Result<(), EventLoopError>
-    where
-        F: FnMut(Event<T>, &ActiveEventLoop),
-    {
-        let _span = tracing::debug_span!("winit::EventLoop::run").entered();
-
-        self.event_loop.run(event_handler)
-    }
-
-    /// Creates an [`EventLoopProxy`] that can be used to dispatch user events
-    /// to the main event loop, possibly from another thread.
-    pub fn create_proxy(&self) -> EventLoopProxy<T> {
-        EventLoopProxy {
-            event_loop_proxy: self.event_loop.create_proxy(),
-        }
-    }
-
-    /// Gets a persistent reference to the underlying platform display.
-    ///
-    /// See the [`OwnedDisplayHandle`] type for more information.
-    pub fn owned_display_handle(&self) -> OwnedDisplayHandle {
-        OwnedDisplayHandle {
-            platform: self.event_loop.window_target().p.owned_display_handle(),
-        }
-    }
-
-    /// Change if or when [`DeviceEvent`]s are captured.
-    ///
-    /// See [`ActiveEventLoop::listen_device_events`] for details.
-    ///
-    /// [`DeviceEvent`]: crate::event::DeviceEvent
-    pub fn listen_device_events(&self, allowed: DeviceEvents) {
-        let _span = tracing::debug_span!(
-            "winit::EventLoop::listen_device_events",
-            allowed = ?allowed
-        )
-        .entered();
-
-        self.event_loop
-            .window_target()
-            .p
-            .listen_device_events(allowed);
-    }
-
-    /// Sets the [`ControlFlow`].
-    pub fn set_control_flow(&self, control_flow: ControlFlow) {
-        self.event_loop
-            .window_target()
-            .p
-            .set_control_flow(control_flow)
-    }
-
-    /// Create a window.
-    ///
-    /// Creating window without event loop running often leads to improper window creation;
-    /// use [`ActiveEventLoop::create_window`] instead.
-    #[deprecated = "use `ActiveEventLoop::create_window` instead"]
-    #[inline]
-    pub fn create_window(&self, window_attributes: WindowAttributes) -> Result<Window, OsError> {
-        let _span = tracing::debug_span!(
-            "winit::EventLoop::create_window",
-            window_attributes = ?window_attributes
-        )
-        .entered();
-
-        let window =
-            platform_impl::Window::new(&self.event_loop.window_target().p, window_attributes)?;
-        Ok(Window { window })
-    }
-
-    /// Create custom cursor.
-    pub fn create_custom_cursor(&self, custom_cursor: CustomCursorSource) -> CustomCursor {
-        self.event_loop
-            .window_target()
-            .p
-            .create_custom_cursor(custom_cursor)
-    }
-}
-
-#[cfg(feature = "rwh_06")]
-impl<T> rwh_06::HasDisplayHandle for EventLoop<T> {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        rwh_06::HasDisplayHandle::display_handle(self.event_loop.window_target())
-    }
-}
-
-#[cfg(feature = "rwh_05")]
-unsafe impl<T> rwh_05::HasRawDisplayHandle for EventLoop<T> {
-    /// Returns a [`rwh_05::RawDisplayHandle`] for the event loop.
-    fn raw_display_handle(&self) -> rwh_05::RawDisplayHandle {
-        rwh_05::HasRawDisplayHandle::raw_display_handle(self.event_loop.window_target())
-    }
-}
-
-#[cfg(any(x11_platform, wayland_platform))]
-impl<T> AsFd for EventLoop<T> {
-    /// Get the underlying [EventLoop]'s `fd` which you can register
-    /// into other event loop, like [`calloop`] or [`mio`]. When doing so, the
-    /// loop must be polled with the [`pump_events`] API.
-    ///
-    /// [`calloop`]: https://crates.io/crates/calloop
-    /// [`mio`]: https://crates.io/crates/mio
-    /// [`pump_events`]: crate::platform::pump_events::EventLoopExtPumpEvents::pump_events
-    fn as_fd(&self) -> BorrowedFd<'_> {
-        self.event_loop.as_fd()
-    }
-}
-
-#[cfg(any(x11_platform, wayland_platform))]
-impl<T> AsRawFd for EventLoop<T> {
-    /// Get the underlying [EventLoop]'s raw `fd` which you can register
-    /// into other event loop, like [`calloop`] or [`mio`]. When doing so, the
-    /// loop must be polled with the [`pump_events`] API.
-    ///
-    /// [`calloop`]: https://crates.io/crates/calloop
-    /// [`mio`]: https://crates.io/crates/mio
-    /// [`pump_events`]: crate::platform::pump_events::EventLoopExtPumpEvents::pump_events
-    fn as_raw_fd(&self) -> RawFd {
-        self.event_loop.as_raw_fd()
-    }
-}
-
-impl ActiveEventLoop {
-    /// Create the window.
-    ///
-    /// Possible causes of error include denied permission, incompatible system, and lack of memory.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Web:** The window is created but not inserted into the web page automatically. Please
-    ///   see the web platform module for more information.
-    #[inline]
-    pub fn create_window(&self, window_attributes: WindowAttributes) -> Result<Window, OsError> {
-        let _span = tracing::debug_span!(
-            "winit::ActiveEventLoop::create_window",
-            window_attributes = ?window_attributes
-        )
-        .entered();
-
-        let window = platform_impl::Window::new(&self.p, window_attributes)?;
-        Ok(Window { window })
-    }
-
-    /// Create custom cursor.
-    pub fn create_custom_cursor(&self, custom_cursor: CustomCursorSource) -> CustomCursor {
-        let _span = tracing::debug_span!("winit::ActiveEventLoop::create_custom_cursor",).entered();
-
-        self.p.create_custom_cursor(custom_cursor)
-    }
-
-    /// Returns the list of all the monitors available on the system.
-    #[inline]
-    pub fn available_monitors(&self) -> impl Iterator<Item = MonitorHandle> {
-        let _span = tracing::debug_span!("winit::ActiveEventLoop::available_monitors",).entered();
-
-        #[allow(clippy::useless_conversion)] // false positive on some platforms
-        self.p
-            .available_monitors()
-            .into_iter()
-            .map(|inner| MonitorHandle { inner })
-    }
-
-    /// Returns the primary monitor of the system.
-    ///
-    /// Returns `None` if it can't identify any monitor as a primary one.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Wayland / Web:** Always returns `None`.
-    #[inline]
-    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
-        let _span = tracing::debug_span!("winit::ActiveEventLoop::primary_monitor",).entered();
-
-        self.p
-            .primary_monitor()
-            .map(|inner| MonitorHandle { inner })
-    }
-
-    /// Change if or when [`DeviceEvent`]s are captured.
-    ///
-    /// Since the [`DeviceEvent`] capture can lead to high CPU usage for unfocused windows, winit
-    /// will ignore them by default for unfocused windows on Linux/BSD. This method allows changing
-    /// this at runtime to explicitly capture them again.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Wayland / macOS / iOS / Android / Orbital:** Unsupported.
-    ///
-    /// [`DeviceEvent`]: crate::event::DeviceEvent
-    pub fn listen_device_events(&self, allowed: DeviceEvents) {
-        let _span = tracing::debug_span!(
-            "winit::ActiveEventLoop::listen_device_events",
-            allowed = ?allowed
-        )
-        .entered();
-
-        self.p.listen_device_events(allowed);
-    }
-
-    /// Sets the [`ControlFlow`].
-    pub fn set_control_flow(&self, control_flow: ControlFlow) {
-        self.p.set_control_flow(control_flow)
-    }
-
-    /// Gets the current [`ControlFlow`].
-    pub fn control_flow(&self) -> ControlFlow {
-        self.p.control_flow()
-    }
-
-    /// This exits the event loop.
-    ///
-    /// See [`LoopExiting`](Event::LoopExiting).
-    pub fn exit(&self) {
-        let _span = tracing::debug_span!("winit::ActiveEventLoop::exit",).entered();
-
-        self.p.exit()
-    }
-
-    /// Returns if the [`EventLoop`] is about to stop.
-    ///
-    /// See [`exit()`](Self::exit).
-    pub fn exiting(&self) -> bool {
-        self.p.exiting()
-    }
-
-    /// Gets a persistent reference to the underlying platform display.
-    ///
-    /// See the [`OwnedDisplayHandle`] type for more information.
-    pub fn owned_display_handle(&self) -> OwnedDisplayHandle {
-        OwnedDisplayHandle {
-            platform: self.p.owned_display_handle(),
-        }
-    }
-}
-
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = self.p.raw_display_handle_rwh_06()?;
-        // SAFETY: The display will never be deallocated while the event loop is alive.
-        Ok(unsafe { rwh_06::DisplayHandle::borrow_raw(raw) })
-    }
-}
-
-#[cfg(feature = "rwh_05")]
-unsafe impl rwh_05::HasRawDisplayHandle for ActiveEventLoop {
-    /// Returns a [`rwh_05::RawDisplayHandle`] for the event loop.
-    fn raw_display_handle(&self) -> rwh_05::RawDisplayHandle {
-        self.p.raw_display_handle_rwh_05()
-    }
-}
-
-/// A proxy for the underlying display handle.
-///
-/// The purpose of this type is to provide a cheaply clonable handle to the underlying
-/// display handle. This is often used by graphics APIs to connect to the underlying APIs.
-/// It is difficult to keep a handle to the [`EventLoop`] type or the [`ActiveEventLoop`]
-/// type. In contrast, this type involves no lifetimes and can be persisted for as long as
-/// needed.
-///
-/// For all platforms, this is one of the following:
-///
-/// - A zero-sized type that is likely optimized out.
-/// - A reference-counted pointer to the underlying type.
-#[derive(Clone)]
-pub struct OwnedDisplayHandle {
-    #[cfg_attr(not(any(feature = "rwh_05", feature = "rwh_06")), allow(dead_code))]
-    platform: platform_impl::OwnedDisplayHandle,
-}
-
-impl fmt::Debug for OwnedDisplayHandle {
-    #[inline]
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("OwnedDisplayHandle").finish_non_exhaustive()
-    }
-}
-
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
-    #[inline]
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = self.platform.raw_display_handle_rwh_06()?;
-
-        // SAFETY: The underlying display handle should be safe.
-        let handle = unsafe { rwh_06::DisplayHandle::borrow_raw(raw) };
-
-        Ok(handle)
-    }
-}
-
-#[cfg(feature = "rwh_05")]
-unsafe impl rwh_05::HasRawDisplayHandle for OwnedDisplayHandle {
-    #[inline]
-    fn raw_display_handle(&self) -> rwh_05::RawDisplayHandle {
-        self.platform.raw_display_handle_rwh_05()
-    }
-}
-
-/// Used to send custom events to [`EventLoop`].
-pub struct EventLoopProxy<T: 'static> {
-    event_loop_proxy: platform_impl::EventLoopProxy<T>,
-}
-
-impl<T: 'static> Clone for EventLoopProxy<T> {
-    fn clone(&self) -> Self {
-        Self {
-            event_loop_proxy: self.event_loop_proxy.clone(),
-        }
-    }
-}
-
-impl<T: 'static> EventLoopProxy<T> {
-    /// Send an event to the [`EventLoop`] from which this proxy was created. This emits a
-    /// `UserEvent(event)` event in the event loop, where `event` is the value passed to this
-    /// function.
-    ///
-    /// Returns an `Err` if the associated [`EventLoop`] no longer exists.
-    ///
-    /// [`UserEvent(event)`]: Event::UserEvent
-    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
-        let _span = tracing::debug_span!("winit::EventLoopProxy::send_event",).entered();
-
-        self.event_loop_proxy.send_event(event)
-    }
-}
-
-impl<T: 'static> fmt::Debug for EventLoopProxy<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("EventLoopProxy { .. }")
-    }
-}
-
-/// The error that is returned when an [`EventLoopProxy`] attempts to wake up an [`EventLoop`] that
-/// no longer exists.
-///
-/// Contains the original event given to [`EventLoopProxy::send_event`].
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct EventLoopClosed<T>(pub T);
-
-impl<T> fmt::Display for EventLoopClosed<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("Tried to wake up a closed `EventLoop`")
-    }
-}
-
-impl<T: fmt::Debug> error::Error for EventLoopClosed<T> {}
-
-/// Control when device events are captured.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Default)]
-pub enum DeviceEvents {
-    /// Report device events regardless of window focus.
-    Always,
-    /// Only capture device events while the window is focused.
-    #[default]
-    WhenFocused,
-    /// Never capture device events.
-    Never,
-}
-
-/// A unique identifier of the winit's async request.
-///
-/// This could be used to identify the async request once it's done
-/// and a specific action must be taken.
-///
-/// One of the handling scenarios could be to maintain a working list
-/// containing [`AsyncRequestSerial`] and some closure associated with it.
-/// Then once event is arriving the working list is being traversed and a job
-/// executed and removed from the list.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AsyncRequestSerial {
-    serial: usize,
-}
-
-impl AsyncRequestSerial {
-    // TODO(kchibisov): Remove `cfg` when the clipboard will be added.
-    #[allow(dead_code)]
-    pub(crate) fn get() -> Self {
-        static CURRENT_SERIAL: AtomicUsize = AtomicUsize::new(0);
-        // NOTE: We rely on wrap around here, while the user may just request
-        // in the loop usize::MAX times that's issue is considered on them.
-        let serial = CURRENT_SERIAL.fetch_add(1, Ordering::Relaxed);
-        Self { serial }
-    }
-}

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
+}

src/icon.rs

@@ -1,127 +0,0 @@
-use crate::platform_impl::PlatformIcon;
-use std::{error::Error, fmt, io, mem};
-
-#[repr(C)]
-#[derive(Debug)]
-pub(crate) struct Pixel {
-    pub(crate) r: u8,
-    pub(crate) g: u8,
-    pub(crate) b: u8,
-    pub(crate) a: u8,
-}
-
-pub(crate) const PIXEL_SIZE: usize = mem::size_of::<Pixel>();
-
-#[derive(Debug)]
-/// An error produced when using [`Icon::from_rgba`] with invalid arguments.
-pub enum BadIcon {
-    /// Produced when the length of the `rgba` argument isn't divisible by 4, thus `rgba` can't be
-    /// safely interpreted as 32bpp RGBA pixels.
-    ByteCountNotDivisibleBy4 { byte_count: usize },
-    /// Produced when the number of pixels (`rgba.len() / 4`) isn't equal to `width * height`.
-    /// At least one of your arguments is incorrect.
-    DimensionsVsPixelCount {
-        width: u32,
-        height: u32,
-        width_x_height: usize,
-        pixel_count: usize,
-    },
-    /// Produced when underlying OS functionality failed to create the icon
-    OsError(io::Error),
-}
-
-impl fmt::Display for BadIcon {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            BadIcon::ByteCountNotDivisibleBy4 { byte_count } => write!(f,
-                "The length of the `rgba` argument ({byte_count:?}) isn't divisible by 4, making it impossible to interpret as 32bpp RGBA pixels.",
-            ),
-            BadIcon::DimensionsVsPixelCount {
-                width,
-                height,
-                width_x_height,
-                pixel_count,
-            } => write!(f,
-                "The specified dimensions ({width:?}x{height:?}) don't match the number of pixels supplied by the `rgba` argument ({pixel_count:?}). For those dimensions, the expected pixel count is {width_x_height:?}.",
-            ),
-            BadIcon::OsError(e) => write!(f, "OS error when instantiating the icon: {e:?}"),
-        }
-    }
-}
-
-impl Error for BadIcon {}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct RgbaIcon {
-    pub(crate) rgba: Vec<u8>,
-    pub(crate) width: u32,
-    pub(crate) height: u32,
-}
-
-/// For platforms which don't have window icons (e.g. web)
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct NoIcon;
-
-#[allow(dead_code)] // These are not used on every platform
-mod constructors {
-    use super::*;
-
-    impl RgbaIcon {
-        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
-            if rgba.len() % PIXEL_SIZE != 0 {
-                return Err(BadIcon::ByteCountNotDivisibleBy4 {
-                    byte_count: rgba.len(),
-                });
-            }
-            let pixel_count = rgba.len() / PIXEL_SIZE;
-            if pixel_count != (width * height) as usize {
-                Err(BadIcon::DimensionsVsPixelCount {
-                    width,
-                    height,
-                    width_x_height: (width * height) as usize,
-                    pixel_count,
-                })
-            } else {
-                Ok(RgbaIcon {
-                    rgba,
-                    width,
-                    height,
-                })
-            }
-        }
-    }
-
-    impl NoIcon {
-        pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
-            // Create the rgba icon anyway to validate the input
-            let _ = RgbaIcon::from_rgba(rgba, width, height)?;
-            Ok(NoIcon)
-        }
-    }
-}
-
-/// An icon used for the window titlebar, taskbar, etc.
-#[derive(Clone)]
-pub struct Icon {
-    pub(crate) inner: PlatformIcon,
-}
-
-impl fmt::Debug for Icon {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        fmt::Debug::fmt(&self.inner, formatter)
-    }
-}
-
-impl Icon {
-    /// Creates an icon from 32bpp RGBA data.
-    ///
-    /// The length of `rgba` must be divisible by 4, and `width * height` must equal
-    /// `rgba.len() / 4`. Otherwise, this will return a `BadIcon` error.
-    pub fn from_rgba(rgba: Vec<u8>, width: u32, height: u32) -> Result<Self, BadIcon> {
-        let _span = tracing::debug_span!("winit::Icon::from_rgba", width, height).entered();
-
-        Ok(Icon {
-            inner: PlatformIcon::from_rgba(rgba, width, height)?,
-        })
-    }
-}

src/lib.rs

@@ -1,215 +1,404 @@
-//! Winit is a cross-platform window creation and event loop management library.
+//! Winit allows you to build a window on as many platforms as possible. 
 //!
-//! # Building windows
+//! # Building a window
 //!
-//! Before you can create a [`Window`], you first need to build an [`EventLoop`]. This is done with
-//! the [`EventLoop::new()`] function.
+//! 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::event_loop::EventLoop;
-//! let event_loop = EventLoop::new().unwrap();
+//! use winit::EventsLoop;
+//! let events_loop = EventsLoop::new();
 //! ```
 //!
-//! Then you create a [`Window`] with [`create_window`].
+//! Once this is done there are two ways to create a window:
 //!
-//! # Event handling
+//!  - Calling `Window::new(&events_loop)`.
+//!  - Calling `let builder = WindowBuilder::new()` then `builder.build(&events_loop)`.
 //!
-//! Once a [`Window`] has been created, it will generate different *events*. A [`Window`] object can
-//! generate [`WindowEvent`]s when certain input events occur, such as a cursor moving over the
-//! window or a key getting pressed while the window is focused. Devices can generate
-//! [`DeviceEvent`]s, which contain unfiltered event data that isn't specific to a certain window.
-//! Some user activity, like mouse movement, can generate both a [`WindowEvent`] *and* a
-//! [`DeviceEvent`]. You can also create and handle your own custom [`Event::UserEvent`]s, if desired.
+//! The first way is the simpliest way and will give you default values for everything.
 //!
-//! You can retrieve events by calling [`EventLoop::run()`]. This function will
-//! dispatch events for every [`Window`] that was created with that particular [`EventLoop`], and
-//! will run until [`exit()`] is used, at which point [`Event::LoopExiting`].
+//! 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.
 //!
-//! Winit no longer uses a `EventLoop::poll_events() -> impl Iterator<Event>`-based event loop
-//! model, since that can't be implemented properly on some platforms (e.g web, iOS) and works poorly on
-//! most other platforms. However, this model can be re-implemented to an extent with
-#![cfg_attr(
-    any(
-        windows_platform,
-        macos_platform,
-        android_platform,
-        x11_platform,
-        wayland_platform
-    ),
-    doc = "[`EventLoopExtPumpEvents::pump_events()`][platform::pump_events::EventLoopExtPumpEvents::pump_events()]"
-)]
-#![cfg_attr(
-    not(any(
-        windows_platform,
-        macos_platform,
-        android_platform,
-        x11_platform,
-        wayland_platform
-    )),
-    doc = "`EventLoopExtPumpEvents::pump_events()`"
-)]
-//! [^1]. See that method's documentation for more reasons about why
-//! it's discouraged beyond compatibility reasons.
+//! # 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::{Event, WindowEvent},
-//!     event_loop::{ControlFlow, EventLoop},
-//!     window::Window,
-//! };
+//! use winit::Event;
+//! use winit::WindowEvent;
+//! # use winit::EventsLoop;
+//! # let events_loop = EventsLoop::new();
 //!
-//! let event_loop = EventLoop::new().unwrap();
-//!
-//! // ControlFlow::Poll continuously runs the event loop, even if the OS hasn't
-//! // dispatched any events. This is ideal for games and similar applications.
-//! event_loop.set_control_flow(ControlFlow::Poll);
-//!
-//! // ControlFlow::Wait pauses the event loop if no events are available to process.
-//! // This is ideal for non-game applications that only update in response to user
-//! // input, and uses significantly less power/CPU time than ControlFlow::Poll.
-//! event_loop.set_control_flow(ControlFlow::Wait);
-//!
-//! let mut window = None;
-//!
-//! event_loop.run(move |event, event_loop| {
-//!     match event {
-//!         Event::Resumed => {
-//!             window = Some(event_loop.create_window(Window::default_attributes()).unwrap());
+//! loop {
+//!     events_loop.poll_events(|event| {
+//!         match event {
+//!             Event::WindowEvent { event: WindowEvent::Resized(w, h), .. } => {
+//!                 println!("The window was resized to {}x{}", w, h);
+//!             },
+//!             _ => ()
 //!         }
-//!         Event::WindowEvent {
-//!             event: WindowEvent::CloseRequested,
-//!             ..
-//!         } => {
-//!             println!("The close button was pressed; stopping");
-//!             event_loop.exit();
-//!         },
-//!         Event::AboutToWait => {
-//!             // Application update code.
+//!     });
+//! }
+//! ```
 //!
-//!             // Queue a RedrawRequested event.
-//!             //
-//!             // You only need to call this if you've determined that you need to redraw in
-//!             // applications which do not always need to. Applications that redraw continuously
-//!             // can render here instead.
-//!             window.as_ref().unwrap().request_redraw();
-//!         },
-//!         Event::WindowEvent {
-//!             event: 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.
+//! 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();
 //!         },
 //!         _ => ()
 //!     }
 //! });
 //! ```
 //!
-//! [`WindowEvent`] has a [`WindowId`] member. In multi-window environments, it should be
-//! compared to the value returned by [`Window::id()`] to determine which [`Window`]
-//! dispatched the event.
+//! 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 directly provide any methods for drawing on a [`Window`]. However, it allows you to
-//! retrieve the raw handle of the window and display (see the [`platform`] module and/or the
-//! [`raw_window_handle`] and [`raw_display_handle`] methods), which in turn allows
-//! you to create an OpenGL/Vulkan/DirectX/Metal/etc. context that can be used to render graphics.
+//! 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.
 //!
-//! Note that many platforms will display garbage data in the window's client area if the
-//! application doesn't render anything to the window by the time the desktop compositor is ready to
-//! display the window to the user. If you notice this happening, you should create the window with
-//! [`visible` set to `false`](crate::window::WindowAttributes::with_visible) and explicitly make the
-//! window visible only once you're ready to render into it.
-//!
-//! # UI scaling
-//!
-//! UI scaling is important, go read the docs for the [`dpi`] crate for an
-//! introduction.
-//!
-//! All of Winit's functions return physical types, but can take either logical or physical
-//! coordinates as input, allowing you to use the most convenient coordinate system for your
-//! particular application.
-//!
-//! Winit will dispatch a [`ScaleFactorChanged`] event whenever a window's scale factor has changed.
-//! This can happen if the user drags their window from a standard-resolution monitor to a high-DPI
-//! monitor or if the user changes their DPI settings. This allows you to rescale your application's
-//! UI elements and adjust how the platform changes the window's size to reflect the new scale
-//! factor. If a window hasn't received a [`ScaleFactorChanged`] event, its scale factor
-//! can be found by calling [`window.scale_factor()`].
-//!
-//! [`ScaleFactorChanged`]: event::WindowEvent::ScaleFactorChanged
-//! [`window.scale_factor()`]: window::Window::scale_factor
-//!
-//! # Cargo Features
-//!
-//! Winit provides the following Cargo features:
-//!
-//! * `x11` (enabled by default): On Unix platforms, enables the X11 backend.
-//! * `wayland` (enabled by default): On Unix platforms, enables the Wayland
-//!   backend.
-//! * `rwh_04`: Implement `raw-window-handle v0.4` traits.
-//! * `rwh_05`: Implement `raw-window-handle v0.5` traits.
-//! * `rwh_06`: Implement `raw-window-handle v0.6` traits.
-//! * `serde`: Enables serialization/deserialization of certain types with
-//!   [Serde](https://crates.io/crates/serde).
-//! * `mint`: Enables mint (math interoperability standard types) conversions.
-//!
-//! See the [`platform`] module for documentation on platform-specific cargo
-//! features.
-//!
-//! [`EventLoop`]: event_loop::EventLoop
-//! [`EventLoop::new()`]: event_loop::EventLoop::new
-//! [`EventLoop::run()`]: event_loop::EventLoop::run
-//! [`exit()`]: event_loop::ActiveEventLoop::exit
-//! [`Window`]: window::Window
-//! [`WindowId`]: window::WindowId
-//! [`WindowAttributes`]: window::WindowAttributes
-//! [window_new]: window::Window::new
-//! [`create_window`]: event_loop::ActiveEventLoop::create_window
-//! [`Window::id()`]: window::Window::id
-//! [`WindowEvent`]: event::WindowEvent
-//! [`DeviceEvent`]: event::DeviceEvent
-//! [`Event::UserEvent`]: event::Event::UserEvent
-//! [`Event::LoopExiting`]: event::Event::LoopExiting
-//! [`raw_window_handle`]: ./window/struct.Window.html#method.raw_window_handle
-//! [`raw_display_handle`]: ./window/struct.Window.html#method.raw_display_handle
-//! [^1]: `EventLoopExtPumpEvents::pump_events()` is only available on Windows, macOS, Android, X11 and Wayland.
-
-#![deny(rust_2018_idioms)]
-#![deny(rustdoc::broken_intra_doc_links)]
-#![deny(clippy::all)]
-#![deny(unsafe_op_in_unsafe_fn)]
-#![cfg_attr(clippy, deny(warnings))]
-// Doc feature labels can be tested locally by running RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc
-#![cfg_attr(
-    docsrs,
-    feature(doc_auto_cfg, doc_cfg_hide),
-    doc(cfg_hide(doc, docsrs))
-)]
-#![allow(clippy::missing_safety_doc)]
-
-#[cfg(feature = "rwh_06")]
-pub use rwh_06 as raw_window_handle;
-
-// Re-export DPI types so that users don't have to put it in Cargo.toml.
-#[doc(inline)]
-pub use dpi;
 
 #[macro_use]
-pub mod error;
-mod cursor;
-pub mod event;
-pub mod event_loop;
-mod icon;
-pub mod keyboard;
-pub mod monitor;
-mod platform_impl;
-mod utils;
-pub mod window;
+extern crate lazy_static;
 
-pub mod platform;
+#[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
+    }
+}

src/monitor.rs

@@ -1,173 +0,0 @@
-//! Types useful for interacting with a user's monitors.
-//!
-//! If you want to get basic information about a monitor, you can use the
-//! [`MonitorHandle`] type. This is retrieved from one of the following
-//! methods, which return an iterator of [`MonitorHandle`]:
-//! - [`ActiveEventLoop::available_monitors`](crate::event_loop::ActiveEventLoop::available_monitors).
-//! - [`Window::available_monitors`](crate::window::Window::available_monitors).
-use crate::{
-    dpi::{PhysicalPosition, PhysicalSize},
-    platform_impl,
-};
-
-/// Deprecated! Use `VideoModeHandle` instead.
-#[deprecated = "Renamed to `VideoModeHandle`"]
-pub type VideoMode = VideoModeHandle;
-
-/// Describes a fullscreen video mode of a monitor.
-///
-/// Can be acquired with [`MonitorHandle::video_modes`].
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct VideoModeHandle {
-    pub(crate) video_mode: platform_impl::VideoModeHandle,
-}
-
-impl std::fmt::Debug for VideoModeHandle {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.video_mode.fmt(f)
-    }
-}
-
-impl PartialOrd for VideoModeHandle {
-    fn partial_cmp(&self, other: &VideoModeHandle) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for VideoModeHandle {
-    fn cmp(&self, other: &VideoModeHandle) -> std::cmp::Ordering {
-        self.monitor().cmp(&other.monitor()).then(
-            self.size()
-                .cmp(&other.size())
-                .then(
-                    self.refresh_rate_millihertz()
-                        .cmp(&other.refresh_rate_millihertz())
-                        .then(self.bit_depth().cmp(&other.bit_depth())),
-                )
-                .reverse(),
-        )
-    }
-}
-
-impl VideoModeHandle {
-    /// Returns the resolution of this video mode.
-    #[inline]
-    pub fn size(&self) -> PhysicalSize<u32> {
-        self.video_mode.size()
-    }
-
-    /// Returns the bit depth of this video mode, as in how many bits you have
-    /// available per color. This is generally 24 bits or 32 bits on modern
-    /// systems, depending on whether the alpha channel is counted or not.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Wayland / Orbital:** Always returns 32.
-    /// - **iOS:** Always returns 32.
-    #[inline]
-    pub fn bit_depth(&self) -> u16 {
-        self.video_mode.bit_depth()
-    }
-
-    /// Returns the refresh rate of this video mode in mHz.
-    #[inline]
-    pub fn refresh_rate_millihertz(&self) -> u32 {
-        self.video_mode.refresh_rate_millihertz()
-    }
-
-    /// Returns the monitor that this video mode is valid for. Each monitor has
-    /// a separate set of valid video modes.
-    #[inline]
-    pub fn monitor(&self) -> MonitorHandle {
-        MonitorHandle {
-            inner: self.video_mode.monitor(),
-        }
-    }
-}
-
-impl std::fmt::Display for VideoModeHandle {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}x{} @ {} mHz ({} bpp)",
-            self.size().width,
-            self.size().height,
-            self.refresh_rate_millihertz(),
-            self.bit_depth()
-        )
-    }
-}
-
-/// Handle to a monitor.
-///
-/// Allows you to retrieve information about a given monitor and can be used in [`Window`] creation.
-///
-/// [`Window`]: crate::window::Window
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct MonitorHandle {
-    pub(crate) inner: platform_impl::MonitorHandle,
-}
-
-impl MonitorHandle {
-    /// Returns a human-readable name of the monitor.
-    ///
-    /// Returns `None` if the monitor doesn't exist anymore.
-    #[inline]
-    pub fn name(&self) -> Option<String> {
-        self.inner.name()
-    }
-
-    /// Returns the monitor's resolution.
-    #[inline]
-    pub fn size(&self) -> PhysicalSize<u32> {
-        self.inner.size()
-    }
-
-    /// Returns the top-left corner position of the monitor relative to the larger full
-    /// screen area.
-    #[inline]
-    pub fn position(&self) -> PhysicalPosition<i32> {
-        self.inner.position()
-    }
-
-    /// The monitor refresh rate used by the system.
-    ///
-    /// Return `Some` if succeed, or `None` if failed, which usually happens when the monitor
-    /// the window is on is removed.
-    ///
-    /// When using exclusive fullscreen, the refresh rate of the [`VideoModeHandle`] that was
-    /// used to enter fullscreen should be used instead.
-    #[inline]
-    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
-        self.inner.refresh_rate_millihertz()
-    }
-
-    /// Returns the scale factor of the underlying monitor. To map logical pixels to physical
-    /// pixels and vice versa, use [`Window::scale_factor`].
-    ///
-    /// See the [`dpi`] module for more information.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **X11:** Can be overridden using the `WINIT_X11_SCALE_FACTOR` environment variable.
-    /// - **Wayland:** May differ from [`Window::scale_factor`].
-    /// - **Android:** Always returns 1.0.
-    ///
-    /// [`Window::scale_factor`]: crate::window::Window::scale_factor
-    #[inline]
-    pub fn scale_factor(&self) -> f64 {
-        self.inner.scale_factor()
-    }
-
-    /// Returns all fullscreen video modes supported by this monitor.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Web:** Always returns an empty iterator
-    #[inline]
-    pub fn video_modes(&self) -> impl Iterator<Item = VideoModeHandle> {
-        self.inner
-            .video_modes()
-            .map(|video_mode| VideoModeHandle { video_mode })
-    }
-}

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 {
+}

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
+    }
+}

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;

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
+    }
+}

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
+    }
+}

src/platform/android.rs

@@ -1,170 +0,0 @@
-//! # Android
-//!
-//! The Android backend builds on (and exposes types from) the [`ndk`](https://docs.rs/ndk/) crate.
-//!
-//! Native Android applications need some form of "glue" crate that is responsible
-//! for defining the main entry point for your Rust application as well as tracking
-//! various life-cycle events and synchronizing with the main JVM thread.
-//!
-//! Winit uses the [android-activity](https://docs.rs/android-activity/) as a
-//! glue crate (prior to `0.28` it used
-//! [ndk-glue](https://github.com/rust-windowing/android-ndk-rs/tree/master/ndk-glue)).
-//!
-//! The version of the glue crate that your application depends on _must_ match the
-//! version that Winit depends on because the glue crate is responsible for your
-//! application's main entry point. If Cargo resolves multiple versions, they will
-//! clash.
-//!
-//! `winit` glue compatibility table:
-//!
-//! | winit |       ndk-glue               |
-//! | :---: | :--------------------------: |
-//! | 0.29  | `android-activity = "0.5"`   |
-//! | 0.28  | `android-activity = "0.4"`   |
-//! | 0.27  | `ndk-glue = "0.7"`           |
-//! | 0.26  | `ndk-glue = "0.5"`           |
-//! | 0.25  | `ndk-glue = "0.3"`           |
-//! | 0.24  | `ndk-glue = "0.2"`           |
-//!
-//! The recommended way to avoid a conflict with the glue version is to avoid explicitly
-//! depending on the `android-activity` crate, and instead consume the API that
-//! is re-exported by Winit under `winit::platform::android::activity::*`
-//!
-//! Running on an Android device needs a dynamic system library. Add this to Cargo.toml:
-//!
-//! ```toml
-//! [lib]
-//! name = "main"
-//! crate-type = ["cdylib"]
-//! ```
-//!
-//! All Android applications are based on an `Activity` subclass, and the
-//! `android-activity` crate is designed to support different choices for this base
-//! class. Your application _must_ specify the base class it needs via a feature flag:
-//!
-//! | Base Class       | Feature Flag      |  Notes  |
-//! | :--------------: | :---------------: | :-----: |
-//! | `NativeActivity` | `android-native-activity` | Built-in to Android - it is possible to use without compiling any Java or Kotlin code. Java or Kotlin code may be needed to subclass `NativeActivity` to access some platform features. It does not derive from the [`AndroidAppCompat`] base class.|
-//! | [`GameActivity`] | `android-game-activity`   | Derives from [`AndroidAppCompat`], a defacto standard `Activity` base class that helps support a wider range of Android versions. Requires a build system that can compile Java or Kotlin and fetch Android dependencies from a [Maven repository][agdk_jetpack] (or link with an embedded [release][agdk_releases] of [`GameActivity`]) |
-//!
-//! [`GameActivity`]: https://developer.android.com/games/agdk/game-activity
-//! [`GameTextInput`]: https://developer.android.com/games/agdk/add-support-for-text-input
-//! [`AndroidAppCompat`]: https://developer.android.com/reference/androidx/appcompat/app/AppCompatActivity
-//! [agdk_jetpack]: https://developer.android.com/jetpack/androidx/releases/games
-//! [agdk_releases]: https://developer.android.com/games/agdk/download#agdk-libraries
-//! [Gradle]: https://developer.android.com/studio/build
-//!
-//! For more details, refer to these `android-activity` [example applications](https://github.com/rust-mobile/android-activity/tree/main/examples).
-//!
-//! ## Converting from `ndk-glue` to `android-activity`
-//!
-//! If your application is currently based on `NativeActivity` via the `ndk-glue` crate and building with `cargo apk`, then the minimal changes would be:
-//! 1. Remove `ndk-glue` from your `Cargo.toml`
-//! 2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.29.12", features = [ "android-native-activity" ] }`
-//! 3. Add an `android_main` entrypoint (as above), instead of using the '`[ndk_glue::main]` proc macro from `ndk-macros` (optionally add a dependency on `android_logger` and initialize logging as above).
-//! 4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your event loop (as shown above).
-
-use crate::{
-    event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder},
-    window::{Window, WindowAttributes},
-};
-
-use self::activity::{AndroidApp, ConfigurationRef, Rect};
-
-/// Additional methods on [`EventLoop`] that are specific to Android.
-pub trait EventLoopExtAndroid {}
-
-impl<T> EventLoopExtAndroid for EventLoop<T> {}
-
-/// Additional methods on [`ActiveEventLoop`] that are specific to Android.
-pub trait ActiveEventLoopExtAndroid {}
-
-/// Additional methods on [`Window`] that are specific to Android.
-pub trait WindowExtAndroid {
-    fn content_rect(&self) -> Rect;
-
-    fn config(&self) -> ConfigurationRef;
-}
-
-impl WindowExtAndroid for Window {
-    fn content_rect(&self) -> Rect {
-        self.window.content_rect()
-    }
-
-    fn config(&self) -> ConfigurationRef {
-        self.window.config()
-    }
-}
-
-impl ActiveEventLoopExtAndroid for ActiveEventLoop {}
-
-/// Additional methods on [`WindowAttributes`] that are specific to Android.
-pub trait WindowAttributesExtAndroid {}
-
-impl WindowAttributesExtAndroid for WindowAttributes {}
-
-pub trait EventLoopBuilderExtAndroid {
-    /// Associates the `AndroidApp` that was passed to `android_main()` with the event loop
-    ///
-    /// This must be called on Android since the `AndroidApp` is not global state.
-    fn with_android_app(&mut self, app: AndroidApp) -> &mut Self;
-
-    /// Calling this will mark the volume keys to be manually handled by the application
-    ///
-    /// Default is to let the operating system handle the volume keys
-    fn handle_volume_keys(&mut self) -> &mut Self;
-}
-
-impl<T> EventLoopBuilderExtAndroid for EventLoopBuilder<T> {
-    fn with_android_app(&mut self, app: AndroidApp) -> &mut Self {
-        self.platform_specific.android_app = Some(app);
-        self
-    }
-
-    fn handle_volume_keys(&mut self) -> &mut Self {
-        self.platform_specific.ignore_volume_keys = false;
-        self
-    }
-}
-
-/// Re-export of the `android_activity` API
-///
-/// Winit re-exports the `android_activity` API for convenience so that most
-/// applications can rely on the Winit crate to resolve the required version of
-/// `android_activity` and avoid any chance of a conflict between Winit and the
-/// application crate.
-///
-/// Unlike most libraries there can only be a single implementation
-/// of the `android_activity` glue crate linked with an application because
-/// it is responsible for the application's `android_main()` entry point.
-///
-/// Since Winit depends on a specific version of `android_activity` the simplest
-/// way to avoid creating a conflict is for applications to avoid explicitly
-/// depending on the `android_activity` crate, and instead consume the API that
-/// is re-exported by Winit.
-///
-/// For compatibility applications should then import the `AndroidApp` type for
-/// their `android_main(app: AndroidApp)` function like:
-/// ```rust
-/// #[cfg(target_os="android")]
-/// use winit::platform::android::activity::AndroidApp;
-/// ```
-pub mod activity {
-    // We enable the `"native-activity"` feature just so that we can build the
-    // docs, but it'll be very confusing for users to see the docs with that
-    // feature enabled, so we avoid inlining it so that they're forced to view
-    // it on the crate's own docs.rs page.
-    #[doc(no_inline)]
-    #[cfg(android_platform)]
-    pub use android_activity::*;
-
-    #[cfg(not(android_platform))]
-    #[doc(hidden)]
-    pub struct Rect;
-    #[cfg(not(android_platform))]
-    #[doc(hidden)]
-    pub struct ConfigurationRef;
-    #[cfg(not(android_platform))]
-    #[doc(hidden)]
-    pub struct AndroidApp;
-}

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;

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();
+    }
+}

src/platform/ios.rs

@@ -1,404 +0,0 @@
-//! # iOS / UIKit
-//!
-//! Winit has an OS requirement of iOS 8 or higher, and is regularly tested on
-//! iOS 9.3.
-//!
-//! iOS's main `UIApplicationMain` does some init work that's required by all
-//! UI-related code (see issue [#1705]). It is best to create your windows
-//! inside `Event::Resumed`.
-//!
-//! [#1705]: https://github.com/rust-windowing/winit/issues/1705
-//!
-//! ## Building app
-//!
-//! To build ios app you will need rustc built for this targets:
-//!
-//!  - armv7-apple-ios
-//!  - armv7s-apple-ios
-//!  - i386-apple-ios
-//!  - aarch64-apple-ios
-//!  - x86_64-apple-ios
-//!
-//! Then
-//!
-//! ```
-//! cargo build --target=...
-//! ```
-//! The simplest way to integrate your app into xcode environment is to build it
-//! as a static library. Wrap your main function and export it.
-//!
-//! ```rust, ignore
-//! #[no_mangle]
-//! pub extern fn start_winit_app() {
-//!     start_inner()
-//! }
-//!
-//! fn start_inner() {
-//!    ...
-//! }
-//! ```
-//!
-//! Compile project and then drag resulting .a into Xcode project. Add winit.h to xcode.
-//!
-//! ```ignore
-//! void start_winit_app();
-//! ```
-//!
-//! Use start_winit_app inside your xcode's main function.
-//!
-//!
-//! ## App lifecycle and events
-//!
-//! iOS environment is very different from other platforms and you must be very
-//! careful with it's events. Familiarize yourself with
-//! [app lifecycle](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIApplicationDelegate_Protocol/).
-//!
-//! This is how those event are represented in winit:
-//!
-//!  - applicationDidBecomeActive is Resumed
-//!  - applicationWillResignActive is Suspended
-//!  - applicationWillTerminate is LoopExiting
-//!
-//! Keep in mind that after LoopExiting event is received every attempt to draw with
-//! opengl will result in segfault.
-//!
-//! Also note that app may not receive the LoopExiting event if suspended; it might be SIGKILL'ed.
-
-use std::os::raw::c_void;
-
-use crate::{
-    event_loop::EventLoop,
-    monitor::{MonitorHandle, VideoModeHandle},
-    window::{Window, WindowAttributes},
-};
-
-/// Additional methods on [`EventLoop`] that are specific to iOS.
-pub trait EventLoopExtIOS {
-    /// Returns the [`Idiom`] (phone/tablet/tv/etc) for the current device.
-    fn idiom(&self) -> Idiom;
-}
-
-impl<T: 'static> EventLoopExtIOS for EventLoop<T> {
-    fn idiom(&self) -> Idiom {
-        self.event_loop.idiom()
-    }
-}
-
-/// Additional methods on [`Window`] that are specific to iOS.
-pub trait WindowExtIOS {
-    /// Sets the [`contentScaleFactor`] of the underlying [`UIWindow`] to `scale_factor`.
-    ///
-    /// The default value is device dependent, and it's recommended GLES or Metal applications set
-    /// this to [`MonitorHandle::scale_factor()`].
-    ///
-    /// [`UIWindow`]: https://developer.apple.com/documentation/uikit/uiwindow?language=objc
-    /// [`contentScaleFactor`]: https://developer.apple.com/documentation/uikit/uiview/1622657-contentscalefactor?language=objc
-    fn set_scale_factor(&self, scale_factor: f64);
-
-    /// Sets the valid orientations for the [`Window`].
-    ///
-    /// The default value is [`ValidOrientations::LandscapeAndPortrait`].
-    ///
-    /// This changes the value returned by
-    /// [`-[UIViewController supportedInterfaceOrientations]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621435-supportedinterfaceorientations?language=objc),
-    /// and then calls
-    /// [`-[UIViewController attemptRotationToDeviceOrientation]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621400-attemptrotationtodeviceorientati?language=objc).
-    fn set_valid_orientations(&self, valid_orientations: ValidOrientations);
-
-    /// Sets whether the [`Window`] prefers the home indicator hidden.
-    ///
-    /// The default is to prefer showing the home indicator.
-    ///
-    /// This changes the value returned by
-    /// [`-[UIViewController prefersHomeIndicatorAutoHidden]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887510-prefershomeindicatorautohidden?language=objc),
-    /// and then calls
-    /// [`-[UIViewController setNeedsUpdateOfHomeIndicatorAutoHidden]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887509-setneedsupdateofhomeindicatoraut?language=objc).
-    ///
-    /// This only has an effect on iOS 11.0+.
-    fn set_prefers_home_indicator_hidden(&self, hidden: bool);
-
-    /// Sets the screen edges for which the system gestures will take a lower priority than the
-    /// application's touch handling.
-    ///
-    /// This changes the value returned by
-    /// [`-[UIViewController preferredScreenEdgesDeferringSystemGestures]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887512-preferredscreenedgesdeferringsys?language=objc),
-    /// and then calls
-    /// [`-[UIViewController setNeedsUpdateOfScreenEdgesDeferringSystemGestures]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887507-setneedsupdateofscreenedgesdefer?language=objc).
-    ///
-    /// This only has an effect on iOS 11.0+.
-    fn set_preferred_screen_edges_deferring_system_gestures(&self, edges: ScreenEdge);
-
-    /// Sets whether the [`Window`] prefers the status bar hidden.
-    ///
-    /// The default is to prefer showing the status bar.
-    ///
-    /// This sets the value of the
-    /// [`prefersStatusBarHidden`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621440-prefersstatusbarhidden?language=objc)
-    /// property.
-    ///
-    /// [`setNeedsStatusBarAppearanceUpdate()`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621354-setneedsstatusbarappearanceupdat?language=objc)
-    /// is also called for you.
-    fn set_prefers_status_bar_hidden(&self, hidden: bool);
-
-    /// Sets the preferred status bar style for the [`Window`].
-    ///
-    /// The default is system-defined.
-    ///
-    /// This sets the value of the
-    /// [`preferredStatusBarStyle`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621416-preferredstatusbarstyle?language=objc)
-    /// property.
-    ///
-    /// [`setNeedsStatusBarAppearanceUpdate()`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621354-setneedsstatusbarappearanceupdat?language=objc)
-    /// is also called for you.
-    fn set_preferred_status_bar_style(&self, status_bar_style: StatusBarStyle);
-
-    /// Sets whether the [`Window`] should recognize pinch gestures.
-    ///
-    /// The default is to not recognize gestures.
-    fn recognize_pinch_gesture(&self, should_recognize: bool);
-
-    /// Sets whether the [`Window`] should recognize double tap gestures.
-    ///
-    /// The default is to not recognize gestures.
-    fn recognize_doubletap_gesture(&self, should_recognize: bool);
-
-    /// Sets whether the [`Window`] should recognize rotation gestures.
-    ///
-    /// The default is to not recognize gestures.
-    fn recognize_rotation_gesture(&self, should_recognize: bool);
-}
-
-impl WindowExtIOS for Window {
-    #[inline]
-    fn set_scale_factor(&self, scale_factor: f64) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_scale_factor(scale_factor))
-    }
-
-    #[inline]
-    fn set_valid_orientations(&self, valid_orientations: ValidOrientations) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_valid_orientations(valid_orientations))
-    }
-
-    #[inline]
-    fn set_prefers_home_indicator_hidden(&self, hidden: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_prefers_home_indicator_hidden(hidden))
-    }
-
-    #[inline]
-    fn set_preferred_screen_edges_deferring_system_gestures(&self, edges: ScreenEdge) {
-        self.window.maybe_queue_on_main(move |w| {
-            w.set_preferred_screen_edges_deferring_system_gestures(edges)
-        })
-    }
-
-    #[inline]
-    fn set_prefers_status_bar_hidden(&self, hidden: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_prefers_status_bar_hidden(hidden))
-    }
-
-    #[inline]
-    fn set_preferred_status_bar_style(&self, status_bar_style: StatusBarStyle) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_preferred_status_bar_style(status_bar_style))
-    }
-
-    #[inline]
-    fn recognize_pinch_gesture(&self, should_recognize: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.recognize_pinch_gesture(should_recognize));
-    }
-
-    #[inline]
-    fn recognize_doubletap_gesture(&self, should_recognize: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.recognize_doubletap_gesture(should_recognize));
-    }
-
-    #[inline]
-    fn recognize_rotation_gesture(&self, should_recognize: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.recognize_rotation_gesture(should_recognize));
-    }
-}
-
-/// Additional methods on [`WindowAttributes`] that are specific to iOS.
-pub trait WindowAttributesExtIOS {
-    /// Sets the [`contentScaleFactor`] of the underlying [`UIWindow`] to `scale_factor`.
-    ///
-    /// The default value is device dependent, and it's recommended GLES or Metal applications set
-    /// this to [`MonitorHandle::scale_factor()`].
-    ///
-    /// [`UIWindow`]: https://developer.apple.com/documentation/uikit/uiwindow?language=objc
-    /// [`contentScaleFactor`]: https://developer.apple.com/documentation/uikit/uiview/1622657-contentscalefactor?language=objc
-    fn with_scale_factor(self, scale_factor: f64) -> Self;
-
-    /// Sets the valid orientations for the [`Window`].
-    ///
-    /// The default value is [`ValidOrientations::LandscapeAndPortrait`].
-    ///
-    /// This sets the initial value returned by
-    /// [`-[UIViewController supportedInterfaceOrientations]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621435-supportedinterfaceorientations?language=objc).
-    fn with_valid_orientations(self, valid_orientations: ValidOrientations) -> Self;
-
-    /// Sets whether the [`Window`] prefers the home indicator hidden.
-    ///
-    /// The default is to prefer showing the home indicator.
-    ///
-    /// This sets the initial value returned by
-    /// [`-[UIViewController prefersHomeIndicatorAutoHidden]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887510-prefershomeindicatorautohidden?language=objc).
-    ///
-    /// This only has an effect on iOS 11.0+.
-    fn with_prefers_home_indicator_hidden(self, hidden: bool) -> Self;
-
-    /// Sets the screen edges for which the system gestures will take a lower priority than the
-    /// application's touch handling.
-    ///
-    /// This sets the initial value returned by
-    /// [`-[UIViewController preferredScreenEdgesDeferringSystemGestures]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/2887512-preferredscreenedgesdeferringsys?language=objc).
-    ///
-    /// This only has an effect on iOS 11.0+.
-    fn with_preferred_screen_edges_deferring_system_gestures(self, edges: ScreenEdge) -> Self;
-
-    /// Sets whether the [`Window`] prefers the status bar hidden.
-    ///
-    /// The default is to prefer showing the status bar.
-    ///
-    /// This sets the initial value returned by
-    /// [`-[UIViewController prefersStatusBarHidden]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621440-prefersstatusbarhidden?language=objc).
-    fn with_prefers_status_bar_hidden(self, hidden: bool) -> Self;
-
-    /// Sets the style of the [`Window`]'s status bar.
-    ///
-    /// The default is system-defined.
-    ///
-    /// This sets the initial value returned by
-    /// [`-[UIViewController preferredStatusBarStyle]`](https://developer.apple.com/documentation/uikit/uiviewcontroller/1621416-preferredstatusbarstyle?language=objc),
-    fn with_preferred_status_bar_style(self, status_bar_style: StatusBarStyle) -> Self;
-}
-
-impl WindowAttributesExtIOS for WindowAttributes {
-    #[inline]
-    fn with_scale_factor(mut self, scale_factor: f64) -> Self {
-        self.platform_specific.scale_factor = Some(scale_factor);
-        self
-    }
-
-    #[inline]
-    fn with_valid_orientations(mut self, valid_orientations: ValidOrientations) -> Self {
-        self.platform_specific.valid_orientations = valid_orientations;
-        self
-    }
-
-    #[inline]
-    fn with_prefers_home_indicator_hidden(mut self, hidden: bool) -> Self {
-        self.platform_specific.prefers_home_indicator_hidden = hidden;
-        self
-    }
-
-    #[inline]
-    fn with_preferred_screen_edges_deferring_system_gestures(mut self, edges: ScreenEdge) -> Self {
-        self.platform_specific
-            .preferred_screen_edges_deferring_system_gestures = edges;
-        self
-    }
-
-    #[inline]
-    fn with_prefers_status_bar_hidden(mut self, hidden: bool) -> Self {
-        self.platform_specific.prefers_status_bar_hidden = hidden;
-        self
-    }
-
-    #[inline]
-    fn with_preferred_status_bar_style(mut self, status_bar_style: StatusBarStyle) -> Self {
-        self.platform_specific.preferred_status_bar_style = status_bar_style;
-        self
-    }
-}
-
-/// Additional methods on [`MonitorHandle`] that are specific to iOS.
-pub trait MonitorHandleExtIOS {
-    /// Returns a pointer to the [`UIScreen`] that is used by this monitor.
-    ///
-    /// [`UIScreen`]: https://developer.apple.com/documentation/uikit/uiscreen?language=objc
-    fn ui_screen(&self) -> *mut c_void;
-
-    /// Returns the preferred [`VideoModeHandle`] for this monitor.
-    ///
-    /// This translates to a call to [`-[UIScreen preferredMode]`](https://developer.apple.com/documentation/uikit/uiscreen/1617823-preferredmode?language=objc).
-    fn preferred_video_mode(&self) -> VideoModeHandle;
-}
-
-impl MonitorHandleExtIOS for MonitorHandle {
-    #[inline]
-    fn ui_screen(&self) -> *mut c_void {
-        // SAFETY: The marker is only used to get the pointer of the screen
-        let mtm = unsafe { icrate::Foundation::MainThreadMarker::new_unchecked() };
-        objc2::rc::Id::as_ptr(self.inner.ui_screen(mtm)) as *mut c_void
-    }
-
-    #[inline]
-    fn preferred_video_mode(&self) -> VideoModeHandle {
-        VideoModeHandle {
-            video_mode: self.inner.preferred_video_mode(),
-        }
-    }
-}
-
-/// Valid orientations for a particular [`Window`].
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ValidOrientations {
-    /// Excludes `PortraitUpsideDown` on iphone
-    #[default]
-    LandscapeAndPortrait,
-
-    Landscape,
-
-    /// Excludes `PortraitUpsideDown` on iphone
-    Portrait,
-}
-
-/// The device [idiom].
-///
-/// [idiom]: https://developer.apple.com/documentation/uikit/uidevice/1620037-userinterfaceidiom?language=objc
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Idiom {
-    Unspecified,
-
-    /// iPhone and iPod touch.
-    Phone,
-
-    /// iPad.
-    Pad,
-
-    /// tvOS and Apple TV.
-    TV,
-    CarPlay,
-}
-
-bitflags::bitflags! {
-    /// The [edges] of a screen.
-    ///
-    /// [edges]: https://developer.apple.com/documentation/uikit/uirectedge?language=objc
-    #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-    pub struct ScreenEdge: u8 {
-        const NONE   = 0;
-        const TOP    = 1 << 0;
-        const LEFT   = 1 << 1;
-        const BOTTOM = 1 << 2;
-        const RIGHT  = 1 << 3;
-        const ALL = ScreenEdge::TOP.bits() | ScreenEdge::LEFT.bits()
-            | ScreenEdge::BOTTOM.bits() | ScreenEdge::RIGHT.bits();
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum StatusBarStyle {
-    #[default]
-    Default,
-    LightContent,
-    DarkContent,
-}

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))
+    }
+}

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()
+        }
+    }
+}

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;
+}

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)
+        }
+    }
+}

src/platform/linux/wayland/context.rs

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

src/platform/linux/wayland/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);

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
+    }
+}

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;

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));
+    }
+}

src/platform/linux/x11/ffi.rs

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

src/platform/linux/x11/input.rs

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

src/platform/linux/x11/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 _);
+            }
+        }
+    }
+}

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)
+    }
+}

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())
+    }
+}

src/platform/macos.rs

@@ -1,443 +0,0 @@
-//! # macOS / AppKit
-//!
-//! Winit has an OS requirement of macOS 10.11 or higher (same as Rust
-//! itself), and is regularly tested on macOS 10.14.
-//!
-//! A lot of functionality expects the application to be ready before you
-//! start doing anything; this includes creating windows, fetching monitors,
-//! drawing, and so on, see issues [#2238], [#2051] and [#2087].
-//!
-//! If you encounter problems, you should try doing your initialization inside
-//! `Event::Resumed`.
-//!
-//! [#2238]: https://github.com/rust-windowing/winit/issues/2238
-//! [#2051]: https://github.com/rust-windowing/winit/issues/2051
-//! [#2087]: https://github.com/rust-windowing/winit/issues/2087
-
-use std::os::raw::c_void;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    event_loop::{ActiveEventLoop, EventLoopBuilder},
-    monitor::MonitorHandle,
-    window::{Window, WindowAttributes},
-};
-
-/// Additional methods on [`Window`] that are specific to MacOS.
-pub trait WindowExtMacOS {
-    /// Returns whether or not the window is in simple fullscreen mode.
-    fn simple_fullscreen(&self) -> bool;
-
-    /// Toggles a fullscreen mode that doesn't require a new macOS space.
-    /// Returns a boolean indicating whether the transition was successful (this
-    /// won't work if the window was already in the native fullscreen).
-    ///
-    /// This is how fullscreen used to work on macOS in versions before Lion.
-    /// And allows the user to have a fullscreen window without using another
-    /// space or taking control over the entire monitor.
-    fn set_simple_fullscreen(&self, fullscreen: bool) -> bool;
-
-    /// Returns whether or not the window has shadow.
-    fn has_shadow(&self) -> bool;
-
-    /// Sets whether or not the window has shadow.
-    fn set_has_shadow(&self, has_shadow: bool);
-
-    /// Group windows together by using the same tabbing identifier.
-    ///
-    /// <https://developer.apple.com/documentation/appkit/nswindow/1644704-tabbingidentifier>
-    fn set_tabbing_identifier(&self, identifier: &str);
-
-    /// Returns the window's tabbing identifier.
-    fn tabbing_identifier(&self) -> String;
-
-    /// Select next tab.
-    fn select_next_tab(&self);
-
-    /// Select previous tab.
-    fn select_previous_tab(&self);
-
-    /// Select the tab with the given index.
-    ///
-    /// Will no-op when the index is out of bounds.
-    fn select_tab_at_index(&self, index: usize);
-
-    /// Get the number of tabs in the window tab group.
-    fn num_tabs(&self) -> usize;
-
-    /// Get the window's edit state.
-    ///
-    /// # Examples
-    ///
-    /// ```ignore
-    /// WindowEvent::CloseRequested => {
-    ///     if window.is_document_edited() {
-    ///         // Show the user a save pop-up or similar
-    ///     } else {
-    ///         // Close the window
-    ///         drop(window);
-    ///     }
-    /// }
-    /// ```
-    fn is_document_edited(&self) -> bool;
-
-    /// Put the window in a state which indicates a file save is required.
-    fn set_document_edited(&self, edited: bool);
-
-    /// Set option as alt behavior as described in [`OptionAsAlt`].
-    ///
-    /// This will ignore diacritical marks and accent characters from
-    /// being processed as received characters. Instead, the input
-    /// device's raw character will be placed in event queues with the
-    /// Alt modifier set.
-    fn set_option_as_alt(&self, option_as_alt: OptionAsAlt);
-
-    /// Getter for the [`WindowExtMacOS::set_option_as_alt`].
-    fn option_as_alt(&self) -> OptionAsAlt;
-}
-
-impl WindowExtMacOS for Window {
-    #[inline]
-    fn simple_fullscreen(&self) -> bool {
-        self.window.maybe_wait_on_main(|w| w.simple_fullscreen())
-    }
-
-    #[inline]
-    fn set_simple_fullscreen(&self, fullscreen: bool) -> bool {
-        self.window
-            .maybe_wait_on_main(move |w| w.set_simple_fullscreen(fullscreen))
-    }
-
-    #[inline]
-    fn has_shadow(&self) -> bool {
-        self.window.maybe_wait_on_main(|w| w.has_shadow())
-    }
-
-    #[inline]
-    fn set_has_shadow(&self, has_shadow: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_has_shadow(has_shadow))
-    }
-
-    #[inline]
-    fn set_tabbing_identifier(&self, identifier: &str) {
-        self.window
-            .maybe_wait_on_main(|w| w.set_tabbing_identifier(identifier))
-    }
-
-    #[inline]
-    fn tabbing_identifier(&self) -> String {
-        self.window.maybe_wait_on_main(|w| w.tabbing_identifier())
-    }
-
-    #[inline]
-    fn select_next_tab(&self) {
-        self.window.maybe_queue_on_main(|w| w.select_next_tab())
-    }
-
-    #[inline]
-    fn select_previous_tab(&self) {
-        self.window.maybe_queue_on_main(|w| w.select_previous_tab())
-    }
-
-    #[inline]
-    fn select_tab_at_index(&self, index: usize) {
-        self.window
-            .maybe_queue_on_main(move |w| w.select_tab_at_index(index))
-    }
-
-    #[inline]
-    fn num_tabs(&self) -> usize {
-        self.window.maybe_wait_on_main(|w| w.num_tabs())
-    }
-
-    #[inline]
-    fn is_document_edited(&self) -> bool {
-        self.window.maybe_wait_on_main(|w| w.is_document_edited())
-    }
-
-    #[inline]
-    fn set_document_edited(&self, edited: bool) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_document_edited(edited))
-    }
-
-    #[inline]
-    fn set_option_as_alt(&self, option_as_alt: OptionAsAlt) {
-        self.window
-            .maybe_queue_on_main(move |w| w.set_option_as_alt(option_as_alt))
-    }
-
-    #[inline]
-    fn option_as_alt(&self) -> OptionAsAlt {
-        self.window.maybe_wait_on_main(|w| w.option_as_alt())
-    }
-}
-
-/// Corresponds to `NSApplicationActivationPolicy`.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ActivationPolicy {
-    /// Corresponds to `NSApplicationActivationPolicyRegular`.
-    #[default]
-    Regular,
-
-    /// Corresponds to `NSApplicationActivationPolicyAccessory`.
-    Accessory,
-
-    /// Corresponds to `NSApplicationActivationPolicyProhibited`.
-    Prohibited,
-}
-
-/// Additional methods on [`WindowAttributes`] that are specific to MacOS.
-///
-/// **Note:** Properties dealing with the titlebar will be overwritten by the [`WindowAttributes::with_decorations`] method:
-/// - `with_titlebar_transparent`
-/// - `with_title_hidden`
-/// - `with_titlebar_hidden`
-/// - `with_titlebar_buttons_hidden`
-/// - `with_fullsize_content_view`
-pub trait WindowAttributesExtMacOS {
-    /// Enables click-and-drag behavior for the entire window, not just the titlebar.
-    fn with_movable_by_window_background(self, movable_by_window_background: bool) -> Self;
-    /// Makes the titlebar transparent and allows the content to appear behind it.
-    fn with_titlebar_transparent(self, titlebar_transparent: bool) -> Self;
-    /// Hides the window title.
-    fn with_title_hidden(self, title_hidden: bool) -> Self;
-    /// Hides the window titlebar.
-    fn with_titlebar_hidden(self, titlebar_hidden: bool) -> Self;
-    /// Hides the window titlebar buttons.
-    fn with_titlebar_buttons_hidden(self, titlebar_buttons_hidden: bool) -> Self;
-    /// Makes the window content appear behind the titlebar.
-    fn with_fullsize_content_view(self, fullsize_content_view: bool) -> Self;
-    fn with_disallow_hidpi(self, disallow_hidpi: bool) -> Self;
-    fn with_has_shadow(self, has_shadow: bool) -> Self;
-    /// Window accepts click-through mouse events.
-    fn with_accepts_first_mouse(self, accepts_first_mouse: bool) -> Self;
-    /// Defines the window tabbing identifier.
-    ///
-    /// <https://developer.apple.com/documentation/appkit/nswindow/1644704-tabbingidentifier>
-    fn with_tabbing_identifier(self, identifier: &str) -> Self;
-    /// Set how the <kbd>Option</kbd> keys are interpreted.
-    ///
-    /// See [`WindowExtMacOS::set_option_as_alt`] for details on what this means if set.
-    fn with_option_as_alt(self, option_as_alt: OptionAsAlt) -> Self;
-}
-
-impl WindowAttributesExtMacOS for WindowAttributes {
-    #[inline]
-    fn with_movable_by_window_background(mut self, movable_by_window_background: bool) -> Self {
-        self.platform_specific.movable_by_window_background = movable_by_window_background;
-        self
-    }
-
-    #[inline]
-    fn with_titlebar_transparent(mut self, titlebar_transparent: bool) -> Self {
-        self.platform_specific.titlebar_transparent = titlebar_transparent;
-        self
-    }
-
-    #[inline]
-    fn with_titlebar_hidden(mut self, titlebar_hidden: bool) -> Self {
-        self.platform_specific.titlebar_hidden = titlebar_hidden;
-        self
-    }
-
-    #[inline]
-    fn with_titlebar_buttons_hidden(mut self, titlebar_buttons_hidden: bool) -> Self {
-        self.platform_specific.titlebar_buttons_hidden = titlebar_buttons_hidden;
-        self
-    }
-
-    #[inline]
-    fn with_title_hidden(mut self, title_hidden: bool) -> Self {
-        self.platform_specific.title_hidden = title_hidden;
-        self
-    }
-
-    #[inline]
-    fn with_fullsize_content_view(mut self, fullsize_content_view: bool) -> Self {
-        self.platform_specific.fullsize_content_view = fullsize_content_view;
-        self
-    }
-
-    #[inline]
-    fn with_disallow_hidpi(mut self, disallow_hidpi: bool) -> Self {
-        self.platform_specific.disallow_hidpi = disallow_hidpi;
-        self
-    }
-
-    #[inline]
-    fn with_has_shadow(mut self, has_shadow: bool) -> Self {
-        self.platform_specific.has_shadow = has_shadow;
-        self
-    }
-
-    #[inline]
-    fn with_accepts_first_mouse(mut self, accepts_first_mouse: bool) -> Self {
-        self.platform_specific.accepts_first_mouse = accepts_first_mouse;
-        self
-    }
-
-    #[inline]
-    fn with_tabbing_identifier(mut self, tabbing_identifier: &str) -> Self {
-        self.platform_specific
-            .tabbing_identifier
-            .replace(tabbing_identifier.to_string());
-        self
-    }
-
-    #[inline]
-    fn with_option_as_alt(mut self, option_as_alt: OptionAsAlt) -> Self {
-        self.platform_specific.option_as_alt = option_as_alt;
-        self
-    }
-}
-
-pub trait EventLoopBuilderExtMacOS {
-    /// Sets the activation policy for the application.
-    ///
-    /// It is set to [`ActivationPolicy::Regular`] by default.
-    ///
-    /// # Example
-    ///
-    /// Set the activation policy to "accessory".
-    ///
-    /// ```
-    /// use winit::event_loop::EventLoopBuilder;
-    /// #[cfg(target_os = "macos")]
-    /// use winit::platform::macos::{EventLoopBuilderExtMacOS, ActivationPolicy};
-    ///
-    /// let mut builder = EventLoopBuilder::new();
-    /// #[cfg(target_os = "macos")]
-    /// builder.with_activation_policy(ActivationPolicy::Accessory);
-    /// # if false { // We can't test this part
-    /// let event_loop = builder.build();
-    /// # }
-    /// ```
-    fn with_activation_policy(&mut self, activation_policy: ActivationPolicy) -> &mut Self;
-
-    /// Used to control whether a default menubar menu is created.
-    ///
-    /// Menu creation is enabled by default.
-    ///
-    /// # Example
-    ///
-    /// Disable creating a default menubar.
-    ///
-    /// ```
-    /// use winit::event_loop::EventLoopBuilder;
-    /// #[cfg(target_os = "macos")]
-    /// use winit::platform::macos::EventLoopBuilderExtMacOS;
-    ///
-    /// let mut builder = EventLoopBuilder::new();
-    /// #[cfg(target_os = "macos")]
-    /// builder.with_default_menu(false);
-    /// # if false { // We can't test this part
-    /// let event_loop = builder.build();
-    /// # }
-    /// ```
-    fn with_default_menu(&mut self, enable: bool) -> &mut Self;
-
-    /// Used to prevent the application from automatically activating when launched if
-    /// another application is already active.
-    ///
-    /// The default behavior is to ignore other applications and activate when launched.
-    fn with_activate_ignoring_other_apps(&mut self, ignore: bool) -> &mut Self;
-}
-
-impl<T> EventLoopBuilderExtMacOS for EventLoopBuilder<T> {
-    #[inline]
-    fn with_activation_policy(&mut self, activation_policy: ActivationPolicy) -> &mut Self {
-        self.platform_specific.activation_policy = activation_policy;
-        self
-    }
-
-    #[inline]
-    fn with_default_menu(&mut self, enable: bool) -> &mut Self {
-        self.platform_specific.default_menu = enable;
-        self
-    }
-
-    #[inline]
-    fn with_activate_ignoring_other_apps(&mut self, ignore: bool) -> &mut Self {
-        self.platform_specific.activate_ignoring_other_apps = ignore;
-        self
-    }
-}
-
-/// Additional methods on [`MonitorHandle`] that are specific to MacOS.
-pub trait MonitorHandleExtMacOS {
-    /// Returns the identifier of the monitor for Cocoa.
-    fn native_id(&self) -> u32;
-    /// Returns a pointer to the NSScreen representing this monitor.
-    fn ns_screen(&self) -> Option<*mut c_void>;
-}
-
-impl MonitorHandleExtMacOS for MonitorHandle {
-    #[inline]
-    fn native_id(&self) -> u32 {
-        self.inner.native_identifier()
-    }
-
-    fn ns_screen(&self) -> Option<*mut c_void> {
-        // SAFETY: We only use the marker to get a pointer
-        let mtm = unsafe { icrate::Foundation::MainThreadMarker::new_unchecked() };
-        self.inner
-            .ns_screen(mtm)
-            .map(|s| objc2::rc::Id::as_ptr(&s) as _)
-    }
-}
-
-/// Additional methods on [`ActiveEventLoop`] that are specific to macOS.
-pub trait ActiveEventLoopExtMacOS {
-    /// Hide the entire application. In most applications this is typically triggered with Command-H.
-    fn hide_application(&self);
-    /// Hide the other applications. In most applications this is typically triggered with Command+Option-H.
-    fn hide_other_applications(&self);
-    /// Set whether the system can automatically organize windows into tabs.
-    ///
-    /// <https://developer.apple.com/documentation/appkit/nswindow/1646657-allowsautomaticwindowtabbing>
-    fn set_allows_automatic_window_tabbing(&self, enabled: bool);
-    /// Returns whether the system can automatically organize windows into tabs.
-    fn allows_automatic_window_tabbing(&self) -> bool;
-}
-
-impl ActiveEventLoopExtMacOS for ActiveEventLoop {
-    fn hide_application(&self) {
-        self.p.hide_application()
-    }
-
-    fn hide_other_applications(&self) {
-        self.p.hide_other_applications()
-    }
-
-    fn set_allows_automatic_window_tabbing(&self, enabled: bool) {
-        self.p.set_allows_automatic_window_tabbing(enabled);
-    }
-
-    fn allows_automatic_window_tabbing(&self) -> bool {
-        self.p.allows_automatic_window_tabbing()
-    }
-}
-
-/// Option as alt behavior.
-///
-/// The default is `None`.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum OptionAsAlt {
-    /// The left `Option` key is treated as `Alt`.
-    OnlyLeft,
-
-    /// The right `Option` key is treated as `Alt`.
-    OnlyRight,
-
-    /// Both `Option` keys are treated as `Alt`.
-    Both,
-
-    /// No special handling is applied for `Option` key.
-    #[default]
-    None,
-}

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),
+    }
+}

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;

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
+    }
+}

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)
+    }
+}

src/platform/mod.rs

@@ -1,61 +1,22 @@
-//! Contains traits with platform-specific methods in them.
-//!
-//! Only the modules corresponding to the platform you're compiling to will be available.
+pub use self::platform::*;
 
-#[cfg(any(android_platform, docsrs))]
-pub mod android;
-#[cfg(any(ios_platform, docsrs))]
-pub mod ios;
-#[cfg(any(macos_platform, docsrs))]
-pub mod macos;
-#[cfg(any(orbital_platform, docsrs))]
-pub mod orbital;
-#[cfg(any(x11_platform, wayland_platform, docsrs))]
-pub mod startup_notify;
-#[cfg(any(wayland_platform, docsrs))]
-pub mod wayland;
-#[cfg(any(web_platform, docsrs))]
-pub mod web;
-#[cfg(any(windows_platform, docsrs))]
-pub mod windows;
-#[cfg(any(x11_platform, docsrs))]
-pub mod x11;
+#[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(any(
-    windows_platform,
-    macos_platform,
-    android_platform,
-    x11_platform,
-    wayland_platform,
-    docsrs,
-))]
-pub mod run_on_demand;
-
-#[cfg(any(
-    windows_platform,
-    macos_platform,
-    android_platform,
-    x11_platform,
-    wayland_platform,
-    docsrs,
-))]
-pub mod pump_events;
-
-#[cfg(any(
-    windows_platform,
-    macos_platform,
-    x11_platform,
-    wayland_platform,
-    orbital_platform,
-    docsrs
-))]
-pub mod modifier_supplement;
-
-#[cfg(any(
-    windows_platform,
-    macos_platform,
-    x11_platform,
-    wayland_platform,
-    docsrs
-))]
-pub mod scancode;
+#[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;

src/platform/modifier_supplement.rs

@@ -1,38 +0,0 @@
-use crate::event::KeyEvent;
-use crate::keyboard::Key;
-
-/// Additional methods for the `KeyEvent` which cannot be implemented on all
-/// platforms.
-pub trait KeyEventExtModifierSupplement {
-    /// Identical to `KeyEvent::text` but this is affected by <kbd>Ctrl</kbd>.
-    ///
-    /// For example, pressing <kbd>Ctrl</kbd>+<kbd>a</kbd> produces `Some("\x01")`.
-    fn text_with_all_modifiers(&self) -> Option<&str>;
-
-    /// This value ignores all modifiers including,
-    /// but not limited to <kbd>Shift</kbd>, <kbd>Caps Lock</kbd>,
-    /// and <kbd>Ctrl</kbd>. In most cases this means that the
-    /// unicode character in the resulting string is lowercase.
-    ///
-    /// This is useful for key-bindings / shortcut key combinations.
-    ///
-    /// In case `logical_key` reports `Dead`, this will still report the
-    /// key as `Character` according to the current keyboard layout. This value
-    /// cannot be `Dead`.
-    fn key_without_modifiers(&self) -> Key;
-}
-
-impl KeyEventExtModifierSupplement for KeyEvent {
-    #[inline]
-    fn text_with_all_modifiers(&self) -> Option<&str> {
-        self.platform_specific
-            .text_with_all_modifiers
-            .as_ref()
-            .map(|s| s.as_str())
-    }
-
-    #[inline]
-    fn key_without_modifiers(&self) -> Key {
-        self.platform_specific.key_without_modifiers.clone()
-    }
-}

src/platform/orbital.rs

@@ -1,6 +0,0 @@
-//! # Orbital / Redox OS
-//!
-//! Redox OS has some functionality not yet present that will be implemented
-//! when its orbital display server provides it.
-
-// There are no Orbital specific traits yet.

src/platform/pump_events.rs

@@ -1,130 +0,0 @@
-use std::time::Duration;
-
-use crate::{
-    event::Event,
-    event_loop::{ActiveEventLoop, EventLoop},
-};
-
-/// The return status for `pump_events`
-pub enum PumpStatus {
-    /// Continue running external loop.
-    Continue,
-    /// Exit external loop.
-    Exit(i32),
-}
-
-/// Additional methods on [`EventLoop`] for pumping events within an external event loop
-pub trait EventLoopExtPumpEvents {
-    /// A type provided by the user that can be passed through [`Event::UserEvent`].
-    type UserEvent;
-
-    /// Pump the `EventLoop` to check for and dispatch pending events.
-    ///
-    /// This API is designed to enable applications to integrate Winit into an
-    /// external event loop, for platforms that can support this.
-    ///
-    /// The given `timeout` limits how long it may block waiting for new events.
-    ///
-    /// Passing a `timeout` of `Some(Duration::ZERO)` would ensure your external
-    /// event loop is never blocked but you would likely need to consider how
-    /// to throttle your own external loop.
-    ///
-    /// Passing a `timeout` of `None` means that it may wait indefinitely for new
-    /// events before returning control back to the external loop.
-    ///
-    /// **Note:** This is not a portable API, and its usage involves a number of
-    /// caveats and trade offs that should be considered before using this API!
-    ///
-    /// You almost certainly shouldn't use this API, unless you absolutely know it's
-    /// the only practical option you have.
-    ///
-    /// ## Synchronous events
-    ///
-    /// Some events _must_ only be handled synchronously via the closure that
-    /// is passed to Winit so that the handler will also be synchronized with
-    /// the window system and operating system.
-    ///
-    /// This is because some events are driven by a window system callback
-    /// where the window systems expects the application to have handled the
-    /// event before returning.
-    ///
-    /// **These events can not be buffered and handled outside of the closure
-    /// passed to Winit.**
-    ///
-    /// As a general rule it is not recommended to ever buffer events to handle
-    /// them outside of the closure passed to Winit since it's difficult to
-    /// provide guarantees about which events are safe to buffer across all
-    /// operating systems.
-    ///
-    /// Notable events that will certainly create portability problems if
-    /// buffered and handled outside of Winit include:
-    /// - `RedrawRequested` events, used to schedule rendering.
-    ///
-    ///     macOS for example uses a `drawRect` callback to drive rendering
-    /// within applications and expects rendering to be finished before
-    /// the `drawRect` callback returns.
-    ///
-    ///     For portability it's strongly recommended that applications should
-    /// keep their rendering inside the closure provided to Winit.
-    /// - Any lifecycle events, such as `Suspended` / `Resumed`.
-    ///
-    ///     The handling of these events needs to be synchronized with the
-    /// operating system and it would never be appropriate to buffer a
-    /// notification that your application has been suspended or resumed and
-    /// then handled that later since there would always be a chance that
-    /// other lifecycle events occur while the event is buffered.
-    ///
-    /// ## Supported Platforms
-    ///
-    /// - Windows
-    /// - Linux
-    /// - MacOS
-    /// - Android
-    ///
-    /// ## Unsupported Platforms
-    ///
-    /// - **Web:**  This API is fundamentally incompatible with the event-based way in which
-    /// Web browsers work because it's not possible to have a long-running external
-    /// loop that would block the browser and there is nothing that can be
-    /// polled to ask for new new events. Events are delivered via callbacks based
-    /// on an event loop that is internal to the browser itself.
-    /// - **iOS:** It's not possible to stop and start an `NSApplication` repeatedly on iOS so
-    /// there's no way to support the same approach to polling as on MacOS.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Windows**: The implementation will use `PeekMessage` when checking for
-    ///   window messages to avoid blocking your external event loop.
-    ///
-    /// - **MacOS**: The implementation works in terms of stopping the global application
-    ///   whenever the application `RunLoop` indicates that it is preparing to block
-    ///   and wait for new events.
-    ///
-    ///   This is very different to the polling APIs that are available on other
-    ///   platforms (the lower level polling primitives on MacOS are private
-    ///   implementation details for `NSApplication` which aren't accessible to
-    ///   application developers)
-    ///
-    ///   It's likely this will be less efficient than polling on other OSs and
-    ///   it also means the `NSApplication` is stopped while outside of the Winit
-    ///   event loop - and that's observable (for example to crates like `rfd`)
-    ///   because the `NSApplication` is global state.
-    ///
-    ///   If you render outside of Winit you are likely to see window resizing artifacts
-    ///   since MacOS expects applications to render synchronously during any `drawRect`
-    ///   callback.
-    fn pump_events<F>(&mut self, timeout: Option<Duration>, event_handler: F) -> PumpStatus
-    where
-        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop);
-}
-
-impl<T> EventLoopExtPumpEvents for EventLoop<T> {
-    type UserEvent = T;
-
-    fn pump_events<F>(&mut self, timeout: Option<Duration>, event_handler: F) -> PumpStatus
-    where
-        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop),
-    {
-        self.event_loop.pump_events(timeout, event_handler)
-    }
-}

src/platform/run_on_demand.rs

@@ -1,102 +0,0 @@
-use crate::{
-    error::EventLoopError,
-    event::Event,
-    event_loop::{ActiveEventLoop, EventLoop},
-};
-
-#[cfg(doc)]
-use crate::{platform::pump_events::EventLoopExtPumpEvents, window::Window};
-
-/// Additional methods on [`EventLoop`] to return control flow to the caller.
-pub trait EventLoopExtRunOnDemand {
-    /// A type provided by the user that can be passed through [`Event::UserEvent`].
-    type UserEvent;
-
-    /// Runs the event loop in the calling thread and calls the given `event_handler` closure
-    /// to dispatch any window system events.
-    ///
-    /// Unlike [`EventLoop::run`], this function accepts non-`'static` (i.e. non-`move`) closures
-    /// and it is possible to return control back to the caller without
-    /// consuming the `EventLoop` (by using [`exit()`]) and
-    /// so the event loop can be re-run after it has exit.
-    ///
-    /// It's expected that each run of the loop will be for orthogonal instantiations of your
-    /// Winit application, but internally each instantiation may re-use some common window
-    /// system resources, such as a display server connection.
-    ///
-    /// This API is not designed to run an event loop in bursts that you can exit from and return
-    /// to while maintaining the full state of your application. (If you need something like this
-    /// you can look at the [`EventLoopExtPumpEvents::pump_events()`] API)
-    ///
-    /// Each time `run_on_demand` is called the `event_handler` can expect to receive a
-    /// `NewEvents(Init)` and `Resumed` event (even on platforms that have no suspend/resume
-    /// lifecycle) - which can be used to consistently initialize application state.
-    ///
-    /// See the [`set_control_flow()`] docs on how to change the event loop's behavior.
-    ///
-    /// # Caveats
-    /// - This extension isn't available on all platforms, since it's not always possible to return
-    ///   to the caller (specifically this is impossible on iOS and Web - though with the Web
-    ///   backend it is possible to use `EventLoopExtWebSys::spawn()`[^1] more than once instead).
-    /// - No [`Window`] state can be carried between separate runs of the event loop.
-    ///
-    /// You are strongly encouraged to use [`EventLoop::run()`] for portability, unless you specifically need
-    /// the ability to re-run a single event loop more than once
-    ///
-    /// # Supported Platforms
-    /// - Windows
-    /// - Linux
-    /// - macOS
-    /// - Android
-    ///
-    /// # Unsupported Platforms
-    /// - **Web:**  This API is fundamentally incompatible with the event-based way in which
-    ///   Web browsers work because it's not possible to have a long-running external
-    ///   loop that would block the browser and there is nothing that can be
-    ///   polled to ask for new events. Events are delivered via callbacks based
-    ///   on an event loop that is internal to the browser itself.
-    /// - **iOS:** It's not possible to stop and start an `UIApplication` repeatedly on iOS.
-    ///
-    #[cfg_attr(
-        not(web_platform),
-        doc = "[^1]: `spawn()` is only available on `wasm` platforms."
-    )]
-    ///
-    /// [`exit()`]: ActiveEventLoop::exit()
-    /// [`set_control_flow()`]: ActiveEventLoop::set_control_flow()
-    fn run_on_demand<F>(&mut self, event_handler: F) -> Result<(), EventLoopError>
-    where
-        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop);
-}
-
-impl<T> EventLoopExtRunOnDemand for EventLoop<T> {
-    type UserEvent = T;
-
-    fn run_on_demand<F>(&mut self, event_handler: F) -> Result<(), EventLoopError>
-    where
-        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop),
-    {
-        self.event_loop.window_target().clear_exit();
-        self.event_loop.run_on_demand(event_handler)
-    }
-}
-
-impl ActiveEventLoop {
-    /// Clear exit status.
-    pub(crate) fn clear_exit(&self) {
-        self.p.clear_exit()
-    }
-}
-
-/// ```compile_fail
-/// use winit::event_loop::EventLoop;
-/// use winit::platform::run_on_demand::EventLoopExtRunOnDemand;
-///
-/// let mut event_loop = EventLoop::new().unwrap();
-/// event_loop.run_on_demand(|_, _| {
-///     // Attempt to run the event loop re-entrantly; this must fail.
-///     event_loop.run_on_demand(|_, _| {});
-/// });
-/// ```
-#[allow(dead_code)]
-fn test_run_on_demand_cannot_access_event_loop() {}

src/platform/scancode.rs

@@ -1,50 +0,0 @@
-use crate::keyboard::{KeyCode, PhysicalKey};
-
-// TODO: Describe what this value contains for each platform
-
-/// Additional methods for the [`PhysicalKey`] type that allow the user to access the platform-specific
-/// scancode.
-///
-/// [`PhysicalKey`]: crate::keyboard::PhysicalKey
-pub trait PhysicalKeyExtScancode {
-    /// The raw value of the platform-specific physical key identifier.
-    ///
-    /// Returns `Some(key_id)` if the conversion was successful; returns `None` otherwise.
-    ///
-    /// ## Platform-specific
-    /// - **Windows:** A 16bit extended scancode
-    /// - **Wayland/X11**: A 32-bit linux scancode, which is X11/Wayland keycode subtracted by 8.
-    fn to_scancode(self) -> Option<u32>;
-
-    /// Constructs a `PhysicalKey` from a platform-specific physical key identifier.
-    ///
-    /// Note that this conversion may be lossy, i.e. converting the returned `PhysicalKey` back
-    /// using `to_scancode` might not yield the original value.
-    ///
-    /// ## Platform-specific
-    /// - **Wayland/X11**: A 32-bit linux scancode. When building from X11/Wayland keycode subtract
-    ///                    `8` to get the value you wanted.
-    fn from_scancode(scancode: u32) -> PhysicalKey;
-}
-
-impl PhysicalKeyExtScancode for PhysicalKey {
-    fn to_scancode(self) -> Option<u32> {
-        crate::platform_impl::physicalkey_to_scancode(self)
-    }
-
-    fn from_scancode(scancode: u32) -> PhysicalKey {
-        crate::platform_impl::scancode_to_physicalkey(scancode)
-    }
-}
-
-impl PhysicalKeyExtScancode for KeyCode {
-    #[inline]
-    fn to_scancode(self) -> Option<u32> {
-        <PhysicalKey as PhysicalKeyExtScancode>::to_scancode(PhysicalKey::Code(self))
-    }
-
-    #[inline]
-    fn from_scancode(scancode: u32) -> PhysicalKey {
-        <PhysicalKey as PhysicalKeyExtScancode>::from_scancode(scancode)
-    }
-}

src/platform/startup_notify.rs

@@ -1,99 +0,0 @@
-//! Window startup notification to handle window raising.
-//!
-//! The [`ActivationToken`] is essential to ensure that your newly
-//! created window will obtain the focus, otherwise the user could
-//! be requered to click on the window.
-//!
-//! Such token is usually delivered via the environment variable and
-//! could be read from it with the [`EventLoopExtStartupNotify::read_token_from_env`].
-//!
-//! Such token must also be reset after reading it from your environment with
-//! [`reset_activation_token_env`] otherwise child processes could inherit it.
-//!
-//! When starting a new child process with a newly obtained [`ActivationToken`] from
-//! [`WindowExtStartupNotify::request_activation_token`] the [`set_activation_token_env`]
-//! must be used to propagate it to the child
-//!
-//! To ensure the delivery of such token by other processes to you, the user should
-//! set `StartupNotify=true` inside the `.desktop` file of their application.
-//!
-//! The specification could be found [`here`].
-//!
-//! [`here`]: https://specifications.freedesktop.org/startup-notification-spec/startup-notification-latest.txt
-
-use std::env;
-
-use crate::error::NotSupportedError;
-use crate::event_loop::{ActiveEventLoop, AsyncRequestSerial};
-use crate::window::{ActivationToken, Window, WindowAttributes};
-
-/// The variable which is used mostly on X11.
-const X11_VAR: &str = "DESKTOP_STARTUP_ID";
-
-/// The variable which is used mostly on Wayland.
-const WAYLAND_VAR: &str = "XDG_ACTIVATION_TOKEN";
-
-pub trait EventLoopExtStartupNotify {
-    /// Read the token from the environment.
-    ///
-    /// It's recommended **to unset** this environment variable for child processes.
-    fn read_token_from_env(&self) -> Option<ActivationToken>;
-}
-
-pub trait WindowExtStartupNotify {
-    /// Request a new activation token.
-    ///
-    /// The token will be delivered inside
-    fn request_activation_token(&self) -> Result<AsyncRequestSerial, NotSupportedError>;
-}
-
-pub trait WindowAttributesExtStartupNotify {
-    /// Use this [`ActivationToken`] during window creation.
-    ///
-    /// Not using such a token upon a window could make your window not gaining
-    /// focus until the user clicks on the window.
-    fn with_activation_token(self, token: ActivationToken) -> Self;
-}
-
-impl EventLoopExtStartupNotify for ActiveEventLoop {
-    fn read_token_from_env(&self) -> Option<ActivationToken> {
-        match self.p {
-            #[cfg(wayland_platform)]
-            crate::platform_impl::ActiveEventLoop::Wayland(_) => env::var(WAYLAND_VAR),
-            #[cfg(x11_platform)]
-            crate::platform_impl::ActiveEventLoop::X(_) => env::var(X11_VAR),
-        }
-        .ok()
-        .map(ActivationToken::_new)
-    }
-}
-
-impl WindowExtStartupNotify for Window {
-    fn request_activation_token(&self) -> Result<AsyncRequestSerial, NotSupportedError> {
-        self.window.request_activation_token()
-    }
-}
-
-impl WindowAttributesExtStartupNotify for WindowAttributes {
-    fn with_activation_token(mut self, token: ActivationToken) -> Self {
-        self.platform_specific.activation_token = Some(token);
-        self
-    }
-}
-
-/// Remove the activation environment variables from the current process.
-///
-/// This is wise to do before running child processes,
-/// which may not to support the activation token.
-pub fn reset_activation_token_env() {
-    env::remove_var(X11_VAR);
-    env::remove_var(WAYLAND_VAR);
-}
-
-/// Set environment variables responsible for activation token.
-///
-/// This could be used before running daemon processes.
-pub fn set_activation_token_env(token: ActivationToken) {
-    env::set_var(X11_VAR, &token._token);
-    env::set_var(WAYLAND_VAR, token._token);
-}

src/platform/wayland.rs

@@ -1,102 +0,0 @@
-//! # Wayland
-//!
-//! **Note:** Windows don't appear on Wayland until you draw/present to them.
-//!
-//! By default, Winit loads system libraries using `dlopen`. This can be
-//! disabled by disabling the `"wayland-dlopen"` cargo feature.
-//!
-//! ## Client-side decorations
-//!
-//! Winit provides client-side decorations by default, but the behaviour can
-//! be controlled with the following feature flags:
-//!
-//! * `wayland-csd-adwaita` (default).
-//! * `wayland-csd-adwaita-crossfont`.
-//! * `wayland-csd-adwaita-notitle`.
-use crate::{
-    event_loop::{ActiveEventLoop, EventLoopBuilder},
-    monitor::MonitorHandle,
-    window::{Window, WindowAttributes},
-};
-
-pub use crate::window::Theme;
-
-/// Additional methods on [`ActiveEventLoop`] that are specific to Wayland.
-pub trait ActiveEventLoopExtWayland {
-    /// True if the [`ActiveEventLoop`] uses Wayland.
-    fn is_wayland(&self) -> bool;
-}
-
-impl ActiveEventLoopExtWayland for ActiveEventLoop {
-    #[inline]
-    fn is_wayland(&self) -> bool {
-        self.p.is_wayland()
-    }
-}
-
-/// Additional methods on [`EventLoopBuilder`] that are specific to Wayland.
-pub trait EventLoopBuilderExtWayland {
-    /// Force using Wayland.
-    fn with_wayland(&mut self) -> &mut Self;
-
-    /// Whether to allow the event loop to be created off of the main thread.
-    ///
-    /// By default, the window is only allowed to be created on the main
-    /// thread, to make platform compatibility easier.
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self;
-}
-
-impl<T> EventLoopBuilderExtWayland for EventLoopBuilder<T> {
-    #[inline]
-    fn with_wayland(&mut self) -> &mut Self {
-        self.platform_specific.forced_backend = Some(crate::platform_impl::Backend::Wayland);
-        self
-    }
-
-    #[inline]
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self {
-        self.platform_specific.any_thread = any_thread;
-        self
-    }
-}
-
-/// Additional methods on [`Window`] that are specific to Wayland.
-pub trait WindowExtWayland {}
-
-impl WindowExtWayland for Window {}
-
-/// Additional methods on [`WindowAttributes`] that are specific to Wayland.
-pub trait WindowAttributesExtWayland {
-    /// Build window with the given name.
-    ///
-    /// The `general` name sets an application ID, which should match the `.desktop`
-    /// file distributed with your program. The `instance` is a `no-op`.
-    ///
-    /// For details about application ID conventions, see the
-    /// [Desktop Entry Spec](https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id)
-    fn with_name(self, general: impl Into<String>, instance: impl Into<String>) -> Self;
-}
-
-impl WindowAttributesExtWayland for WindowAttributes {
-    #[inline]
-    fn with_name(mut self, general: impl Into<String>, instance: impl Into<String>) -> Self {
-        self.platform_specific.name = Some(crate::platform_impl::ApplicationName::new(
-            general.into(),
-            instance.into(),
-        ));
-        self
-    }
-}
-
-/// Additional methods on `MonitorHandle` that are specific to Wayland.
-pub trait MonitorHandleExtWayland {
-    /// Returns the inner identifier of the monitor.
-    fn native_id(&self) -> u32;
-}
-
-impl MonitorHandleExtWayland for MonitorHandle {
-    #[inline]
-    fn native_id(&self) -> u32 {
-        self.inner.native_identifier()
-    }
-}

src/platform/web.rs

@@ -1,374 +0,0 @@
-//! # Web
-//!
-//! The officially supported browsers are Chrome, Firefox and Safari 13.1+,
-//! though forks of these should work fine.
-//!
-//! Winit supports compiling to the `wasm32-unknown-unknown` target with
-//! `web-sys`.
-//!
-//! On the web platform, a Winit window is backed by a `<canvas>` element. You
-//! can either [provide Winit with a `<canvas>` element][with_canvas], or
-//! [let Winit create a `<canvas>` element which you can then retrieve][get]
-//! and insert it into the DOM yourself.
-//!
-//! Currently, there is no example code using Winit on Web, see [#3473]. For
-//! information on using Rust on WebAssembly, check out the [Rust and
-//! WebAssembly book].
-//!
-//! [with_canvas]: WindowAttributesExtWebSys::with_canvas
-//! [get]: WindowExtWebSys::canvas
-//! [#3473]: https://github.com/rust-windowing/winit/issues/3473
-//! [Rust and WebAssembly book]: https://rustwasm.github.io/book/
-//!
-//! ## CSS properties
-//!
-//! It is recommended **not** to apply certain CSS properties to the canvas:
-//! - [`transform`](https://developer.mozilla.org/en-US/docs/Web/CSS/transform)
-//! - [`border`](https://developer.mozilla.org/en-US/docs/Web/CSS/border)
-//! - [`padding`](https://developer.mozilla.org/en-US/docs/Web/CSS/padding)
-//!
-//! The following APIs can't take them into account and will therefore provide inaccurate results:
-//! - [`WindowEvent::Resized`] and [`Window::(set_)inner_size()`]
-//! - [`WindowEvent::Occluded`]
-//! - [`WindowEvent::CursorMoved`], [`WindowEvent::CursorEntered`], [`WindowEvent::CursorLeft`],
-//!   and [`WindowEvent::Touch`].
-//! - [`Window::set_outer_position()`]
-//!
-//! [`WindowEvent::Resized`]: crate::event::WindowEvent::Resized
-//! [`Window::(set_)inner_size()`]: crate::window::Window::inner_size
-//! [`WindowEvent::Occluded`]: crate::event::WindowEvent::Occluded
-//! [`WindowEvent::CursorMoved`]: crate::event::WindowEvent::CursorMoved
-//! [`WindowEvent::CursorEntered`]: crate::event::WindowEvent::CursorEntered
-//! [`WindowEvent::CursorLeft`]: crate::event::WindowEvent::CursorLeft
-//! [`WindowEvent::Touch`]: crate::event::WindowEvent::Touch
-//! [`Window::set_outer_position()`]: crate::window::Window::set_outer_position
-
-use std::error::Error;
-use std::fmt::{self, Display, Formatter};
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use std::time::Duration;
-
-#[cfg(web_platform)]
-use web_sys::HtmlCanvasElement;
-
-use crate::cursor::CustomCursorSource;
-use crate::event::Event;
-use crate::event_loop::{ActiveEventLoop, EventLoop};
-#[cfg(web_platform)]
-use crate::platform_impl::CustomCursorFuture as PlatformCustomCursorFuture;
-use crate::platform_impl::PlatformCustomCursorSource;
-use crate::window::{CustomCursor, Window, WindowAttributes};
-
-#[cfg(not(web_platform))]
-#[doc(hidden)]
-pub struct HtmlCanvasElement;
-
-pub trait WindowExtWebSys {
-    /// Only returns the canvas if called from inside the window context (the
-    /// main thread).
-    fn canvas(&self) -> Option<HtmlCanvasElement>;
-
-    /// Returns [`true`] if calling `event.preventDefault()` is enabled.
-    ///
-    /// See [`Window::set_prevent_default()`] for more details.
-    fn prevent_default(&self) -> bool;
-
-    /// Sets whether `event.preventDefault()` should be called on events on the
-    /// canvas that have side effects.
-    ///
-    /// For example, by default using the mouse wheel would cause the page to scroll, enabling this
-    /// would prevent that.
-    ///
-    /// Some events are impossible to prevent. E.g. Firefox allows to access the native browser
-    /// context menu with Shift+Rightclick.
-    fn set_prevent_default(&self, prevent_default: bool);
-}
-
-impl WindowExtWebSys for Window {
-    #[inline]
-    fn canvas(&self) -> Option<HtmlCanvasElement> {
-        self.window.canvas()
-    }
-
-    fn prevent_default(&self) -> bool {
-        self.window.prevent_default()
-    }
-
-    fn set_prevent_default(&self, prevent_default: bool) {
-        self.window.set_prevent_default(prevent_default)
-    }
-}
-
-pub trait WindowAttributesExtWebSys {
-    /// Pass an [`HtmlCanvasElement`] to be used for this [`Window`]. If [`None`],
-    /// [`WindowAttributes::default()`] will create one.
-    ///
-    /// In any case, the canvas won't be automatically inserted into the web page.
-    ///
-    /// [`None`] by default.
-    #[cfg_attr(
-        not(web_platform),
-        doc = "",
-        doc = "[`HtmlCanvasElement`]: #only-available-on-wasm"
-    )]
-    fn with_canvas(self, canvas: Option<HtmlCanvasElement>) -> Self;
-
-    /// Sets whether `event.preventDefault()` should be called on events on the
-    /// canvas that have side effects.
-    ///
-    /// See [`Window::set_prevent_default()`] for more details.
-    ///
-    /// Enabled by default.
-    fn with_prevent_default(self, prevent_default: bool) -> Self;
-
-    /// Whether the canvas should be focusable using the tab key. This is necessary to capture
-    /// canvas keyboard events.
-    ///
-    /// Enabled by default.
-    fn with_focusable(self, focusable: bool) -> Self;
-
-    /// On window creation, append the canvas element to the web page if it isn't already.
-    ///
-    /// Disabled by default.
-    fn with_append(self, append: bool) -> Self;
-}
-
-impl WindowAttributesExtWebSys for WindowAttributes {
-    fn with_canvas(mut self, canvas: Option<HtmlCanvasElement>) -> Self {
-        self.platform_specific.set_canvas(canvas);
-        self
-    }
-
-    fn with_prevent_default(mut self, prevent_default: bool) -> Self {
-        self.platform_specific.prevent_default = prevent_default;
-        self
-    }
-
-    fn with_focusable(mut self, focusable: bool) -> Self {
-        self.platform_specific.focusable = focusable;
-        self
-    }
-
-    fn with_append(mut self, append: bool) -> Self {
-        self.platform_specific.append = append;
-        self
-    }
-}
-
-/// Additional methods on `EventLoop` that are specific to the web.
-pub trait EventLoopExtWebSys {
-    /// A type provided by the user that can be passed through `Event::UserEvent`.
-    type UserEvent;
-
-    /// Initializes the winit event loop.
-    ///
-    /// Unlike
-    #[cfg_attr(
-        all(web_platform, target_feature = "exception-handling"),
-        doc = "`run()`"
-    )]
-    #[cfg_attr(
-        not(all(web_platform, target_feature = "exception-handling")),
-        doc = "[`run()`]"
-    )]
-    /// [^1], this returns immediately, and doesn't throw an exception in order to
-    /// satisfy its [`!`] return type.
-    ///
-    /// Once the event loop has been destroyed, it's possible to reinitialize another event loop
-    /// by calling this function again. This can be useful if you want to recreate the event loop
-    /// while the WebAssembly module is still loaded. For example, this can be used to recreate the
-    /// event loop when switching between tabs on a single page application.
-    ///
-    #[cfg_attr(
-        not(all(web_platform, target_feature = "exception-handling")),
-        doc = "[`run()`]: EventLoop::run()"
-    )]
-    /// [^1]: `run()` is _not_ available on WASM when the target supports `exception-handling`.
-    fn spawn<F>(self, event_handler: F)
-    where
-        F: 'static + FnMut(Event<Self::UserEvent>, &ActiveEventLoop);
-}
-
-impl<T> EventLoopExtWebSys for EventLoop<T> {
-    type UserEvent = T;
-
-    fn spawn<F>(self, event_handler: F)
-    where
-        F: 'static + FnMut(Event<Self::UserEvent>, &ActiveEventLoop),
-    {
-        self.event_loop.spawn(event_handler)
-    }
-}
-
-pub trait ActiveEventLoopExtWebSys {
-    /// Sets the strategy for [`ControlFlow::Poll`].
-    ///
-    /// See [`PollStrategy`].
-    ///
-    /// [`ControlFlow::Poll`]: crate::event_loop::ControlFlow::Poll
-    fn set_poll_strategy(&self, strategy: PollStrategy);
-
-    /// Gets the strategy for [`ControlFlow::Poll`].
-    ///
-    /// See [`PollStrategy`].
-    ///
-    /// [`ControlFlow::Poll`]: crate::event_loop::ControlFlow::Poll
-    fn poll_strategy(&self) -> PollStrategy;
-
-    /// Async version of [`ActiveEventLoop::create_custom_cursor()`] which waits until the
-    /// cursor has completely finished loading.
-    fn create_custom_cursor_async(&self, source: CustomCursorSource) -> CustomCursorFuture;
-}
-
-impl ActiveEventLoopExtWebSys for ActiveEventLoop {
-    #[inline]
-    fn create_custom_cursor_async(&self, source: CustomCursorSource) -> CustomCursorFuture {
-        self.p.create_custom_cursor_async(source)
-    }
-
-    #[inline]
-    fn set_poll_strategy(&self, strategy: PollStrategy) {
-        self.p.set_poll_strategy(strategy);
-    }
-
-    #[inline]
-    fn poll_strategy(&self) -> PollStrategy {
-        self.p.poll_strategy()
-    }
-}
-
-/// Strategy used for [`ControlFlow::Poll`](crate::event_loop::ControlFlow::Poll).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum PollStrategy {
-    /// Uses [`Window.requestIdleCallback()`] to queue the next event loop. If not available
-    /// this will fallback to [`setTimeout()`].
-    ///
-    /// This strategy will wait for the browser to enter an idle period before running and might
-    /// be affected by browser throttling.
-    ///
-    /// [`Window.requestIdleCallback()`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback
-    /// [`setTimeout()`]: https://developer.mozilla.org/en-US/docs/Web/API/setTimeout
-    IdleCallback,
-    /// Uses the [Prioritized Task Scheduling API] to queue the next event loop. If not available
-    /// this will fallback to [`setTimeout()`].
-    ///
-    /// This strategy will run as fast as possible without disturbing users from interacting with
-    /// the page and is not affected by browser throttling.
-    ///
-    /// This is the default strategy.
-    ///
-    /// [Prioritized Task Scheduling API]: https://developer.mozilla.org/en-US/docs/Web/API/Prioritized_Task_Scheduling_API
-    /// [`setTimeout()`]: https://developer.mozilla.org/en-US/docs/Web/API/setTimeout
-    #[default]
-    Scheduler,
-}
-
-pub trait CustomCursorExtWebSys {
-    /// Returns if this cursor is an animation.
-    fn is_animation(&self) -> bool;
-
-    /// Creates a new cursor from a URL pointing to an image.
-    /// It uses the [url css function](https://developer.mozilla.org/en-US/docs/Web/CSS/url),
-    /// but browser support for image formats is inconsistent. Using [PNG] is recommended.
-    ///
-    /// [PNG]: https://en.wikipedia.org/wiki/PNG
-    fn from_url(url: String, hotspot_x: u16, hotspot_y: u16) -> CustomCursorSource;
-
-    /// Crates a new animated cursor from multiple [`CustomCursor`]s.
-    /// Supplied `cursors` can't be empty or other animations.
-    fn from_animation(
-        duration: Duration,
-        cursors: Vec<CustomCursor>,
-    ) -> Result<CustomCursorSource, BadAnimation>;
-}
-
-impl CustomCursorExtWebSys for CustomCursor {
-    fn is_animation(&self) -> bool {
-        self.inner.animation
-    }
-
-    fn from_url(url: String, hotspot_x: u16, hotspot_y: u16) -> CustomCursorSource {
-        CustomCursorSource {
-            inner: PlatformCustomCursorSource::Url {
-                url,
-                hotspot_x,
-                hotspot_y,
-            },
-        }
-    }
-
-    fn from_animation(
-        duration: Duration,
-        cursors: Vec<CustomCursor>,
-    ) -> Result<CustomCursorSource, BadAnimation> {
-        if cursors.is_empty() {
-            return Err(BadAnimation::Empty);
-        }
-
-        if cursors.iter().any(CustomCursor::is_animation) {
-            return Err(BadAnimation::Animation);
-        }
-
-        Ok(CustomCursorSource {
-            inner: PlatformCustomCursorSource::Animation { duration, cursors },
-        })
-    }
-}
-
-/// An error produced when using [`CustomCursor::from_animation`] with invalid arguments.
-#[derive(Debug, Clone)]
-pub enum BadAnimation {
-    /// Produced when no cursors were supplied.
-    Empty,
-    /// Produced when a supplied cursor is an animation.
-    Animation,
-}
-
-impl fmt::Display for BadAnimation {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Empty => write!(f, "No cursors supplied"),
-            Self::Animation => write!(f, "A supplied cursor is an animtion"),
-        }
-    }
-}
-
-impl Error for BadAnimation {}
-
-#[cfg(not(web_platform))]
-struct PlatformCustomCursorFuture;
-
-#[derive(Debug)]
-pub struct CustomCursorFuture(pub(crate) PlatformCustomCursorFuture);
-
-impl Future for CustomCursorFuture {
-    type Output = Result<CustomCursor, CustomCursorError>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.0)
-            .poll(cx)
-            .map_ok(|cursor| CustomCursor { inner: cursor })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum CustomCursorError {
-    Blob,
-    Decode(String),
-    Animation,
-}
-
-impl Display for CustomCursorError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Blob => write!(f, "failed to create `Blob`"),
-            Self::Decode(error) => write!(f, "failed to decode image: {error}"),
-            Self::Animation => write!(
-                f,
-                "found `CustomCursor` that is an animation when building an animation"
-            ),
-        }
-    }
-}

src/platform/windows.rs

@@ -1,550 +0,0 @@
-//! # Windows
-//!
-//! The supported OS version is Windows 7 or higher, though Windows 10 is
-//! tested regularly.
-use std::{ffi::c_void, path::Path};
-
-use crate::{
-    dpi::PhysicalSize,
-    event::DeviceId,
-    event_loop::EventLoopBuilder,
-    monitor::MonitorHandle,
-    window::{BadIcon, Icon, Window, WindowAttributes},
-};
-
-/// Window Handle type used by Win32 API
-pub type HWND = isize;
-/// Menu Handle type used by Win32 API
-pub type HMENU = isize;
-/// Monitor Handle type used by Win32 API
-pub type HMONITOR = isize;
-
-/// Describes a system-drawn backdrop material of a window.
-///
-/// For a detailed explanation, see [`DWM_SYSTEMBACKDROP_TYPE docs`].
-///
-/// [`DWM_SYSTEMBACKDROP_TYPE docs`]: https://learn.microsoft.com/en-us/windows/win32/api/dwmapi/ne-dwmapi-dwm_systembackdrop_type
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum BackdropType {
-    /// Corresponds to `DWMSBT_AUTO`.
-    ///
-    /// Usually draws a default backdrop effect on the title bar.
-    #[default]
-    Auto = 0,
-
-    /// Corresponds to `DWMSBT_NONE`.
-    None = 1,
-
-    /// Corresponds to `DWMSBT_MAINWINDOW`.
-    ///
-    /// Draws the Mica backdrop material.
-    MainWindow = 2,
-
-    /// Corresponds to `DWMSBT_TRANSIENTWINDOW`.
-    ///
-    /// Draws the Background Acrylic backdrop material.
-    TransientWindow = 3,
-
-    /// Corresponds to `DWMSBT_TABBEDWINDOW`.
-    ///
-    /// Draws the Alt Mica backdrop material.
-    TabbedWindow = 4,
-}
-
-/// Describes a color used by Windows
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct Color(u32);
-
-impl Color {
-    /// Use the system's default color
-    pub const SYSTEM_DEFAULT: Color = Color(0xFFFFFFFF);
-
-    //Special constant only valid for the window border and therefore modeled using Option<Color> for user facing code
-    const NONE: Color = Color(0xFFFFFFFE);
-
-    /// Create a new color from the given RGB values
-    pub const fn from_rgb(r: u8, g: u8, b: u8) -> Self {
-        Self((r as u32) | ((g as u32) << 8) | ((b as u32) << 16))
-    }
-}
-
-impl Default for Color {
-    fn default() -> Self {
-        Self::SYSTEM_DEFAULT
-    }
-}
-
-/// Describes how the corners of a window should look like.
-///
-/// For a detailed explanation, see [`DWM_WINDOW_CORNER_PREFERENCE docs`].
-///
-/// [`DWM_WINDOW_CORNER_PREFERENCE docs`]: https://learn.microsoft.com/en-us/windows/win32/api/dwmapi/ne-dwmapi-dwm_window_corner_preference
-#[repr(i32)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum CornerPreference {
-    /// Corresponds to `DWMWCP_DEFAULT`.
-    ///
-    /// Let the system decide when to round window corners.
-    #[default]
-    Default = 0,
-
-    /// Corresponds to `DWMWCP_DONOTROUND`.
-    ///
-    /// Never round window corners.
-    DoNotRound = 1,
-
-    /// Corresponds to `DWMWCP_ROUND`.
-    ///
-    /// Round the corners, if appropriate.
-    Round = 2,
-
-    /// Corresponds to `DWMWCP_ROUNDSMALL`.
-    ///
-    /// Round the corners if appropriate, with a small radius.
-    RoundSmall = 3,
-}
-
-/// Additional methods on `EventLoop` that are specific to Windows.
-pub trait EventLoopBuilderExtWindows {
-    /// Whether to allow the event loop to be created off of the main thread.
-    ///
-    /// By default, the window is only allowed to be created on the main
-    /// thread, to make platform compatibility easier.
-    ///
-    /// # `Window` caveats
-    ///
-    /// Note that any `Window` created on the new thread will be destroyed when the thread
-    /// terminates. Attempting to use a `Window` after its parent thread terminates has
-    /// unspecified, although explicitly not undefined, behavior.
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self;
-
-    /// Whether to enable process-wide DPI awareness.
-    ///
-    /// By default, `winit` will attempt to enable process-wide DPI awareness. If
-    /// that's undesirable, you can disable it with this function.
-    ///
-    /// # Example
-    ///
-    /// Disable process-wide DPI awareness.
-    ///
-    /// ```
-    /// use winit::event_loop::EventLoopBuilder;
-    /// #[cfg(target_os = "windows")]
-    /// use winit::platform::windows::EventLoopBuilderExtWindows;
-    ///
-    /// let mut builder = EventLoopBuilder::new();
-    /// #[cfg(target_os = "windows")]
-    /// builder.with_dpi_aware(false);
-    /// # if false { // We can't test this part
-    /// let event_loop = builder.build();
-    /// # }
-    /// ```
-    fn with_dpi_aware(&mut self, dpi_aware: bool) -> &mut Self;
-
-    /// A callback to be executed before dispatching a win32 message to the window procedure.
-    /// Return true to disable winit's internal message dispatching.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// # use windows_sys::Win32::UI::WindowsAndMessaging::{ACCEL, CreateAcceleratorTableW, TranslateAcceleratorW, DispatchMessageW, TranslateMessage, MSG};
-    /// use winit::event_loop::EventLoopBuilder;
-    /// #[cfg(target_os = "windows")]
-    /// use winit::platform::windows::EventLoopBuilderExtWindows;
-    ///
-    /// let mut builder = EventLoopBuilder::new();
-    /// #[cfg(target_os = "windows")]
-    /// builder.with_msg_hook(|msg|{
-    ///     let msg = msg as *const MSG;
-    /// #   let accels: Vec<ACCEL> = Vec::new();
-    ///     let translated = unsafe {
-    ///         TranslateAcceleratorW(
-    ///             (*msg).hwnd,
-    ///             CreateAcceleratorTableW(accels.as_ptr() as _, 1),
-    ///             msg,
-    ///         ) == 1
-    ///     };
-    ///     translated
-    /// });
-    /// ```
-    fn with_msg_hook<F>(&mut self, callback: F) -> &mut Self
-    where
-        F: FnMut(*const c_void) -> bool + 'static;
-}
-
-impl<T> EventLoopBuilderExtWindows for EventLoopBuilder<T> {
-    #[inline]
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self {
-        self.platform_specific.any_thread = any_thread;
-        self
-    }
-
-    #[inline]
-    fn with_dpi_aware(&mut self, dpi_aware: bool) -> &mut Self {
-        self.platform_specific.dpi_aware = dpi_aware;
-        self
-    }
-
-    #[inline]
-    fn with_msg_hook<F>(&mut self, callback: F) -> &mut Self
-    where
-        F: FnMut(*const c_void) -> bool + 'static,
-    {
-        self.platform_specific.msg_hook = Some(Box::new(callback));
-        self
-    }
-}
-
-/// Additional methods on `Window` that are specific to Windows.
-pub trait WindowExtWindows {
-    /// Enables or disables mouse and keyboard input to the specified window.
-    ///
-    /// A window must be enabled before it can be activated.
-    /// If an application has create a modal dialog box by disabling its owner window
-    /// (as described in [`WindowAttributesExtWindows::with_owner_window`]), the application must enable
-    /// the owner window before destroying the dialog box.
-    /// Otherwise, another window will receive the keyboard focus and be activated.
-    ///
-    /// If a child window is disabled, it is ignored when the system tries to determine which
-    /// window should receive mouse messages.
-    ///
-    /// For more information, see <https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-enablewindow#remarks>
-    /// and <https://docs.microsoft.com/en-us/windows/win32/winmsg/window-features#disabled-windows>
-    fn set_enable(&self, enabled: bool);
-
-    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
-    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
-
-    /// Whether to show or hide the window icon in the taskbar.
-    fn set_skip_taskbar(&self, skip: bool);
-
-    /// Shows or hides the background drop shadow for undecorated windows.
-    ///
-    /// Enabling the shadow causes a thin 1px line to appear on the top of the window.
-    fn set_undecorated_shadow(&self, shadow: bool);
-
-    /// Sets system-drawn backdrop type.
-    ///
-    /// Requires Windows 11 build 22523+.
-    fn set_system_backdrop(&self, backdrop_type: BackdropType);
-
-    /// Sets the color of the window border.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn set_border_color(&self, color: Option<Color>);
-
-    /// Sets the background color of the title bar.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn set_title_background_color(&self, color: Option<Color>);
-
-    /// Sets the color of the window title.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn set_title_text_color(&self, color: Color);
-
-    /// Sets the preferred style of the window corners.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn set_corner_preference(&self, preference: CornerPreference);
-}
-
-impl WindowExtWindows for Window {
-    #[inline]
-    fn set_enable(&self, enabled: bool) {
-        self.window.set_enable(enabled)
-    }
-
-    #[inline]
-    fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>) {
-        self.window.set_taskbar_icon(taskbar_icon)
-    }
-
-    #[inline]
-    fn set_skip_taskbar(&self, skip: bool) {
-        self.window.set_skip_taskbar(skip)
-    }
-
-    #[inline]
-    fn set_undecorated_shadow(&self, shadow: bool) {
-        self.window.set_undecorated_shadow(shadow)
-    }
-
-    #[inline]
-    fn set_system_backdrop(&self, backdrop_type: BackdropType) {
-        self.window.set_system_backdrop(backdrop_type)
-    }
-
-    #[inline]
-    fn set_border_color(&self, color: Option<Color>) {
-        self.window.set_border_color(color.unwrap_or(Color::NONE))
-    }
-
-    #[inline]
-    fn set_title_background_color(&self, color: Option<Color>) {
-        // The windows docs don't mention NONE as a valid options but it works in practice and is useful
-        // to circumvent the Windows option "Show accent color on title bars and window borders"
-        self.window
-            .set_title_background_color(color.unwrap_or(Color::NONE))
-    }
-
-    #[inline]
-    fn set_title_text_color(&self, color: Color) {
-        self.window.set_title_text_color(color)
-    }
-
-    #[inline]
-    fn set_corner_preference(&self, preference: CornerPreference) {
-        self.window.set_corner_preference(preference)
-    }
-}
-
-/// Additional methods on `WindowAttributes` that are specific to Windows.
-#[allow(rustdoc::broken_intra_doc_links)]
-pub trait WindowAttributesExtWindows {
-    /// Set an owner to the window to be created. Can be used to create a dialog box, for example.
-    /// This only works when [`WindowAttributes::with_parent_window`] isn't called or set to `None`.
-    /// Can be used in combination with [`WindowExtWindows::set_enable(false)`](WindowExtWindows::set_enable)
-    /// on the owner window to create a modal dialog box.
-    ///
-    /// From MSDN:
-    /// - An owned window is always above its owner in the z-order.
-    /// - The system automatically destroys an owned window when its owner is destroyed.
-    /// - An owned window is hidden when its owner is minimized.
-    ///
-    /// For more information, see <https://docs.microsoft.com/en-us/windows/win32/winmsg/window-features#owned-windows>
-    fn with_owner_window(self, parent: HWND) -> Self;
-
-    /// Sets a menu on the window to be created.
-    ///
-    /// Parent and menu are mutually exclusive; a child window cannot have a menu!
-    ///
-    /// The menu must have been manually created beforehand with [`CreateMenu`] or similar.
-    ///
-    /// Note: Dark mode cannot be supported for win32 menus, it's simply not possible to change how the menus look.
-    /// If you use this, it is recommended that you combine it with `with_theme(Some(Theme::Light))` to avoid a jarring effect.
-    ///
-    #[cfg_attr(
-        platform_windows,
-        doc = "[`CreateMenu`]: windows_sys::Win32::UI::WindowsAndMessaging::CreateMenu"
-    )]
-    #[cfg_attr(
-        not(platform_windows),
-        doc = "[`CreateMenu`]: #only-available-on-windows"
-    )]
-    fn with_menu(self, menu: HMENU) -> Self;
-
-    /// This sets `ICON_BIG`. A good ceiling here is 256x256.
-    fn with_taskbar_icon(self, taskbar_icon: Option<Icon>) -> Self;
-
-    /// This sets `WS_EX_NOREDIRECTIONBITMAP`.
-    fn with_no_redirection_bitmap(self, flag: bool) -> Self;
-
-    /// Enables or disables drag and drop support (enabled by default). Will interfere with other crates
-    /// that use multi-threaded COM API (`CoInitializeEx` with `COINIT_MULTITHREADED` instead of
-    /// `COINIT_APARTMENTTHREADED`) on the same thread. Note that winit may still attempt to initialize
-    /// COM API regardless of this option. Currently only fullscreen mode does that, but there may be more in the future.
-    /// If you need COM API with `COINIT_MULTITHREADED` you must initialize it before calling any winit functions.
-    /// See <https://docs.microsoft.com/en-us/windows/win32/api/objbase/nf-objbase-coinitialize#remarks> for more information.
-    fn with_drag_and_drop(self, flag: bool) -> Self;
-
-    /// Whether show or hide the window icon in the taskbar.
-    fn with_skip_taskbar(self, skip: bool) -> Self;
-
-    /// Customize the window class name.
-    fn with_class_name<S: Into<String>>(self, class_name: S) -> Self;
-
-    /// Shows or hides the background drop shadow for undecorated windows.
-    ///
-    /// The shadow is hidden by default.
-    /// Enabling the shadow causes a thin 1px line to appear on the top of the window.
-    fn with_undecorated_shadow(self, shadow: bool) -> Self;
-
-    /// Sets system-drawn backdrop type.
-    ///
-    /// Requires Windows 11 build 22523+.
-    fn with_system_backdrop(self, backdrop_type: BackdropType) -> Self;
-
-    /// This sets or removes `WS_CLIPCHILDREN` style.
-    fn with_clip_children(self, flag: bool) -> Self;
-
-    /// Sets the color of the window border.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn with_border_color(self, color: Option<Color>) -> Self;
-
-    /// Sets the background color of the title bar.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn with_title_background_color(self, color: Option<Color>) -> Self;
-
-    /// Sets the color of the window title.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn with_title_text_color(self, color: Color) -> Self;
-
-    /// Sets the preferred style of the window corners.
-    ///
-    /// Supported starting with Windows 11 Build 22000.
-    fn with_corner_preference(self, corners: CornerPreference) -> Self;
-}
-
-impl WindowAttributesExtWindows for WindowAttributes {
-    #[inline]
-    fn with_owner_window(mut self, parent: HWND) -> Self {
-        self.platform_specific.owner = Some(parent);
-        self
-    }
-
-    #[inline]
-    fn with_menu(mut self, menu: HMENU) -> Self {
-        self.platform_specific.menu = Some(menu);
-        self
-    }
-
-    #[inline]
-    fn with_taskbar_icon(mut self, taskbar_icon: Option<Icon>) -> Self {
-        self.platform_specific.taskbar_icon = taskbar_icon;
-        self
-    }
-
-    #[inline]
-    fn with_no_redirection_bitmap(mut self, flag: bool) -> Self {
-        self.platform_specific.no_redirection_bitmap = flag;
-        self
-    }
-
-    #[inline]
-    fn with_drag_and_drop(mut self, flag: bool) -> Self {
-        self.platform_specific.drag_and_drop = flag;
-        self
-    }
-
-    #[inline]
-    fn with_skip_taskbar(mut self, skip: bool) -> Self {
-        self.platform_specific.skip_taskbar = skip;
-        self
-    }
-
-    #[inline]
-    fn with_class_name<S: Into<String>>(mut self, class_name: S) -> Self {
-        self.platform_specific.class_name = class_name.into();
-        self
-    }
-
-    #[inline]
-    fn with_undecorated_shadow(mut self, shadow: bool) -> Self {
-        self.platform_specific.decoration_shadow = shadow;
-        self
-    }
-
-    #[inline]
-    fn with_system_backdrop(mut self, backdrop_type: BackdropType) -> Self {
-        self.platform_specific.backdrop_type = backdrop_type;
-        self
-    }
-
-    #[inline]
-    fn with_clip_children(mut self, flag: bool) -> Self {
-        self.platform_specific.clip_children = flag;
-        self
-    }
-
-    #[inline]
-    fn with_border_color(mut self, color: Option<Color>) -> Self {
-        self.platform_specific.border_color = Some(color.unwrap_or(Color::NONE));
-        self
-    }
-
-    #[inline]
-    fn with_title_background_color(mut self, color: Option<Color>) -> Self {
-        self.platform_specific.title_background_color = Some(color.unwrap_or(Color::NONE));
-        self
-    }
-
-    #[inline]
-    fn with_title_text_color(mut self, color: Color) -> Self {
-        self.platform_specific.title_text_color = Some(color);
-        self
-    }
-
-    #[inline]
-    fn with_corner_preference(mut self, corners: CornerPreference) -> Self {
-        self.platform_specific.corner_preference = Some(corners);
-        self
-    }
-}
-
-/// Additional methods on `MonitorHandle` that are specific to Windows.
-pub trait MonitorHandleExtWindows {
-    /// Returns the name of the monitor adapter specific to the Win32 API.
-    fn native_id(&self) -> String;
-
-    /// Returns the handle of the monitor - `HMONITOR`.
-    fn hmonitor(&self) -> HMONITOR;
-}
-
-impl MonitorHandleExtWindows for MonitorHandle {
-    #[inline]
-    fn native_id(&self) -> String {
-        self.inner.native_identifier()
-    }
-
-    #[inline]
-    fn hmonitor(&self) -> HMONITOR {
-        self.inner.hmonitor()
-    }
-}
-
-/// Additional methods on `DeviceId` that are specific to Windows.
-pub trait DeviceIdExtWindows {
-    /// Returns an identifier that persistently refers to this specific device.
-    ///
-    /// Will return `None` if the device is no longer available.
-    fn persistent_identifier(&self) -> Option<String>;
-}
-
-impl DeviceIdExtWindows for DeviceId {
-    #[inline]
-    fn persistent_identifier(&self) -> Option<String> {
-        self.0.persistent_identifier()
-    }
-}
-
-/// Additional methods on `Icon` that are specific to Windows.
-pub trait IconExtWindows: Sized {
-    /// Create an icon from a file path.
-    ///
-    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
-    /// icon size from the file.
-    ///
-    /// In cases where the specified size does not exist in the file, Windows may perform scaling
-    /// to get an icon of the desired size.
-    fn from_path<P: AsRef<Path>>(path: P, size: Option<PhysicalSize<u32>>)
-        -> Result<Self, BadIcon>;
-
-    /// Create an icon from a resource embedded in this executable or library.
-    ///
-    /// Specify `size` to load a specific icon size from the file, or `None` to load the default
-    /// icon size from the file.
-    ///
-    /// In cases where the specified size does not exist in the file, Windows may perform scaling
-    /// to get an icon of the desired size.
-    fn from_resource(ordinal: u16, size: Option<PhysicalSize<u32>>) -> Result<Self, BadIcon>;
-}
-
-impl IconExtWindows for Icon {
-    fn from_path<P: AsRef<Path>>(
-        path: P,
-        size: Option<PhysicalSize<u32>>,
-    ) -> Result<Self, BadIcon> {
-        let win_icon = crate::platform_impl::WinIcon::from_path(path, size)?;
-        Ok(Icon { inner: win_icon })
-    }
-
-    fn from_resource(ordinal: u16, size: Option<PhysicalSize<u32>>) -> Result<Self, BadIcon> {
-        let win_icon = crate::platform_impl::WinIcon::from_resource(ordinal, size)?;
-        Ok(Icon { inner: win_icon })
-    }
-}

src/platform/windows/callback.rs

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

src/platform/windows/event.rs

@@ -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
+    })
+}

src/platform/windows/init.rs

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

src/platform/windows/mod.rs

@@ -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()
+    }
+}