Winit version 0.30.1

Signed-off-by: John Nunley <dev@notgull.net>

.cargo/config.toml

@@ -2,8 +2,5 @@
 #
 # Note that these flags are (intentionally) not included when building from the downloaded crate.
 [build]
-rustdocflags = ["--cfg=unreleased_changelogs"]
 rustflags = ["--cfg=unreleased_changelogs"]
-
-[target.wasm32-unknown-unknown]
-runner = "wasm-bindgen-test-runner"
+rustdocflags = ["--cfg=unreleased_changelogs"]

.git-blame-ignore-revs

@@ -2,7 +2,3 @@
 
 # chore(rustfmt): use nightly
 7b0c7b6cb2c62767ca0c73c857b299883f55a883
-# Rustfmt: use `group_imports`
-2665c120981af548433645c6383b3580dd8f8fc4
-# Use Taplo for TOML formatting
-3398ebe467c43ccfd91916c5b81ff3c68f598556

.github/CODEOWNERS

@@ -1,11 +1,10 @@
 # Android
-/src/platform/android.rs            @MarijnS95
-/src/platform_impl/android          @MarijnS95
+/src/platform/android.rs            @msiglreith @MarijnS95
+/src/platform_impl/android          @msiglreith @MarijnS95
 
-# Apple (AppKit + UIKit)
+# iOS
 /src/platform/ios.rs                @madsmtm
-/src/platform/macos.rs              @madsmtm
-/src/platform_impl/apple            @madsmtm
+/src/platform_impl/ios              @madsmtm
 
 # Unix
 /src/platform_impl/linux/mod.rs     @kchibisov
@@ -18,13 +17,17 @@
 /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            @notgull
-/src/platform_impl/windows          @notgull
+/src/platform/windows.rs            @msiglreith
+/src/platform_impl/windows          @msiglreith
 
 # Orbital (Redox OS)
 /src/platform/orbital.rs            @jackpot51

.github/ISSUE_TEMPLATE/bug_web.yml

@@ -1,5 +1,5 @@
 name: Web bug
-description: Create a Web-specific bug report
+description: Create a web-specific bug report
 labels:
   - B - bug
   - DS - web

.github/dependabot.yaml

@@ -1,22 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-        interval: daily
-    groups:
-        github-actions:
-            patterns:
-                - "*"
-
-  - package-ecosystem: npm
-    directory: src/platform_impl/web/script
-    schedule:
-        interval: daily
-    groups:
-        github-actions:
-            patterns:
-                - '*'
-    labels:
-        - "DS - web"

.github/workflows/ci.yml

@@ -10,32 +10,19 @@ jobs:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
-    - uses: taiki-e/checkout-action@v1
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
       with:
         components: rustfmt
     - name: Check Formatting
       run: cargo fmt -- --check
 
-  taplo:
-    name: Taplo
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: taiki-e/checkout-action@v1
-      - name: Install Taplo
-        uses: taiki-e/install-action@v2
-        with:
-          tool: taplo-cli
-      - name: Run Taplo
-        run: taplo fmt --check
-
   typos:
     name: Check for typos
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: taiki-e/checkout-action@v1
+      - uses: actions/checkout@v4
       - uses: taiki-e/install-action@v2
         with:
           tool: typos-cli
@@ -55,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        toolchain: [stable, nightly, '1.73']
+        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,  }
@@ -71,31 +58,22 @@ jobs:
           - { 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,   }
+          - { name: 'web',                target: wasm32-unknown-unknown,   os: ubuntu-latest,   }
         exclude:
-          # Web on nightly needs extra arguments
-          - toolchain: nightly
-            platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest }
           # Android is tested on stable-3
-          - toolchain: '1.73'
+          - toolchain: '1.70.0'
             platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
-          # Redox OS doesn't follow MSRV
-          - toolchain: '1.73'
-            platform: { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest }
         include:
-          - toolchain: '1.73'
+          - 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', target: wasm32-unknown-unknown, os: ubuntu-latest, test-options: -Zdoctest-xcompile }
           - toolchain: 'nightly'
             platform: {
-              name:         'Web Atomic',
-              target:       wasm32-unknown-unknown,
-              os:           ubuntu-latest,
-              options:      '-Zbuild-std=panic_abort,std',
-              test-options: -Zdoctest-xcompile,
-              rustflags:    '-Ctarget-feature=+atomics,+bulk-memory',
-              components:   rust-src,
+              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:
@@ -105,21 +83,19 @@ jobs:
 
       # Faster compilation and error on warnings
       RUSTFLAGS: '--codegen=debuginfo=0 --deny=warnings ${{ matrix.platform.rustflags }}'
-      RUSTDOCFLAGS: ${{ matrix.platform.rustflags }}
 
       OPTIONS: --target=${{ matrix.platform.target }} ${{ matrix.platform.options }}
-      TEST_OPTIONS: ${{ matrix.platform.test-options }}
       CMD: ${{ matrix.platform.cmd }}
 
     steps:
-    - uses: taiki-e/checkout-action@v1
+    - uses: actions/checkout@v4
 
     - name: Restore cache of cargo folder
       # We use `restore` and later `save`, so that we can create the key after
       # the cache has been downloaded.
       #
       # This could be avoided if we added Cargo.lock to the repository.
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v3
       with:
         # https://doc.rust-lang.org/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci
         path: |
@@ -140,7 +116,7 @@ jobs:
     - name: Cache cargo-apk
       if: contains(matrix.platform.target, 'android')
       id: cargo-apk-cache
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cargo/bin/cargo-apk
         # Change this key if we update the required cargo-apk version
@@ -155,11 +131,6 @@ jobs:
       if: contains(matrix.platform.target, 'android') && (steps.cargo-apk-cache.outputs.cache-hit != 'true')
       run: cargo install cargo-apk --version=^0.9.7 --locked
 
-    - uses: taiki-e/cache-cargo-install-action@v2
-      if: contains(matrix.platform.target, 'wasm32') && matrix.toolchain == 'nightly'
-      with:
-        tool: wasm-bindgen-cli
-
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.toolchain }}${{ matrix.platform.host }}
@@ -178,52 +149,52 @@ jobs:
     - name: Test dpi crate
       if: >
         contains(matrix.platform.name, 'Linux 64bit') &&
-        matrix.toolchain != '1.73'
+        matrix.toolchain != '1.70.0'
       run: cargo test -p dpi
 
     - name: Build tests
       if: >
         !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.73'
+        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') || matrix.toolchain == 'nightly') &&
+        !contains(matrix.platform.target, 'wasm32') &&
         !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.73'
+        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 $TEST_OPTIONS -- -Dwarnings
+      run: cargo clippy --all-targets $OPTIONS -- -Dwarnings
 
     - name: Build tests with serde enabled
       if: >
         !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.73'
-      run: cargo $CMD test --no-run $OPTIONS $TEST_OPTIONS --features serde
+        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') || matrix.toolchain == 'nightly') &&
+        !contains(matrix.platform.target, 'wasm32') &&
         !contains(matrix.platform.target, 'redox') &&
-        matrix.toolchain != '1.73'
-      run: cargo $CMD test $OPTIONS $TEST_OPTIONS --features serde
+        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=serde,mint,android-native-activity
+      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 --cfg=unreleased_changelogs'
 
     # See restore step above
     - name: Save cache of cargo folder
-      uses: actions/cache/save@v4
+      uses: actions/cache/save@v3
       with:
         path: |
           ~/.cargo/registry/index/
@@ -245,47 +216,13 @@ jobs:
           - { 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: 'web', target: wasm32-unknown-unknown }
           - { name: 'Windows', target: x86_64-pc-windows-gnu }
 
     steps:
-    - uses: taiki-e/checkout-action@v1
-    - uses: EmbarkStudios/cargo-deny-action@v2
+    - uses: actions/checkout@v4
+    - uses: EmbarkStudios/cargo-deny-action@v1
       with:
         command: check
         log-level: error
         arguments: --all-features --target ${{ matrix.platform.target }}
-
-  eslint:
-    name: ESLint
-
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./src/platform_impl/web/script
-
-    steps:
-      - uses: taiki-e/checkout-action@v1
-      - name: Setup NPM
-        run: npm install
-      - name: Run ESLint
-        run: npx eslint
-
-  swc:
-    name: Minimize JavaScript
-
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./src/platform_impl/web/script
-
-    steps:
-      - uses: taiki-e/checkout-action@v1
-      - name: Install SWC
-        run: sudo npm i -g @swc/cli
-      - name: Run SWC
-        run: |
-          swc . --ignore node_modules,**/*.d.ts --only **/*.ts -d . --out-file-extension min.js
-      - name: Check for diff
-        run: |
-          [[ -z $(git status -s) ]]

.github/workflows/docs.yml

@@ -29,10 +29,10 @@ jobs:
         env:
           RUSTDOCFLAGS: --crate-version master --cfg=docsrs --cfg=unreleased_changelogs
         run: |
-          cargo doc --no-deps -Z rustdoc-map -Z rustdoc-scrape-examples --features=serde,mint,android-native-activity
+          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@v5
+        uses: actions/configure-pages@v4
 
       - name: Fix permissions
         run: |

.gitignore

@@ -3,8 +3,8 @@ target/
 rls/
 .vscode/
 *~
+*.wasm
+*.ts
+*.js
 #*#
 .DS_Store
-# NPM package used to run ESLint.
-/src/platform_impl/web/script/node_modules
-/src/platform_impl/web/script/package-lock.json

Cargo.toml

@@ -1,30 +1,25 @@
 [package]
-authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
-categories = ["gui"]
-description = "Cross-platform window creation library."
-documentation = "https://docs.rs/winit"
-edition.workspace = true
-include = [
-    "/build.rs",
-    "/docs",
-    "/examples",
-    "/FEATURES.md",
-    "/LICENSE",
-    "/src",
-    "!/src/platform_impl/web/script",
-    "/src/platform_impl/web/script/**/*.min.js",
-    "/tests",
-]
-keywords = ["windowing"]
-license.workspace = true
 name = "winit"
+version = "0.30.1"
+authors = [
+    "The winit contributors",
+    "Pierre Krieger <pierre.krieger1708@gmail.com>",
+]
+description = "Cross-platform window creation library."
+keywords = ["windowing"]
 readme = "README.md"
-repository.workspace = true
+documentation = "https://docs.rs/winit"
+categories = ["gui"]
 rust-version.workspace = true
-version = "0.30.4"
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+exclude = ["/.cargo"]
 
 [package.metadata.docs.rs]
 features = [
+    "rwh_04",
+    "rwh_05",
     "rwh_06",
     "serde",
     "mint",
@@ -32,7 +27,6 @@ features = [
     "android-native-activity",
 ]
 # These are all tested in CI
-rustdoc-args = ["--cfg", "docsrs"]
 targets = [
     # Windows
     "i686-pc-windows-msvc",
@@ -49,15 +43,12 @@ targets = [
     # Web
     "wasm32-unknown-unknown",
 ]
+rustdoc-args = ["--cfg", "docsrs"]
 
 # Features are documented in either `lib.rs` or under `winit::platform`.
 [features]
-android-game-activity = ["android-activity/game-activity"]
-android-native-activity = ["android-activity/native-activity"]
 default = ["rwh_06", "x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
-mint = ["dpi/mint"]
-rwh_06 = ["dep:rwh_06", "ndk/rwh_06"]
-serde = ["dep:serde", "cursor-icon/serde", "smol_str/serde", "dpi/serde", "bitflags/serde"]
+x11 = ["x11-dl", "bytemuck", "percent-encoding", "xkbcommon-dl/x11", "x11rb"]
 wayland = [
     "wayland-client",
     "wayland-backend",
@@ -67,11 +58,17 @@ wayland = [
     "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"]
-wayland-dlopen = ["wayland-backend/dlopen"]
-x11 = ["x11-dl", "bytemuck", "percent-encoding", "xkbcommon-dl/x11", "x11rb"]
+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.1"
@@ -80,15 +77,22 @@ cfg_aliases = "0.2.1"
 bitflags = "2"
 cursor-icon = "1.1.0"
 dpi = { version = "0.1.1", path = "dpi" }
-rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"], optional = true }
+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"
-tracing = { version = "0.1.40", default-features = false }
+tracing = { version = "0.1.40", default_features = false }
 
 [dev-dependencies]
 image = { version = "0.25.0", default-features = false, features = ["png"] }
-tracing = { version = "0.1.40", default-features = false, features = ["log"] }
+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(not(any(target_os = "android", target_os = "ios")))'.dev-dependencies]
 softbuffer = { version = "0.4.0", default-features = false, features = [
@@ -98,26 +102,46 @@ softbuffer = { version = "0.4.0", default-features = false, features = [
     "wayland-dlopen",
 ] }
 
-# Android
 [target.'cfg(target_os = "android")'.dependencies]
 android-activity = "0.6.0"
 ndk = { version = "0.9.0", default-features = false }
 
-# AppKit or UIKit
-[target.'cfg(target_vendor = "apple")'.dependencies]
+[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
 core-foundation = "0.9.3"
 objc2 = "0.5.2"
 
-# AppKit
 [target.'cfg(target_os = "macos")'.dependencies]
-block2 = "0.5.1"
 core-graphics = "0.23.1"
-objc2-app-kit = { version = "0.2.2", features = [
+block2 = "0.5.1"
+
+[target.'cfg(target_os = "macos")'.dependencies.objc2-foundation]
+version = "0.2.2"
+features = [
+    "block2",
+    "dispatch",
+    "NSArray",
+    "NSAttributedString",
+    "NSData",
+    "NSDictionary",
+    "NSDistributedNotificationCenter",
+    "NSEnumerator",
+    "NSNotification",
+    "NSObjCRuntime",
+    "NSPathUtilities",
+    "NSProcessInfo",
+    "NSRunLoop",
+    "NSString",
+    "NSThread",
+    "NSValue",
+]
+
+[target.'cfg(target_os = "macos")'.dependencies.objc2-app-kit]
+version = "0.2.2"
+features = [
     "NSAppearance",
     "NSApplication",
     "NSBitmapImageRep",
     "NSButton",
-    "NSColor",
     "NSControl",
     "NSCursor",
     "NSDragging",
@@ -139,30 +163,11 @@ objc2-app-kit = { version = "0.2.2", features = [
     "NSWindow",
     "NSWindowScripting",
     "NSWindowTabGroup",
-] }
-objc2-foundation = { version = "0.2.2", features = [
-    "block2",
-    "dispatch",
-    "NSArray",
-    "NSAttributedString",
-    "NSData",
-    "NSDictionary",
-    "NSDistributedNotificationCenter",
-    "NSEnumerator",
-    "NSKeyValueObserving",
-    "NSNotification",
-    "NSObjCRuntime",
-    "NSPathUtilities",
-    "NSProcessInfo",
-    "NSRunLoop",
-    "NSString",
-    "NSThread",
-    "NSValue",
-] }
+]
 
-# UIKit
-[target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies]
-objc2-foundation = { version = "0.2.2", features = [
+[target.'cfg(target_os = "ios")'.dependencies.objc2-foundation]
+version = "0.2.2"
+features = [
     "dispatch",
     "NSArray",
     "NSEnumerator",
@@ -172,8 +177,11 @@ objc2-foundation = { version = "0.2.2", features = [
     "NSProcessInfo",
     "NSThread",
     "NSSet",
-] }
-objc2-ui-kit = { version = "0.2.2", features = [
+]
+
+[target.'cfg(target_os = "ios")'.dependencies.objc2-ui-kit]
+version = "0.2.2"
+features = [
     "UIApplication",
     "UIDevice",
     "UIEvent",
@@ -192,12 +200,14 @@ objc2-ui-kit = { version = "0.2.2", features = [
     "UIView",
     "UIViewController",
     "UIWindow",
-] }
+]
 
-# Windows
 [target.'cfg(target_os = "windows")'.dependencies]
 unicode-segmentation = "1.7.1"
-windows-sys = { version = "0.52.0", features = [
+
+[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
+version = "0.52.0"
+features = [
     "Win32_Devices_HumanInterfaceDevice",
     "Win32_Foundation",
     "Win32_Globalization",
@@ -222,13 +232,12 @@ windows-sys = { version = "0.52.0", features = [
     "Win32_UI_Shell",
     "Win32_UI_TextServices",
     "Win32_UI_WindowsAndMessaging",
-] }
+]
 
-# Linux
-[target.'cfg(all(unix, not(any(target_os = "redox", target_family = "wasm", target_os = "android", target_vendor = "apple"))))'.dependencies]
+[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.13.0"
+calloop = "0.12.3"
 libc = "0.2.64"
 memmap2 = { version = "0.9.0", optional = true }
 percent-encoding = { version = "2.0", optional = true }
@@ -238,91 +247,86 @@ rustix = { version = "0.38.4", default-features = false, features = [
     "thread",
     "process",
 ] }
-sctk = { package = "smithay-client-toolkit", version = "0.19.2", default-features = false, features = [
+sctk = { package = "smithay-client-toolkit", version = "0.18.0", default-features = false, features = [
     "calloop",
 ], optional = true }
-sctk-adwaita = { version = "0.10.1", default-features = false, optional = true }
-wayland-backend = { version = "0.3.5", default-features = false, features = [
+sctk-adwaita = { version = "0.9.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.4", optional = true }
-wayland-protocols = { version = "0.32.2", features = ["staging"], optional = true }
-wayland-protocols-plasma = { version = "0.3.2", features = ["client"], 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.19.1", optional = true }
 x11rb = { version = "0.13.0", default-features = false, features = [
     "allow-unsafe-code",
     "dl-libxcb",
     "randr",
     "resource_manager",
-    "sync",
     "xinput",
     "xkb",
 ], optional = true }
 xkbcommon-dl = "0.4.2"
 
-# Orbital
 [target.'cfg(target_os = "redox")'.dependencies]
 orbclient = { version = "0.3.47", default-features = false }
 redox_syscall = "0.4.1"
 
-# Web
+[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"
-web_sys = { package = "web-sys", version = "0.3.64", features = [
-    "AbortController",
-    "AbortSignal",
-    "Blob",
-    "BlobPropertyBag",
-    "console",
-    "CssStyleDeclaration",
-    "Document",
-    "DomException",
-    "DomRect",
-    "DomRectReadOnly",
-    "Element",
-    "Event",
-    "EventTarget",
-    "FocusEvent",
-    "HtmlCanvasElement",
-    "HtmlElement",
-    "HtmlImageElement",
-    "ImageBitmap",
-    "ImageBitmapOptions",
-    "ImageBitmapRenderingContext",
-    "ImageData",
-    "IntersectionObserver",
-    "IntersectionObserverEntry",
-    "KeyboardEvent",
-    "MediaQueryList",
-    "MessageChannel",
-    "MessagePort",
-    "Navigator",
-    "Node",
-    "OrientationLockType",
-    "OrientationType",
-    "PageTransitionEvent",
-    "Permissions",
-    "PermissionState",
-    "PermissionStatus",
-    "PointerEvent",
-    "PremultiplyAlpha",
-    "ResizeObserver",
-    "ResizeObserverBoxOptions",
-    "ResizeObserverEntry",
-    "ResizeObserverOptions",
-    "ResizeObserverSize",
-    "Screen",
-    "ScreenOrientation",
-    "Url",
-    "VisibilityState",
-    "WheelEvent",
-    "Window",
-    "Worker",
-] }
 
 [target.'cfg(all(target_family = "wasm", target_feature = "atomics"))'.dependencies]
 atomic-waker = "1"
@@ -331,27 +335,21 @@ concurrent-queue = { version = "2", default-features = false }
 [target.'cfg(target_family = "wasm")'.dev-dependencies]
 console_error_panic_hook = "0.1"
 tracing-web = "0.1"
-wasm-bindgen-test = "0.3"
 
 [[example]]
 doc-scrape-examples = true
 name = "window"
-required-features = ["rwh_06"]
-
-[[example]]
-name = "child_window"
-required-features = ["rwh_06"]
 
 [workspace]
-members = ["dpi"]
 resolver = "2"
+members = ["dpi"]
 
 [workspace.package]
-edition = "2021"
-license = "Apache-2.0"
+rust-version = "1.70.0"
 repository = "https://github.com/rust-windowing/winit"
-rust-version = "1.73"
+license = "Apache-2.0"
+edition = "2021"
 
 [workspace.dependencies]
-mint = "0.5.6"
 serde = { version = "1", features = ["serde_derive"] }
+mint = "0.5.6"

FEATURES.md

@@ -154,6 +154,7 @@ If your PR makes notable changes to Winit's features, please update this section
 * Home indicator visibility
 * Status bar visibility and style
 * Deferring system gestures
+* Getting the device idiom
 * Getting the preferred video mode
 
 ### Web

README.md

@@ -8,7 +8,7 @@
 
 ```toml
 [dependencies]
-winit = "0.30.4"
+winit = "0.30.1"
 ```
 
 ## [Documentation](https://docs.rs/winit)
@@ -19,7 +19,7 @@ For features _outside_ the scope of winit, see [Are we GUI Yet?](https://arewegu
 
 ## 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.
+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).
 
@@ -35,7 +35,7 @@ another library.
 
 ## MSRV Policy
 
-This crate's Minimum Supported Rust Version (MSRV) is **1.73**. Changes to
+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
@@ -50,15 +50,12 @@ Where `sid` is the current version of `rustc` provided by [Debian Sid], and
 
 [Debian Sid]: https://packages.debian.org/sid/rustc
 
-An exception is made for the Android platform, where a higher Rust version
+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.
 
-Redox OS is also not covered by this MSRV policy, as it requires a Rust nightly
-toolchain to compile.
-
 All crates in the [`rust-windowing`] organizations have the
 same MSRV policy.
 

build.rs

@@ -10,9 +10,10 @@ fn main() {
         android_platform: { target_os = "android" },
         web_platform: { all(target_family = "wasm", target_os = "unknown") },
         macos_platform: { target_os = "macos" },
-        ios_platform: { all(target_vendor = "apple", not(target_os = "macos")) },
+        ios_platform: { target_os = "ios" },
         windows_platform: { target_os = "windows" },
-        free_unix: { all(unix, not(target_vendor = "apple"), not(android_platform), not(target_os = "emscripten")) },
+        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.

clippy.toml

@@ -1,16 +1,15 @@
 disallowed-methods = [
-    { path = "objc2_app_kit::NSView::visibleRect", reason = "We expose a render target to the user, and visibility is not really relevant to that (and can break if you don't use the rectangle position as well). Use `frame` instead." },
-    { path = "objc2_app_kit::NSWindow::setFrameTopLeftPoint", reason = "Not sufficient when working with Winit's coordinate system, use `flip_window_screen_coordinates` instead" },
-    { 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 = "web_sys::Element::request_fullscreen", reason = "Doesn't account for compatibility with Safari" },
-    { path = "web_sys::HtmlCanvasElement::height", 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::HtmlCanvasElement::set_width", reason = "Winit shouldn't touch the internal canvas size" },
+    { 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::HtmlElement::style", reason = "cache this to reduce calls to JS" },
+    { 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::Window::navigator", reason = "cache this to reduce calls to JS" },
-    { path = "web_sys::window", reason = "is not available in every context" },
+    { 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 = "objc2_app_kit::NSView::visibleRect", reason = "We expose a render target to the user, and visibility is not really relevant to that (and can break if you don't use the rectangle position as well). Use `frame` instead." },
+    { path = "objc2_app_kit::NSWindow::setFrameTopLeftPoint", reason = "Not sufficient when working with Winit's coordinate system, use `flip_window_screen_coordinates` instead" },
 ]

deny.toml

@@ -1,20 +1,15 @@
-# https://embarkstudios.github.io/cargo-deny
+# https://embarkstudios.github.io/cargo-deny/
 # cargo install cargo-deny
-# cargo update && cargo deny --target aarch64-apple-ios check
+# 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
-[graph]
-all-features = true
-exclude-dev = true
 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", features = [
-        "atomics",
-    ] },
+    { triple = "wasm32-unknown-unknown" },
     { triple = "x86_64-apple-darwin" },
     { triple = "x86_64-apple-ios" },
     { triple = "x86_64-pc-windows-gnu" },
@@ -23,62 +18,46 @@ targets = [
     { triple = "x86_64-unknown-redox" },
 ]
 
-[licenses]
-allow = [
-    "Apache-2.0",       # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
-    "BSD-2-Clause",     # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
-    "BSD-3-Clause",     # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
-    "ISC",              # https://tldrlegal.com/license/-isc-license
-    "MIT",              # https://tldrlegal.com/license/mit-license
-    "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html
-]
-confidence-threshold = 1.0
-private = { ignore = true }
+
+[advisories]
+vulnerability = "deny"
+unmaintained = "warn"
+yanked = "deny"
+ignore = []
+
 
 [bans]
 multiple-versions = "deny"
-skip = [{ crate = "bitflags@1", reason = "the ecosystem is in the process of migrating" }]
-wildcards = "allow"                                                                        # at least until https://github.com/EmbarkStudios/cargo-deny/issues/241 is fixed
-
-[bans.build]
-include-archives = true
-interpreted = "deny"
-
-[[bans.build.bypass]]
-allow = [
-    { path = "generate-bindings.sh", checksum = "268ec23248218d779e33853cdc60e2985e70214ff004716cd734270de1f6b561" },
+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
 ]
-crate = "android-activity"
+skip-tree = []
 
-[[bans.build.bypass]]
-allow-globs = ["freetype2/*"]
-crate = "freetype-sys"
 
-[[bans.build.bypass]]
+[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 = [
-    { path = "releases/friends.sh", checksum = "f896ccdcb8445d29ed6dd0d9a360f94d4f33af2f1cc9965e7bb38b156c45949d" },
+    "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)
 ]
-crate = "wasm-bindgen"
-
-[[bans.build.bypass]]
-allow = [
-    { path = "ui-tests/update-all-references.sh", checksum = "8b8dbf31e7ada1314956db7a20ab14b13af3ae246a6295afdc7dc96af8ec3773" },
-    { path = "ui-tests/update-references.sh", checksum = "65375c25981646e08e8589449a06be4505b1a2c9e10d35f650be4b1b495dff22" },
-]
-crate = "wasm-bindgen-macro"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.a"]
-crate = "windows_i686_gnu"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.lib"]
-crate = "windows_i686_msvc"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.a"]
-crate = "windows_x86_64_gnu"
-
-[[bans.build.bypass]]
-allow-globs = ["lib/*.lib"]
-crate = "windows_x86_64_msvc"

dpi/Cargo.toml

@@ -1,26 +1,25 @@
 [package]
-categories = ["gui"]
-description = "Types for handling UI scaling"
-edition.workspace = true
-keywords = ["DPI", "HiDPI", "scale-factor"]
-license.workspace = true
 name = "dpi"
-repository.workspace = true
-rust-version.workspace = true
 version = "0.1.1"
+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]
-mint = ["dep:mint"]
 serde = ["dep:serde"]
+mint = ["dep:mint"]
 
 [dependencies]
-mint = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+mint = { workspace = true, optional = true }
 
 [package.metadata.docs.rs]
-features = ["mint", "serde"]
+features = ["serde", "mint"]
 # These are all tested in CI
-rustdoc-args = ["--cfg", "docsrs"]
 targets = [
     # Windows
     "i686-pc-windows-msvc",
@@ -37,3 +36,4 @@ targets = [
     # Web
     "wasm32-unknown-unknown",
 ]
+rustdoc-args = ["--cfg", "docsrs"]

dpi/src/lib.rs

@@ -761,9 +761,8 @@ impl<P: Pixel> From<LogicalPosition<P>> for Position {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
-
     use super::*;
+    use std::collections::HashSet;
 
     macro_rules! test_pixel_int_impl {
         ($($name:ident => $ty:ty),*) => {$(

examples/child_window.rs

@@ -1,47 +1,52 @@
-#[cfg(any(x11_platform, macos_platform, windows_platform))]
+#[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::application::ApplicationHandler;
     use winit::dpi::{LogicalPosition, LogicalSize, Position};
-    use winit::event::{ElementState, KeyEvent, WindowEvent};
+    use winit::event::{ElementState, Event, KeyEvent, WindowEvent};
     use winit::event_loop::{ActiveEventLoop, EventLoop};
     use winit::raw_window_handle::HasRawWindowHandle;
-    use winit::window::{Window, WindowId};
+    use winit::window::Window;
 
     #[path = "util/fill.rs"]
     mod fill;
 
-    #[derive(Default)]
-    struct Application {
-        parent_window_id: Option<WindowId>,
-        windows: HashMap<WindowId, Window>,
+    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()
     }
 
-    impl ApplicationHandler for Application {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-            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();
+    let mut windows = HashMap::new();
 
-            println!("Parent window id: {:?})", window.id());
-            self.parent_window_id = Some(window.id());
+    let event_loop: EventLoop<()> = EventLoop::new().unwrap();
+    let mut parent_window_id = None;
 
-            self.windows.insert(window.id(), window);
-        }
+    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();
 
-        fn window_event(
-            &mut self,
-            event_loop: &dyn ActiveEventLoop,
-            window_id: winit::window::WindowId,
-            event: WindowEvent,
-        ) {
-            match event {
+                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 => {
-                    self.windows.clear();
+                    windows.clear();
                     event_loop.exit();
                 },
                 WindowEvent::CursorEntered { device_id: _ } => {
@@ -56,40 +61,25 @@ fn main() -> Result<(), impl std::error::Error> {
                     event: KeyEvent { state: ElementState::Pressed, .. },
                     ..
                 } => {
-                    let parent_window = self.windows.get(&self.parent_window_id.unwrap()).unwrap();
+                    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:?}");
-                    self.windows.insert(child_id, child_window);
+                    windows.insert(child_id, child_window);
                 },
                 WindowEvent::RedrawRequested => {
-                    if let Some(window) = self.windows.get(&window_id) {
+                    if let Some(window) = windows.get(&window_id) {
                         fill::fill_window(window);
                     }
                 },
                 _ => (),
-            }
+            },
+            _ => (),
         }
-    }
-
-    fn spawn_child_window(parent: &Window, event_loop: &dyn 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 event_loop = EventLoop::new().unwrap();
-    event_loop.run_app(Application::default())
+    })
 }
 
-#[cfg(not(any(x11_platform, macos_platform, windows_platform)))]
+#[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 \

examples/control_flow.rs

@@ -7,6 +7,7 @@ use std::time;
 use ::tracing::{info, warn};
 #[cfg(web_platform)]
 use web_time as time;
+
 use winit::application::ApplicationHandler;
 use winit::event::{ElementState, KeyEvent, StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
@@ -43,7 +44,8 @@ fn main() -> Result<(), impl std::error::Error> {
 
     let event_loop = EventLoop::new().unwrap();
 
-    event_loop.run_app(ControlFlowDemo::default())
+    let mut app = ControlFlowDemo::default();
+    event_loop.run_app(&mut app)
 }
 
 #[derive(Default)]
@@ -56,7 +58,7 @@ struct ControlFlowDemo {
 }
 
 impl ApplicationHandler for ControlFlowDemo {
-    fn new_events(&mut self, _event_loop: &dyn ActiveEventLoop, cause: StartCause) {
+    fn new_events(&mut self, _event_loop: &ActiveEventLoop, cause: StartCause) {
         info!("new_events: {cause:?}");
 
         self.wait_cancelled = match cause {
@@ -65,7 +67,7 @@ impl ApplicationHandler for ControlFlowDemo {
         }
     }
 
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
         let window_attributes = Window::default_attributes().with_title(
             "Press 1, 2, 3 to change control flow mode. Press R to toggle redraw requests.",
         );
@@ -74,7 +76,7 @@ impl ApplicationHandler for ControlFlowDemo {
 
     fn window_event(
         &mut self,
-        _event_loop: &dyn ActiveEventLoop,
+        _event_loop: &ActiveEventLoop,
         _window_id: WindowId,
         event: WindowEvent,
     ) {
@@ -120,7 +122,7 @@ impl ApplicationHandler for ControlFlowDemo {
         }
     }
 
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
         if self.request_redraw && !self.wait_cancelled && !self.close_requested {
             self.window.as_ref().unwrap().request_redraw();
         }

examples/pump_events.rs

@@ -22,14 +22,14 @@ fn main() -> std::process::ExitCode {
     }
 
     impl ApplicationHandler for PumpDemo {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+        fn resumed(&mut self, event_loop: &ActiveEventLoop) {
             let window_attributes = Window::default_attributes().with_title("A fantastic window!");
             self.window = Some(event_loop.create_window(window_attributes).unwrap());
         }
 
         fn window_event(
             &mut self,
-            event_loop: &dyn ActiveEventLoop,
+            event_loop: &ActiveEventLoop,
             _window_id: WindowId,
             event: WindowEvent,
         ) {

examples/run_on_demand.rs

@@ -22,13 +22,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     impl ApplicationHandler for App {
-        fn about_to_wait(&mut self, _event_loop: &dyn ActiveEventLoop) {
+        fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
             if let Some(window) = self.window.as_ref() {
                 window.request_redraw();
             }
         }
 
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+        fn resumed(&mut self, event_loop: &ActiveEventLoop) {
             let window_attributes = Window::default_attributes()
                 .with_title("Fantastic window number one!")
                 .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0));
@@ -39,7 +39,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         fn window_event(
             &mut self,
-            event_loop: &dyn ActiveEventLoop,
+            event_loop: &ActiveEventLoop,
             window_id: WindowId,
             event: WindowEvent,
         ) {

examples/util/fill.rs

@@ -11,7 +11,7 @@
 pub use platform::cleanup_window;
 pub use platform::fill_window;
 
-#[cfg(all(feature = "rwh_06", not(any(target_os = "android", target_os = "ios"))))]
+#[cfg(all(feature = "rwh_05", not(any(target_os = "android", target_os = "ios"))))]
 mod platform {
     use std::cell::RefCell;
     use std::collections::HashMap;
@@ -104,7 +104,7 @@ mod platform {
     }
 }
 
-#[cfg(not(all(feature = "rwh_06", not(any(target_os = "android", target_os = "ios")))))]
+#[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.

examples/window.rs

@@ -5,7 +5,6 @@ use std::error::Error;
 use std::fmt::Debug;
 #[cfg(not(any(android_platform, ios_platform)))]
 use std::num::NonZeroU32;
-use std::sync::mpsc::{self, Receiver, Sender};
 use std::sync::Arc;
 use std::{fmt, mem};
 
@@ -15,25 +14,23 @@ use cursor_icon::CursorIcon;
 use rwh_06::{DisplayHandle, HasDisplayHandle};
 #[cfg(not(any(android_platform, ios_platform)))]
 use softbuffer::{Context, Surface};
+
 use winit::application::ApplicationHandler;
 use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize};
-use winit::error::ExternalError;
 use winit::event::{DeviceEvent, DeviceId, Ime, MouseButton, MouseScrollDelta, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, EventLoop};
 use winit::keyboard::{Key, ModifiersState};
+use winit::window::{
+    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
+    Theme, 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,
 };
-use winit::platform::wayland::{EventLoopExtWayland, WaylandApplicationHandler};
-#[cfg(web_platform)]
-use winit::platform::web::{ActiveEventLoopExtWeb, CustomCursorExtWeb, WindowAttributesExtWeb};
-use winit::window::{
-    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
-    Theme, Window, WindowId,
-};
 
 #[path = "util/tracing.rs"]
 mod tracing;
@@ -47,38 +44,36 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     tracing::init();
 
-    let mut event_loop = EventLoop::new()?;
-    let (sender, receiver) = mpsc::channel();
+    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))]
-    {
-        let event_loop_proxy = event_loop.create_proxy();
-        let sender = sender.clone();
-        std::thread::spawn(move || {
-            // Wake up the `event_loop` once every second and dispatch a custom event
-            // from a different thread.
-            info!("Starting to send user event every second");
-            loop {
-                let _ = sender.send(Action::Message);
-                event_loop_proxy.wake_up();
-                std::thread::sleep(std::time::Duration::from_secs(1));
-            }
-        });
-    }
+    std::thread::spawn(move || {
+        // Wake up the `event_loop` once every second and dispatch a custom event
+        // from a different thread.
+        info!("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 app = Application::new(&event_loop, receiver, sender);
-    event_loop.register_wayland_callback::<Application>();
-    Ok(event_loop.run_app(app)?)
+    let mut state = Application::new(&event_loop);
+
+    event_loop.run_app(&mut state).map_err(Into::into)
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone, Copy)]
+enum UserEvent {
+    WakeUp,
 }
 
 /// Application state and event handling.
 struct Application {
-    /// Trigger actions through proxy wake up.
-    receiver: Receiver<Action>,
-    sender: Sender<Action>,
     /// Custom cursors assets.
-    custom_cursors: Result<Vec<CustomCursor>, ExternalError>,
+    custom_cursors: Vec<CustomCursor>,
     /// Application icon.
     icon: Icon,
     windows: HashMap<WindowId, WindowState>,
@@ -90,7 +85,7 @@ struct Application {
 }
 
 impl Application {
-    fn new(event_loop: &EventLoop, receiver: Receiver<Action>, sender: Sender<Action>) -> Self {
+    fn new<T>(event_loop: &EventLoop<T>) -> Self {
         // SAFETY: we drop the context right before the event loop is stopped, thus making it safe.
         #[cfg(not(any(android_platform, ios_platform)))]
         let context = Some(
@@ -110,17 +105,13 @@ impl Application {
         let icon = load_icon(include_bytes!("data/icon.png"));
 
         info!("Loading cursor assets");
-        let custom_cursors = [
+        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"))),
-        ]
-        .into_iter()
-        .collect();
+        ];
 
         Self {
-            receiver,
-            sender,
             #[cfg(not(any(android_platform, ios_platform)))]
             context,
             custom_cursors,
@@ -131,7 +122,7 @@ impl Application {
 
     fn create_window(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         _tab_id: Option<String>,
     ) -> Result<WindowId, Box<dyn Error>> {
         // TODO read-out activation token.
@@ -156,6 +147,7 @@ impl Application {
 
         #[cfg(web_platform)]
         {
+            use winit::platform::web::WindowAttributesExtWebSys;
             window_attributes = window_attributes.with_append(true);
         }
 
@@ -177,23 +169,7 @@ impl Application {
         Ok(window_id)
     }
 
-    fn handle_action_from_proxy(&mut self, _event_loop: &dyn ActiveEventLoop, action: Action) {
-        match action {
-            #[cfg(web_platform)]
-            Action::DumpMonitors => self.dump_monitors(_event_loop),
-            Action::Message => {
-                info!("User wake up");
-            },
-            _ => unreachable!("Tried to execute invalid action without `WindowId`"),
-        }
-    }
-
-    fn handle_action_with_window(
-        &mut self,
-        event_loop: &dyn ActiveEventLoop,
-        window_id: WindowId,
-        action: Action,
-    ) {
+    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();
         info!("Executing action: {action:?}");
@@ -222,27 +198,12 @@ impl Application {
             Action::ToggleImeInput => window.toggle_ime(),
             Action::Minimize => window.minimize(),
             Action::NextCursor => window.next_cursor(),
-            Action::NextCustomCursor => {
-                if let Err(err) = self.custom_cursors.as_ref().map(|c| window.next_custom_cursor(c))
-                {
-                    error!("Error creating custom cursor: {err}");
-                }
-            },
+            Action::NextCustomCursor => window.next_custom_cursor(&self.custom_cursors),
             #[cfg(web_platform)]
-            Action::UrlCustomCursor => {
-                if let Err(err) = window.url_custom_cursor(event_loop) {
-                    error!("Error creating custom cursor from URL: {err}");
-                }
-            },
+            Action::UrlCustomCursor => window.url_custom_cursor(event_loop),
             #[cfg(web_platform)]
             Action::AnimationCustomCursor => {
-                if let Err(err) = self
-                    .custom_cursors
-                    .as_ref()
-                    .map(|c| window.animation_custom_cursor(event_loop, c))
-                {
-                    error!("Error creating animated custom cursor: {err}");
-                }
+                window.animation_custom_cursor(event_loop, &self.custom_cursors)
             },
             Action::CycleCursorGrab => window.cycle_cursor_grab(),
             Action::DragWindow => window.drag_window(),
@@ -251,12 +212,6 @@ impl Application {
             Action::PrintHelp => self.print_help(),
             #[cfg(macos_platform)]
             Action::CycleOptionAsAlt => window.cycle_option_as_alt(),
-            Action::SetTheme(theme) => {
-                window.window.set_theme(theme);
-                // Get the resulting current theme to draw with
-                let actual_theme = theme.or_else(|| window.window.theme()).unwrap_or(Theme::Dark);
-                window.set_draw_theme(actual_theme);
-            },
             #[cfg(macos_platform)]
             Action::CreateNewTab => {
                 let tab_id = window.window.tabbing_identifier();
@@ -265,30 +220,10 @@ impl Application {
                 }
             },
             Action::RequestResize => window.swap_dimensions(),
-            #[cfg(web_platform)]
-            Action::DumpMonitors => {
-                let future = event_loop.request_detailed_monitor_permission();
-                let proxy = event_loop.create_proxy();
-                let sender = self.sender.clone();
-                wasm_bindgen_futures::spawn_local(async move {
-                    if let Err(error) = future.await {
-                        error!("{error}")
-                    }
-
-                    let _ = sender.send(Action::DumpMonitors);
-                    proxy.wake_up();
-                });
-            },
-            #[cfg(not(web_platform))]
-            Action::DumpMonitors => self.dump_monitors(event_loop),
-            Action::Message => {
-                self.sender.send(Action::Message).unwrap();
-                event_loop.create_proxy().wake_up();
-            },
         }
     }
 
-    fn dump_monitors(&self, event_loop: &dyn ActiveEventLoop) {
+    fn dump_monitors(&self, event_loop: &ActiveEventLoop) {
         info!("Monitors information");
         let primary_monitor = event_loop.primary_monitor();
         for monitor in event_loop.available_monitors() {
@@ -304,32 +239,27 @@ impl Application {
                 info!("{intro}: [no name]");
             }
 
-            if let Some(current_mode) = monitor.current_video_mode() {
-                let PhysicalSize { width, height } = current_mode.size();
-                let bits =
-                    current_mode.bit_depth().map(|bits| format!("x{bits}")).unwrap_or_default();
-                let m_hz = current_mode
-                    .refresh_rate_millihertz()
-                    .map(|m_hz| format!(" @ {}.{} Hz", m_hz.get() / 1000, m_hz.get() % 1000))
-                    .unwrap_or_default();
-                info!("  {width}x{height}{bits}{m_hz}");
-            }
+            let PhysicalSize { width, height } = monitor.size();
+            info!(
+                "  Current mode: {width}x{height}{}",
+                if let Some(m_hz) = monitor.refresh_rate_millihertz() {
+                    format!(" @ {}.{} Hz", m_hz / 1000, m_hz % 1000)
+                } else {
+                    String::new()
+                }
+            );
 
-            if let Some(PhysicalPosition { x, y }) = monitor.position() {
-                info!("  Position: {x},{y}");
-            }
+            let PhysicalPosition { x, y } = monitor.position();
+            info!("  Position: {x},{y}");
 
             info!("  Scale factor: {}", monitor.scale_factor());
 
             info!("  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().map(|bits| format!("x{bits}")).unwrap_or_default();
-                let m_hz = mode
-                    .refresh_rate_millihertz()
-                    .map(|m_hz| format!(" @ {}.{} Hz", m_hz.get() / 1000, m_hz.get() % 1000))
-                    .unwrap_or_default();
-                info!("    {width}x{height}{bits}{m_hz}");
+                let bits = mode.bit_depth();
+                let m_hz = mode.refresh_rate_millihertz();
+                info!("    {width}x{height}x{bits} @ {}.{} Hz", m_hz / 1000, m_hz % 1000);
             }
         }
     }
@@ -372,21 +302,14 @@ impl Application {
     }
 }
 
-impl ApplicationHandler for Application {
-    fn as_any(&mut self) -> Option<&mut dyn std::any::Any> {
-        println!("Called");
-        Some(self)
-    }
-
-    fn proxy_wake_up(&mut self, event_loop: &dyn ActiveEventLoop) {
-        while let Ok(action) = self.receiver.try_recv() {
-            self.handle_action_from_proxy(event_loop, action)
-        }
+impl ApplicationHandler<UserEvent> for Application {
+    fn user_event(&mut self, _event_loop: &ActiveEventLoop, event: UserEvent) {
+        info!("User event: {event:?}");
     }
 
     fn window_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         window_id: WindowId,
         event: WindowEvent,
     ) {
@@ -411,7 +334,7 @@ impl ApplicationHandler for Application {
             },
             WindowEvent::ThemeChanged(theme) => {
                 info!("Theme changed to {theme:?}");
-                window.set_draw_theme(theme);
+                window.set_theme(theme);
             },
             WindowEvent::RedrawRequested => {
                 if let Err(err) = window.draw() {
@@ -449,7 +372,7 @@ impl ApplicationHandler for Application {
                     };
 
                     if let Some(action) = action {
-                        self.handle_action_with_window(event_loop, window_id, action);
+                        self.handle_action(event_loop, window_id, action);
                     }
                 }
             },
@@ -458,7 +381,7 @@ impl ApplicationHandler for Application {
                 if let Some(action) =
                     state.is_pressed().then(|| Self::process_mouse_binding(button, &mods)).flatten()
                 {
-                    self.handle_action_with_window(event_loop, window_id, action);
+                    self.handle_action(event_loop, window_id, action);
                 }
             },
             WindowEvent::CursorLeft { .. } => {
@@ -518,6 +441,7 @@ impl ApplicationHandler for Application {
             | WindowEvent::HoveredFileCancelled
             | WindowEvent::KeyboardInput { .. }
             | WindowEvent::CursorEntered { .. }
+            | WindowEvent::AxisMotion { .. }
             | WindowEvent::DroppedFile(_)
             | WindowEvent::HoveredFile(_)
             | WindowEvent::Destroyed
@@ -528,15 +452,15 @@ impl ApplicationHandler for Application {
 
     fn device_event(
         &mut self,
-        _event_loop: &dyn ActiveEventLoop,
+        _event_loop: &ActiveEventLoop,
         device_id: DeviceId,
         event: DeviceEvent,
     ) {
         info!("Device {device_id:?} event: {event:?}");
     }
 
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        info!("Ready to create surfaces");
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
+        info!("Resumed the event loop");
         self.dump_monitors(event_loop);
 
         // Create initial window.
@@ -545,7 +469,7 @@ impl ApplicationHandler for Application {
         self.print_help();
     }
 
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
         if self.windows.is_empty() {
             info!("No windows left, exiting...");
             event_loop.exit();
@@ -553,18 +477,12 @@ impl ApplicationHandler for Application {
     }
 
     #[cfg(not(any(android_platform, ios_platform)))]
-    fn exiting(&mut self, _event_loop: &dyn ActiveEventLoop) {
+    fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
         // We must drop the context here.
         self.context = None;
     }
 }
 
-impl WaylandApplicationHandler for Application {
-    fn wayland_callback(&mut self) {
-        println!("Wayland callback!");
-    }
-}
-
 /// State of the window.
 struct WindowState {
     /// IME input.
@@ -624,7 +542,7 @@ impl WindowState {
         let mut state = Self {
             #[cfg(macos_platform)]
             option_as_alt: window.option_as_alt(),
-            custom_idx: app.custom_cursors.as_ref().map(Vec::len).unwrap_or(1) - 1,
+            custom_idx: app.custom_cursors.len() - 1,
             cursor_grab: CursorGrabMode::None,
             named_idx,
             #[cfg(not(any(android_platform, ios_platform)))]
@@ -773,37 +691,31 @@ impl WindowState {
 
     /// Custom cursor from an URL.
     #[cfg(web_platform)]
-    fn url_custom_cursor(
-        &mut self,
-        event_loop: &dyn ActiveEventLoop,
-    ) -> Result<(), Box<dyn Error>> {
-        let cursor = event_loop.create_custom_cursor(url_custom_cursor())?;
+    fn url_custom_cursor(&mut self, event_loop: &ActiveEventLoop) {
+        let cursor = event_loop.create_custom_cursor(url_custom_cursor());
 
         self.window.set_cursor(cursor);
-
-        Ok(())
     }
 
     /// Custom cursor from a URL.
     #[cfg(web_platform)]
     fn animation_custom_cursor(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         custom_cursors: &[CustomCursor],
-    ) -> Result<(), Box<dyn Error>> {
+    ) {
         use std::time::Duration;
+        use winit::platform::web::CustomCursorExtWebSys;
 
         let cursors = vec![
             custom_cursors[0].clone(),
             custom_cursors[1].clone(),
-            event_loop.create_custom_cursor(url_custom_cursor())?,
+            event_loop.create_custom_cursor(url_custom_cursor()),
         ];
         let cursor = CustomCursor::from_animation(Duration::from_secs(3), cursors).unwrap();
-        let cursor = event_loop.create_custom_cursor(cursor)?;
+        let cursor = event_loop.create_custom_cursor(cursor);
 
         self.window.set_cursor(cursor);
-
-        Ok(())
     }
 
     /// Resize the window to the new size.
@@ -821,8 +733,8 @@ impl WindowState {
         self.window.request_redraw();
     }
 
-    /// Change the theme that things are drawn in.
-    fn set_draw_theme(&mut self, theme: Theme) {
+    /// Change the theme.
+    fn set_theme(&mut self, theme: Theme) {
         self.theme = theme;
         self.window.request_redraw();
     }
@@ -972,12 +884,9 @@ enum Action {
     ShowWindowMenu,
     #[cfg(macos_platform)]
     CycleOptionAsAlt,
-    SetTheme(Option<Theme>),
     #[cfg(macos_platform)]
     CreateNewTab,
     RequestResize,
-    DumpMonitors,
-    Message,
 }
 
 impl Action {
@@ -1006,20 +915,9 @@ impl Action {
             Action::ShowWindowMenu => "Show window menu",
             #[cfg(macos_platform)]
             Action::CycleOptionAsAlt => "Cycle option as alt mode",
-            Action::SetTheme(None) => "Change to the system theme",
-            Action::SetTheme(Some(Theme::Light)) => "Change to a light theme",
-            Action::SetTheme(Some(Theme::Dark)) => "Change to a dark theme",
             #[cfg(macos_platform)]
             Action::CreateNewTab => "Create new tab",
             Action::RequestResize => "Request a resize",
-            #[cfg(not(web_platform))]
-            Action::DumpMonitors => "Dump monitor information",
-            #[cfg(web_platform)]
-            Action::DumpMonitors => {
-                "Request permission to query detailed monitor information and dump monitor \
-                 information"
-            },
-            Action::Message => "Prints a message through a user wake up",
         }
     }
 }
@@ -1042,6 +940,8 @@ fn decode_cursor(bytes: &[u8]) -> CustomCursorSource {
 fn url_custom_cursor() -> CustomCursorSource {
     use std::sync::atomic::{AtomicU64, Ordering};
 
+    use winit::platform::web::CustomCursorExtWebSys;
+
     static URL_COUNTER: AtomicU64 = AtomicU64::new(0);
 
     CustomCursor::from_url(
@@ -1139,7 +1039,6 @@ const KEY_BINDINGS: &[Binding<&'static str>] = &[
     Binding::new("R", ModifiersState::CONTROL, Action::ToggleResizable),
     Binding::new("R", ModifiersState::ALT, Action::RequestResize),
     // M.
-    Binding::new("M", ModifiersState::CONTROL.union(ModifiersState::ALT), Action::DumpMonitors),
     Binding::new("M", ModifiersState::CONTROL, Action::ToggleMaximize),
     Binding::new("M", ModifiersState::ALT, Action::Minimize),
     // N.
@@ -1160,15 +1059,10 @@ const KEY_BINDINGS: &[Binding<&'static str>] = &[
         Action::AnimationCustomCursor,
     ),
     Binding::new("Z", ModifiersState::CONTROL, Action::ToggleCursorVisibility),
-    // K.
-    Binding::new("K", ModifiersState::empty(), Action::SetTheme(None)),
-    Binding::new("K", ModifiersState::SUPER, Action::SetTheme(Some(Theme::Light))),
-    Binding::new("K", ModifiersState::CONTROL, Action::SetTheme(Some(Theme::Dark))),
     #[cfg(macos_platform)]
     Binding::new("T", ModifiersState::SUPER, Action::CreateNewTab),
     #[cfg(macos_platform)]
     Binding::new("O", ModifiersState::CONTROL, Action::CycleOptionAsAlt),
-    Binding::new("S", ModifiersState::CONTROL, Action::Message),
 ];
 
 const MOUSE_BINDINGS: &[Binding<MouseButton>] = &[

examples/x11_embed.rs

@@ -18,7 +18,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     }
 
     impl ApplicationHandler for XEmbedDemo {
-        fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+        fn resumed(&mut self, event_loop: &ActiveEventLoop) {
             let window_attributes = Window::default_attributes()
                 .with_title("An embedded window!")
                 .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
@@ -29,7 +29,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
         fn window_event(
             &mut self,
-            event_loop: &dyn ActiveEventLoop,
+            event_loop: &ActiveEventLoop,
             _window_id: WindowId,
             event: WindowEvent,
         ) {
@@ -44,7 +44,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             }
         }
 
-        fn about_to_wait(&mut self, _event_loop: &dyn ActiveEventLoop) {
+        fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
             self.window.as_ref().unwrap().request_redraw();
         }
     }
@@ -58,7 +58,8 @@ fn main() -> Result<(), Box<dyn Error>> {
     tracing_subscriber::fmt::init();
     let event_loop = EventLoop::new()?;
 
-    Ok(event_loop.run_app(XEmbedDemo { parent_window_id, window: None })?)
+    let mut app = XEmbedDemo { parent_window_id, window: None };
+    event_loop.run_app(&mut app).map_err(Into::into)
 }
 
 #[cfg(not(x11_platform))]

rustfmt.toml

@@ -1,20 +1,19 @@
-comment_width = 100
-condense_wildcard_suffixes = true
-error_on_unformatted = true
 format_code_in_doc_comments = true
-format_macro_bodies = true
-format_macro_matchers = true
-format_strings = true
-group_imports = "StdExternalCrate"
-hex_literal_case = "Lower"
-imports_granularity = "Module"
 match_block_trailing_comma = true
-newline_style = "Unix"
-normalize_comments = true
+condense_wildcard_suffixes = true
+use_field_init_shorthand = true
 normalize_doc_attributes = true
 overflow_delimited_expr = true
+imports_granularity = "Module"
+use_small_heuristics = "Max"
+format_macro_matchers = true
+error_on_unformatted = true
+format_macro_bodies = true
+hex_literal_case = "Lower"
+normalize_comments = true
 # Some macros break with this.
 reorder_impl_items = false
-use_field_init_shorthand = true
-use_small_heuristics = "Max"
+newline_style = "Unix"
+format_strings = true
 wrap_comments = true
+comment_width = 100

src/application.rs

@@ -1,195 +1,98 @@
 //! End user application handling.
 
-use std::any::Any;
-
 use crate::event::{DeviceEvent, DeviceId, StartCause, WindowEvent};
 use crate::event_loop::ActiveEventLoop;
 use crate::window::WindowId;
 
 /// The handler of the application events.
-pub trait ApplicationHandler {
+pub trait ApplicationHandler<T: 'static = ()> {
     /// Emitted when new events arrive from the OS to be processed.
     ///
     /// This is a useful place to put code that should be done before you start processing
     /// events, such as updating frame timing information for benchmarking or checking the
     /// [`StartCause`] to see if a timer set by
     /// [`ControlFlow::WaitUntil`][crate::event_loop::ControlFlow::WaitUntil] has elapsed.
-    fn new_events(&mut self, event_loop: &dyn ActiveEventLoop, cause: StartCause) {
+    fn new_events(&mut self, event_loop: &ActiveEventLoop, cause: StartCause) {
         let _ = (event_loop, cause);
     }
 
     /// Emitted when the application has been resumed.
     ///
-    /// See [`suspended()`][Self::suspended].
+    /// For consistency, all platforms emit a `Resumed` event even if they don't themselves have a
+    /// formal suspend/resume lifecycle. For systems without a formal suspend/resume lifecycle
+    /// the `Resumed` event is always emitted after the
+    /// [`NewEvents(StartCause::Init)`][StartCause::Init] event.
     ///
-    /// ## Platform-specific
+    /// # Portability
     ///
-    /// ### iOS
+    /// It's recommended that applications should only initialize their graphics context and create
+    /// a window after they have received their first `Resumed` event. Some systems
+    /// (specifically Android) won't allow applications to create a render surface until they are
+    /// resumed.
     ///
-    /// On iOS, the [`resumed()`] method is called in response to an [`applicationDidBecomeActive`]
-    /// callback which means the application is about to transition from the inactive to active
-    /// state (according to the [iOS application lifecycle]).
+    /// Considering that the implementation of [`Suspended`] and `Resumed` events may be internally
+    /// driven by multiple platform-specific events, and that there may be subtle differences across
+    /// platforms with how these internal events are delivered, it's recommended that applications
+    /// be able to gracefully handle redundant (i.e. back-to-back) [`Suspended`] or `Resumed`
+    /// events.
     ///
-    /// [`applicationDidBecomeActive`]: https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622956-applicationdidbecomeactive
-    /// [iOS application lifecycle]: https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle
+    /// Also see [`Suspended`] notes.
     ///
-    /// ### Web
+    /// ## Android
     ///
-    /// On Web, the [`resumed()`] method is called in response to a [`pageshow`] event if the
-    /// page is being restored from the [`bfcache`] (back/forward cache) - an in-memory cache
-    /// that stores a complete snapshot of a page (including the JavaScript heap) as the user is
-    /// navigating away.
-    ///
-    /// [`pageshow`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pageshow_event
-    /// [`bfcache`]: https://web.dev/bfcache/
-    ///
-    /// ### Others
-    ///
-    /// **Android / macOS / Orbital / Wayland / Windows / X11:** Unsupported.
-    ///
-    /// [`resumed()`]: Self::resumed
-    fn resumed(&mut self, event_loop: &dyn ActiveEventLoop) {
-        let _ = event_loop;
-    }
-
-    /// Emitted from the point onwards the application should create render surfaces.
-    ///
-    /// See [`destroy_surfaces()`].
-    ///
-    /// ## Portability
-    ///
-    /// It's recommended that applications should only initialize their render surfaces after the
-    /// [`can_create_surfaces()`] method is called. Some systems (specifically Android) won't allow
-    /// applications to create a render surface until that point.
-    ///
-    /// For consistency, all platforms call this method even if they don't themselves have a formal
-    /// surface destroy/create lifecycle. For systems without a surface destroy/create lifecycle the
-    /// [`can_create_surfaces()`] event is always emitted after the [`StartCause::Init`] event.
-    ///
-    /// Applications should be able to gracefully handle back-to-back [`can_create_surfaces()`] and
-    /// [`destroy_surfaces()`] calls.
-    ///
-    /// ## Platform-specific
-    ///
-    /// ### Android
-    ///
-    /// On Android, the [`can_create_surfaces()`] method is called when a new [`SurfaceView`] has
-    /// been created. This is expected to closely correlate with the [`onResume`] lifecycle
-    /// event but there may technically be a discrepancy.
+    /// On Android, the `Resumed` event is sent when a new [`SurfaceView`] has been created. This is
+    /// expected to closely correlate with the [`onResume`] lifecycle event but there may
+    /// technically be a discrepancy.
     ///
     /// [`onResume`]: https://developer.android.com/reference/android/app/Activity#onResume()
     ///
-    /// Applications that need to run on Android must wait until they have been "resumed" before
-    /// they will be able to create a render surface (such as an `EGLSurface`, [`VkSurfaceKHR`]
-    /// or [`wgpu::Surface`]) which depend on having a [`SurfaceView`]. Applications must also
-    /// assume that if they are [suspended], then their render surfaces are invalid and should
-    /// be dropped.
+    /// Applications that need to run on Android must wait until they have been `Resumed`
+    /// before they will be able to create a render surface (such as an `EGLSurface`,
+    /// [`VkSurfaceKHR`] or [`wgpu::Surface`]) which depend on having a
+    /// [`SurfaceView`]. Applications must also assume that if they are [`Suspended`], then their
+    /// render surfaces are invalid and should be dropped.
+    ///
+    /// Also see [`Suspended`] notes.
     ///
-    /// [suspended]: Self::destroy_surfaces
     /// [`SurfaceView`]: https://developer.android.com/reference/android/view/SurfaceView
     /// [Activity lifecycle]: https://developer.android.com/guide/components/activities/activity-lifecycle
     /// [`VkSurfaceKHR`]: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkSurfaceKHR.html
     /// [`wgpu::Surface`]: https://docs.rs/wgpu/latest/wgpu/struct.Surface.html
     ///
-    /// [`can_create_surfaces()`]: Self::can_create_surfaces
-    /// [`destroy_surfaces()`]: Self::destroy_surfaces
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop);
+    /// ## iOS
+    ///
+    /// On iOS, the `Resumed` event is emitted in response to an [`applicationDidBecomeActive`]
+    /// callback which means the application is "active" (according to the
+    /// [iOS application lifecycle]).
+    ///
+    /// [`applicationDidBecomeActive`]: https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622956-applicationdidbecomeactive
+    /// [iOS application lifecycle]: https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle
+    ///
+    /// ## Web
+    ///
+    /// On Web, the `Resumed` event is emitted in response to a [`pageshow`] event
+    /// with the property [`persisted`] being true, which means that the page is being
+    /// restored from the [`bfcache`] (back/forward cache) - an in-memory cache that
+    /// stores a complete snapshot of a page (including the JavaScript heap) as the
+    /// user is navigating away.
+    ///
+    /// [`pageshow`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pageshow_event
+    /// [`persisted`]: https://developer.mozilla.org/en-US/docs/Web/API/PageTransitionEvent/persisted
+    /// [`bfcache`]: https://web.dev/bfcache/
+    /// [`Suspended`]: Self::suspended
+    fn resumed(&mut self, event_loop: &ActiveEventLoop);
 
-    /// Called after a wake up is requested using [`EventLoopProxy::wake_up()`].
+    /// Emitted when an event is sent from [`EventLoopProxy::send_event`].
     ///
-    /// Multiple calls to the aforementioned method will be merged, and will only wake the event
-    /// loop once; however, due to the nature of multi-threading some wake ups may appear
-    /// spuriously. For these reasons, you should not rely on the number of times that this was
-    /// called.
-    ///
-    /// The order in which this is emitted in relation to other events is not guaranteed. The time
-    /// at which this will be emitted is not guaranteed, only that it will happen "soon". That is,
-    /// there may be several executions of the event loop, including multiple redraws to windows,
-    /// between [`EventLoopProxy::wake_up()`] being called and the event being delivered.
-    ///
-    /// [`EventLoopProxy::wake_up()`]: crate::event_loop::EventLoopProxy::wake_up
-    ///
-    /// # Example
-    ///
-    /// Use a [`std::sync::mpsc`] channel to handle events from a different thread.
-    ///
-    /// ```no_run
-    /// use std::sync::mpsc;
-    /// use std::thread;
-    /// use std::time::Duration;
-    ///
-    /// use winit::application::ApplicationHandler;
-    /// use winit::event_loop::{ActiveEventLoop, EventLoop};
-    ///
-    /// struct MyApp {
-    ///     receiver: mpsc::Receiver<u64>,
-    /// }
-    ///
-    /// impl ApplicationHandler for MyApp {
-    ///     # fn window_event(
-    ///     #     &mut self,
-    ///     #     _event_loop: &dyn ActiveEventLoop,
-    ///     #     _window_id: winit::window::WindowId,
-    ///     #     _event: winit::event::WindowEvent,
-    ///     # ) {
-    ///     # }
-    ///     #
-    ///     # fn can_create_surfaces(&mut self, _event_loop: &dyn ActiveEventLoop) {}
-    ///     #
-    ///     fn proxy_wake_up(&mut self, _event_loop: &dyn ActiveEventLoop) {
-    ///         // Iterate current events, since wake-ups may have been merged.
-    ///         //
-    ///         // Note: We take care not to use `recv` or `iter` here, as those are blocking,
-    ///         // and that would be bad for performance and might lead to a deadlock.
-    ///         for i in self.receiver.try_iter() {
-    ///             println!("received: {i}");
-    ///         }
-    ///     }
-    ///
-    ///     // Rest of `ApplicationHandler`
-    /// }
-    ///
-    /// fn main() -> Result<(), Box<dyn std::error::Error>> {
-    ///     let event_loop = EventLoop::new()?;
-    ///
-    ///     let (sender, receiver) = mpsc::channel();
-    ///
-    ///     let mut app = MyApp { receiver };
-    ///
-    ///     // Send an event in a loop
-    ///     let proxy = event_loop.create_proxy();
-    ///     let background_thread = thread::spawn(move || {
-    ///         let mut i = 0;
-    ///         loop {
-    ///             println!("sending: {i}");
-    ///             if sender.send(i).is_err() {
-    ///                 // Stop sending once `MyApp` is dropped
-    ///                 break;
-    ///             }
-    ///             // Trigger the wake-up _after_ we placed the event in the channel.
-    ///             // Otherwise, `proxy_wake_up` might be triggered prematurely.
-    ///             proxy.wake_up();
-    ///             i += 1;
-    ///             thread::sleep(Duration::from_secs(1));
-    ///         }
-    ///     });
-    ///
-    ///     event_loop.run_app(&mut app)?;
-    ///
-    ///     drop(app);
-    ///     background_thread.join().unwrap();
-    ///
-    ///     Ok(())
-    /// }
-    /// ```
-    fn proxy_wake_up(&mut self, event_loop: &dyn ActiveEventLoop) {
-        let _ = event_loop;
+    /// [`EventLoopProxy::send_event`]: crate::event_loop::EventLoopProxy::send_event
+    fn user_event(&mut self, event_loop: &ActiveEventLoop, event: T) {
+        let _ = (event_loop, event);
     }
 
     /// Emitted when the OS sends an event to a winit window.
     fn window_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         window_id: WindowId,
         event: WindowEvent,
     );
@@ -197,7 +100,7 @@ pub trait ApplicationHandler {
     /// Emitted when the OS sends an event to a device.
     fn device_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         device_id: DeviceId,
         event: DeviceEvent,
     ) {
@@ -215,53 +118,31 @@ pub trait ApplicationHandler {
     ///
     /// This is not an ideal event to drive application rendering from and instead applications
     /// should render in response to [`WindowEvent::RedrawRequested`] events.
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
         let _ = event_loop;
     }
 
     /// Emitted when the application has been suspended.
     ///
-    /// See [`resumed()`][Self::resumed].
+    /// # Portability
     ///
-    /// ## Platform-specific
+    /// Not all platforms support the notion of suspending applications, and there may be no
+    /// technical way to guarantee being able to emit a `Suspended` event if the OS has
+    /// no formal application lifecycle (currently only Android, iOS, and Web do). For this reason,
+    /// Winit does not currently try to emit pseudo `Suspended` events before the application
+    /// quits on platforms without an application lifecycle.
     ///
-    /// ### iOS
+    /// Considering that the implementation of `Suspended` and [`Resumed`] events may be internally
+    /// driven by multiple platform-specific events, and that there may be subtle differences across
+    /// platforms with how these internal events are delivered, it's recommended that applications
+    /// be able to gracefully handle redundant (i.e. back-to-back) `Suspended` or [`Resumed`]
+    /// events.
     ///
-    /// On iOS, the [`suspended()`] method is called in response to an
-    /// [`applicationWillResignActive`] callback which means that the application is about to
-    /// transition from the active to inactive state (according to the [iOS application lifecycle]).
+    /// Also see [`Resumed`] notes.
     ///
-    /// [`applicationWillResignActive`]: https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622950-applicationwillresignactive
-    /// [iOS application lifecycle]: https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle
+    /// ## Android
     ///
-    /// ### Web
-    ///
-    /// On Web, the [`suspended()`] method is called in response to a [`pagehide`] event if the
-    /// page is being restored from the [`bfcache`] (back/forward cache) - an in-memory cache that
-    /// stores a complete snapshot of a page (including the JavaScript heap) as the user is
-    /// navigating away.
-    ///
-    /// [`pagehide`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pagehide_event
-    /// [`bfcache`]: https://web.dev/bfcache/
-    ///
-    /// ### Others
-    ///
-    /// **Android / macOS / Orbital / Wayland / Windows / X11:** Unsupported.
-    ///
-    /// [`suspended()`]: Self::suspended
-    fn suspended(&mut self, event_loop: &dyn ActiveEventLoop) {
-        let _ = event_loop;
-    }
-
-    /// Emitted when the application must destroy its render surfaces.
-    ///
-    /// See [`can_create_surfaces()`] for more details.
-    ///
-    /// ## Platform-specific
-    ///
-    /// ### Android
-    ///
-    /// On Android, the [`destroy_surfaces()`] method is called when the application's associated
+    /// On Android, the `Suspended` event is only sent when the application's associated
     /// [`SurfaceView`] is destroyed. This is expected to closely correlate with the [`onPause`]
     /// lifecycle event but there may technically be a discrepancy.
     ///
@@ -271,24 +152,38 @@ pub trait ApplicationHandler {
     /// destroyed, which indirectly invalidates any existing render surfaces that may have been
     /// created outside of Winit (such as an `EGLSurface`, [`VkSurfaceKHR`] or [`wgpu::Surface`]).
     ///
-    /// After being [suspended] on Android applications must drop all render surfaces before
+    /// After being `Suspended` on Android applications must drop all render surfaces before
     /// the event callback completes, which may be re-created when the application is next
-    /// [resumed].
+    /// [`Resumed`].
     ///
-    /// [suspended]: Self::destroy_surfaces
-    /// [resumed]: Self::can_create_surfaces
     /// [`SurfaceView`]: https://developer.android.com/reference/android/view/SurfaceView
     /// [Activity lifecycle]: https://developer.android.com/guide/components/activities/activity-lifecycle
     /// [`VkSurfaceKHR`]: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkSurfaceKHR.html
     /// [`wgpu::Surface`]: https://docs.rs/wgpu/latest/wgpu/struct.Surface.html
     ///
-    /// ### Others
+    /// ## iOS
     ///
-    /// - **iOS / macOS / Orbital / Wayland / Web / Windows / X11:** Unsupported.
+    /// On iOS, the `Suspended` event is currently emitted in response to an
+    /// [`applicationWillResignActive`] callback which means that the application is
+    /// about to transition from the active to inactive state (according to the
+    /// [iOS application lifecycle]).
     ///
-    /// [`can_create_surfaces()`]: Self::can_create_surfaces
-    /// [`destroy_surfaces()`]: Self::destroy_surfaces
-    fn destroy_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+    /// [`applicationWillResignActive`]: https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622950-applicationwillresignactive
+    /// [iOS application lifecycle]: https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle
+    ///
+    /// ## Web
+    ///
+    /// On Web, the `Suspended` event is emitted in response to a [`pagehide`] event
+    /// with the property [`persisted`] being true, which means that the page is being
+    /// put in the [`bfcache`] (back/forward cache) - an in-memory cache that stores a
+    /// complete snapshot of a page (including the JavaScript heap) as the user is
+    /// navigating away.
+    ///
+    /// [`pagehide`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pagehide_event
+    /// [`persisted`]: https://developer.mozilla.org/en-US/docs/Web/API/PageTransitionEvent/persisted
+    /// [`bfcache`]: https://web.dev/bfcache/
+    /// [`Resumed`]: Self::resumed
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
         let _ = event_loop;
     }
 
@@ -296,7 +191,7 @@ pub trait ApplicationHandler {
     ///
     /// This is irreversible - if this method is called, it is guaranteed that the event loop
     /// will exit right after.
-    fn exiting(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn exiting(&mut self, event_loop: &ActiveEventLoop) {
         let _ = event_loop;
     }
 
@@ -324,50 +219,31 @@ pub trait ApplicationHandler {
     /// ### Others
     ///
     /// - **macOS / Orbital / Wayland / Web / Windows:** Unsupported.
-    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn memory_warning(&mut self, event_loop: &ActiveEventLoop) {
         let _ = event_loop;
     }
-
-    /// Get the [`ApplicationHandler`] as [`Any`].
-    ///
-    /// This is useful for downcasting to a concrete application type.
-    #[inline(always)]
-    fn as_any(&mut self) -> Option<&mut dyn Any> {
-        None
-    }
 }
 
-#[deny(clippy::missing_trait_methods)]
-impl<A: ?Sized + ApplicationHandler> ApplicationHandler for &mut A {
-    #[inline(always)]
-    fn as_any(&mut self) -> Option<&mut dyn Any> {
-        (**self).as_any()
-    }
-
+impl<A: ?Sized + ApplicationHandler<T>, T: 'static> ApplicationHandler<T> for &mut A {
     #[inline]
-    fn new_events(&mut self, event_loop: &dyn ActiveEventLoop, cause: StartCause) {
+    fn new_events(&mut self, event_loop: &ActiveEventLoop, cause: StartCause) {
         (**self).new_events(event_loop, cause);
     }
 
     #[inline]
-    fn resumed(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
         (**self).resumed(event_loop);
     }
 
     #[inline]
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).can_create_surfaces(event_loop);
-    }
-
-    #[inline]
-    fn proxy_wake_up(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).proxy_wake_up(event_loop);
+    fn user_event(&mut self, event_loop: &ActiveEventLoop, event: T) {
+        (**self).user_event(event_loop, event);
     }
 
     #[inline]
     fn window_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         window_id: WindowId,
         event: WindowEvent,
     ) {
@@ -377,7 +253,7 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for &mut A {
     #[inline]
     fn device_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         device_id: DeviceId,
         event: DeviceEvent,
     ) {
@@ -385,62 +261,46 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for &mut A {
     }
 
     #[inline]
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
         (**self).about_to_wait(event_loop);
     }
 
     #[inline]
-    fn suspended(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
         (**self).suspended(event_loop);
     }
 
     #[inline]
-    fn destroy_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).destroy_surfaces(event_loop);
-    }
-
-    #[inline]
-    fn exiting(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn exiting(&mut self, event_loop: &ActiveEventLoop) {
         (**self).exiting(event_loop);
     }
 
     #[inline]
-    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn memory_warning(&mut self, event_loop: &ActiveEventLoop) {
         (**self).memory_warning(event_loop);
     }
 }
 
-#[deny(clippy::missing_trait_methods)]
-impl<A: ?Sized + ApplicationHandler> ApplicationHandler for Box<A> {
-    #[inline(always)]
-    fn as_any(&mut self) -> Option<&mut dyn Any> {
-        (**self).as_any()
-    }
-
+impl<A: ?Sized + ApplicationHandler<T>, T: 'static> ApplicationHandler<T> for Box<A> {
     #[inline]
-    fn new_events(&mut self, event_loop: &dyn ActiveEventLoop, cause: StartCause) {
+    fn new_events(&mut self, event_loop: &ActiveEventLoop, cause: StartCause) {
         (**self).new_events(event_loop, cause);
     }
 
     #[inline]
-    fn resumed(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
         (**self).resumed(event_loop);
     }
 
     #[inline]
-    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).can_create_surfaces(event_loop);
-    }
-
-    #[inline]
-    fn proxy_wake_up(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).proxy_wake_up(event_loop);
+    fn user_event(&mut self, event_loop: &ActiveEventLoop, event: T) {
+        (**self).user_event(event_loop, event);
     }
 
     #[inline]
     fn window_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         window_id: WindowId,
         event: WindowEvent,
     ) {
@@ -450,7 +310,7 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for Box<A> {
     #[inline]
     fn device_event(
         &mut self,
-        event_loop: &dyn ActiveEventLoop,
+        event_loop: &ActiveEventLoop,
         device_id: DeviceId,
         event: DeviceEvent,
     ) {
@@ -458,27 +318,22 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for Box<A> {
     }
 
     #[inline]
-    fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
         (**self).about_to_wait(event_loop);
     }
 
     #[inline]
-    fn suspended(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn suspended(&mut self, event_loop: &ActiveEventLoop) {
         (**self).suspended(event_loop);
     }
 
     #[inline]
-    fn destroy_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
-        (**self).destroy_surfaces(event_loop);
-    }
-
-    #[inline]
-    fn exiting(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn exiting(&mut self, event_loop: &ActiveEventLoop) {
         (**self).exiting(event_loop);
     }
 
     #[inline]
-    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
+    fn memory_warning(&mut self, event_loop: &ActiveEventLoop) {
         (**self).memory_warning(event_loop);
     }
 }

src/changelog/unreleased.md

@@ -39,94 +39,3 @@ The migration guide could reference other migration examples in the current
 changelog entry.
 
 ## Unreleased
-
-### Added
-
-- Add `ActiveEventLoop::create_proxy()`.
-- On Web, implement `Error` for `platform::web::CustomCursorError`.
-- On Web, add `ActiveEventLoopExtWeb::is_cursor_lock_raw()` to determine if
-  `DeviceEvent::MouseMotion` is returning raw data, not OS accelerated, when using
-  `CursorGrabMode::Locked`.
-- On Web, implement `MonitorHandle` and `VideoModeHandle`.
-  
-  Without prompting the user for permission, only the current monitor is returned. But when
-  prompting and being granted permission through
-  `ActiveEventLoop::request_detailed_monitor_permission()`, access to all monitors and their
-  information is available. This "detailed monitors" can be used in `Window::set_fullscreen()` as
-  well.
-- On Android, add `{Active,}EventLoopExtAndroid::android_app()` to access the app used to create the loop.
-- Add `ActiveEventLoop::system_theme()`, returning the current system theme.
-- Add `Touch::finger_id` with a new type `FingerId`.
-- On Web and Windows, add `FingerIdExt*::is_primary()`, exposing a way to determine
-  the primary finger in a multi-touch interaction.
-- Implement `Clone`, `Copy`, `Debug`, `Deserialize`, `Eq`, `Hash`, `Ord`, `PartialEq`, `PartialOrd`
-  and `Serialize` on many types.
-- Add `MonitorHandle::current_video_mode()`.
-
-### Changed
-
-- Change `ActiveEventLoop` to be a trait.
-- `ApplicationHandler` now uses `dyn ActiveEventLoop`.
-- On Web, let events wake up event loop immediately when using `ControlFlow::Poll`.
-- Bump MSRV from `1.70` to `1.73`.
-- Changed `ApplicationHandler::user_event` to `user_wake_up`, removing the
-  generic user event.
-
-  Winit will now only indicate that wake up happened, you will have to pair
-  this with an external mechanism like `std::sync::mpsc::channel` if you want
-  to send specific data to be processed on the main thread.
-- Changed `EventLoopProxy::send_event` to `EventLoopProxy::wake_up`, it now
-  only wakes up the loop.
-- On X11, implement smooth resizing through the sync extension API.
-- `ApplicationHandler::create|destroy_surfaces()` was split off from
-  `ApplicationHandler::resumed/suspended()`.
-
-  `ApplicationHandler::can_create_surfaces()` should, for portability reasons
-  to Android, be the only place to create render surfaces.
-
-  `ApplicationHandler::resumed/suspended()` are now only emitted by iOS and Web
-  and now signify actually resuming/suspending the application.
-- Rename `platform::web::*ExtWebSys` to `*ExtWeb`.
-- Change signature of `EventLoop::run_app`, `EventLoopExtPumpEvents::pump_app_events` and
-  `EventLoopExtRunOnDemand::run_app_on_demand` to accept a `impl ApplicationHandler` directly,
-  instead of requiring a `&mut` reference to it.
-- On Web, `Window::canvas()` now returns a reference.
-- On Web, `CursorGrabMode::Locked` now lets `DeviceEvent::MouseMotion` return raw data, not OS
-  accelerated, if the browser supports it.
-- `(Active)EventLoop::create_custom_cursor()` now returns a `Result<CustomCursor, ExternalError>`.
-- Changed how `ModifiersState` is serialized by Serde.
-- `VideoModeHandle::refresh_rate_millihertz()` and `bit_depth()` now return a `Option<NonZero*>`.
-- `MonitorHandle::position()` now returns an `Option`.
-
-### Removed
-
-- Remove `Event`.
-- Remove already deprecated APIs:
-  - `EventLoop::create_window()`
-  - `EventLoop::run`.
-  - `EventLoopBuilder::new()`
-  - `EventLoopExtPumpEvents::pump_events`.
-  - `EventLoopExtRunOnDemand::run_on_demand`.
-  - `VideoMode`
-  - `WindowAttributes::new()`
-  - `Window::set_cursor_icon()`
-- On iOS, remove `platform::ios::EventLoopExtIOS` and related `platform::ios::Idiom` type.
-
-  This feature was incomplete, and the equivalent functionality can be trivially achieved outside
-  of `winit` using `objc2-ui-kit` and calling `UIDevice::currentDevice().userInterfaceIdiom()`.
-- On Web, remove unused `platform::web::CustomCursorError::Animation`.
-- Remove the `rwh_04` and `rwh_05` cargo feature and the corresponding `raw-window-handle` v0.4 and
-  v0.5 support. v0.6 remains in place and is enabled by default.
-- Remove `DeviceEvent::Added` and `DeviceEvent::Removed`.
-- Remove `DeviceEvent::Motion` and `WindowEvent::AxisMotion`.
-- Remove `Touch::id` in favor of `Touch::finger_id`.
-- Remove `MonitorHandle::size()` and `refresh_rate_millihertz()` in favor of
-  `MonitorHandle::current_video_mode()`.
-- On Android, remove all `MonitorHandle` support instead of emitting false data.
-
-### Fixed
-
-- On Web, pen events are now routed through to `WindowEvent::Cursor*`.
-- On macOS, fix panic when releasing not available monitor.
-- On MacOS, return the system theme in `Window::theme()` if no theme override is set.
-- On Orbital, `MonitorHandle::name()` now returns `None` instead of a dummy name.

src/changelog/v0.20.md

@@ -137,7 +137,7 @@
 
 - On X11, non-resizable windows now have maximize explicitly disabled.
 - On Windows, support paths longer than MAX_PATH (260 characters) in `WindowEvent::DroppedFile`
-  and `WindowEvent::HoveredFile`.
+and `WindowEvent::HoveredFile`.
 - On Mac, implement `DeviceEvent::Button`.
 - Change `Event::Suspended(true / false)` to `Event::Suspended` and `Event::Resumed`.
 - On X11, fix sanity check which checks that a monitor's reported width and height (in millimeters) are non-zero when calculating the DPI factor.

src/changelog/v0.30.md

@@ -1,55 +1,9 @@
-## 0.30.4
-
-### Changed
-
-- `DeviceId::dummy()` and `WindowId::dummy()` are no longer marked `unsafe`.
-
-### Fixed
-
-- On Wayland, avoid crashing when compositor is misbehaving.
-- On Web, fix `WindowEvent::Resized` not using `requestAnimationFrame` when sending
-  `WindowEvent::RedrawRequested` and also potentially causing `WindowEvent::RedrawRequested`
-  to not be de-duplicated.
-- Account for different browser engine implementations of pointer movement coordinate space.
-
-## 0.30.3
-
-### Added
-
-- On Web, add `EventLoopExtWebSys::(set_)poll_strategy()` to allow setting
-  control flow strategies before starting the event loop.
-- On Web, add `WaitUntilStrategy`, which allows to set different strategies for
-  `ControlFlow::WaitUntil`. By default the Prioritized Task Scheduling API is
-  used, with a fallback to `setTimeout()` with a trick to circumvent throttling
-  to 4ms. But an option to use a Web worker to schedule the timer is available
-  as well, which commonly prevents any throttling when the window is not focused.
-
-### Changed
-
-- On macOS, set the window theme on the `NSWindow` instead of application-wide.
-
-### Fixed
-
-- On X11, build on arm platforms.
-- On macOS, fixed `WindowBuilder::with_theme` not having any effect on the window.
-
-## 0.30.2
-
-### Fixed
-
-- On Web, fix `EventLoopProxy::send_event()` triggering event loop immediately
-  when not called from inside the event loop. Now queues a microtask instead.
-- On Web, stop overwriting default cursor with `CursorIcon::Default`.
-- On Web, prevent crash when using `InnerSizeWriter::request_inner_size()`.
-- On macOS, fix not working opacity for entire window.
-
 ## 0.30.1
 
 ### Added
 
 - Reexport `raw-window-handle` versions 0.4 and 0.5 as `raw_window_handle_04` and `raw_window_handle_05`.
 - Implement `ApplicationHandler` for `&mut` references and heap allocations to something that implements `ApplicationHandler`.
-- Add traits `EventLoopExtWayland` and `EventLoopExtX11`, providing methods `is_wayland` and `is_x11` on `EventLoop`.
 
 ### Fixed
 
@@ -126,7 +80,7 @@
   `Fn`. The semantics are mostly the same, given that the capture list of the
   closure is your new `State`. Consider the following code:
 
-  ```rust,no_run,ignore
+  ```rust,no_run
   use winit::event::Event;
   use winit::event_loop::EventLoop;
   use winit::window::Window;
@@ -162,7 +116,7 @@
   we move particular `match event` arms into methods on `ApplicationHandler`,
   for example:
 
-  ```rust,no_run,ignore
+  ```rust,no_run
   use winit::application::ApplicationHandler;
   use winit::event::{Event, WindowEvent, DeviceEvent, DeviceId};
   use winit::event_loop::{EventLoop, ActiveEventLoop};
@@ -225,7 +179,7 @@
 
   Using the migration example from above, you can change your code as follows:
 
-  ```rust,no_run,ignore
+  ```rust,no_run
   use winit::application::ApplicationHandler;
   use winit::event::{Event, WindowEvent, DeviceEvent, DeviceId};
   use winit::event_loop::{EventLoop, ActiveEventLoop};

src/changelog/v0.9.md

@@ -3,20 +3,20 @@
 - Added event `WindowEvent::HiDPIFactorChanged`.
 - Added method `MonitorId::get_hidpi_factor`.
 - Deprecated `get_inner_size_pixels` and `get_inner_size_points` methods of `Window` in favor of
-  `get_inner_size`.
+`get_inner_size`.
 - **Breaking:** `EventsLoop` is `!Send` and `!Sync` because of platform-dependant constraints,
   but `Window`, `WindowId`, `DeviceId` and `MonitorId` guaranteed to be `Send`.
 - `MonitorId::get_position` now returns `(i32, i32)` instead of `(u32, u32)`.
 - Rewrite of the wayland backend to use wayland-client-0.11
 - Support for dead keys on wayland for keyboard utf8 input
 - Monitor enumeration on Windows is now implemented using `EnumDisplayMonitors` instead of
-  `EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`.
+`EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`.
 - On Windows added `MonitorIdExt::hmonitor` method
 - Impl `Clone` for `EventsLoopProxy`
 - `EventsLoop::get_primary_monitor()` on X11 will fallback to any available monitor if no primary is found
 - Support for touch event on wayland
 - `WindowEvent`s `MouseMoved`, `MouseEntered`, and `MouseLeft` have been renamed to
-  `CursorMoved`, `CursorEntered`, and `CursorLeft`.
+`CursorMoved`, `CursorEntered`, and `CursorLeft`.
 - New `DeviceEvent`s added, `MouseMotion` and `MouseWheel`.
 - Send `CursorMoved` event after `CursorEntered` and `Focused` events.
 - Add support for `ModifiersState`, `MouseMove`, `MouseInput`, `MouseMotion` for emscripten backend.

src/cursor.rs

@@ -50,7 +50,7 @@ impl From<CustomCursor> for Cursor {
 /// ```no_run
 /// # use winit::event_loop::ActiveEventLoop;
 /// # use winit::window::Window;
-/// # fn scope(event_loop: &dyn ActiveEventLoop, window: &Window) {
+/// # fn scope(event_loop: &ActiveEventLoop, window: &Window) {
 /// use winit::window::CustomCursor;
 ///
 /// let w = 10;
@@ -62,13 +62,13 @@ impl From<CustomCursor> for Cursor {
 ///
 /// #[cfg(target_family = "wasm")]
 /// let source = {
-///     use winit::platform::web::CustomCursorExtWeb;
+///     use winit::platform::web::CustomCursorExtWebSys;
 ///     CustomCursor::from_url(String::from("http://localhost:3000/cursor.png"), 0, 0)
 /// };
 ///
-/// if let Ok(custom_cursor) = event_loop.create_custom_cursor(source) {
-///     window.set_cursor(custom_cursor.clone());
-/// }
+/// let custom_cursor = event_loop.create_custom_cursor(source);
+///
+/// window.set_cursor(custom_cursor.clone());
 /// # }
 /// ```
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
@@ -107,16 +107,13 @@ impl CustomCursor {
 /// Source for [`CustomCursor`].
 ///
 /// See [`CustomCursor`] for more details.
-#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+#[derive(Debug)]
 pub struct CustomCursorSource {
-    // Some platforms don't support custom cursors.
-    #[allow(dead_code)]
     pub(crate) inner: PlatformCustomCursorSource,
 }
 
 /// An error produced when using [`CustomCursor::from_rgba`] with invalid arguments.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[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
@@ -167,7 +164,7 @@ impl Error for BadImage {}
 /// Platforms export this directly as `PlatformCustomCursorSource` if they need to only work with
 /// images.
 #[allow(dead_code)]
-#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+#[derive(Debug)]
 pub(crate) struct OnlyCursorImageSource(pub(crate) CursorImage);
 
 #[allow(dead_code)]
@@ -202,7 +199,7 @@ impl PartialEq for OnlyCursorImage {
 
 impl Eq for OnlyCursorImage {}
 
-#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+#[derive(Debug)]
 #[allow(dead_code)]
 pub(crate) struct CursorImage {
     pub(crate) rgba: Vec<u8>,

src/error.rs

@@ -15,8 +15,7 @@ pub enum ExternalError {
 }
 
 /// The error type for when the requested operation is not supported by the backend.
-#[derive(Clone, Copy, Default, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone)]
 pub struct NotSupportedError {
     _marker: (),
 }

src/event.rs

@@ -1,4 +1,4 @@
-//! The event enums and assorted supporting types.
+//! The [`Event`] enum and assorted supporting types.
 //!
 //! These are sent to the closure given to [`EventLoop::run_app(...)`], where they get
 //! processed and used to modify the program state. For more details, see the root-level
@@ -54,15 +54,11 @@ use crate::platform_impl;
 use crate::window::Window;
 use crate::window::{ActivationToken, Theme, WindowId};
 
-// TODO: Remove once the backends can call `ApplicationHandler` methods directly. For now backends
-// like Windows and Web require `Event` to wire user events, otherwise each backend will have to
-// wrap `Event` in some other structure.
 /// Describes a generic event.
 ///
 /// See the module-level docs for more information on the event loop manages each event.
-#[allow(dead_code)]
 #[derive(Debug, Clone, PartialEq)]
-pub(crate) enum Event {
+pub enum Event<T: 'static> {
     /// See [`ApplicationHandler::new_events`] for details.
     ///
     /// [`ApplicationHandler::new_events`]: crate::application::ApplicationHandler::new_events
@@ -71,25 +67,23 @@ pub(crate) enum Event {
     /// See [`ApplicationHandler::window_event`] for details.
     ///
     /// [`ApplicationHandler::window_event`]: crate::application::ApplicationHandler::window_event
-    #[allow(clippy::enum_variant_names)]
     WindowEvent { window_id: WindowId, event: WindowEvent },
 
     /// See [`ApplicationHandler::device_event`] for details.
     ///
     /// [`ApplicationHandler::device_event`]: crate::application::ApplicationHandler::device_event
-    #[allow(clippy::enum_variant_names)]
     DeviceEvent { device_id: DeviceId, event: DeviceEvent },
 
+    /// See [`ApplicationHandler::user_event`] for details.
+    ///
+    /// [`ApplicationHandler::user_event`]: crate::application::ApplicationHandler::user_event
+    UserEvent(T),
+
     /// See [`ApplicationHandler::suspended`] for details.
     ///
     /// [`ApplicationHandler::suspended`]: crate::application::ApplicationHandler::suspended
     Suspended,
 
-    /// See [`ApplicationHandler::can_create_surfaces`] for details.
-    ///
-    /// [`ApplicationHandler::can_create_surfaces`]: crate::application::ApplicationHandler::can_create_surfaces
-    CreateSurfaces,
-
     /// See [`ApplicationHandler::resumed`] for details.
     ///
     /// [`ApplicationHandler::resumed`]: crate::application::ApplicationHandler::resumed
@@ -109,13 +103,28 @@ pub(crate) enum Event {
     ///
     /// [`ApplicationHandler::memory_warning`]: crate::application::ApplicationHandler::memory_warning
     MemoryWarning,
+}
 
-    /// User requested a wake up.
-    UserWakeUp,
+impl<T> Event<T> {
+    #[allow(clippy::result_large_err)]
+    pub fn map_nonuser_event<U>(self) -> Result<Event<U>, Event<T>> {
+        use self::Event::*;
+        match self {
+            UserEvent(_) => Err(self),
+            WindowEvent { window_id, event } => Ok(WindowEvent { window_id, event }),
+            DeviceEvent { device_id, event } => Ok(DeviceEvent { device_id, event }),
+            NewEvents(cause) => Ok(NewEvents(cause)),
+            AboutToWait => Ok(AboutToWait),
+            LoopExiting => Ok(LoopExiting),
+            Suspended => Ok(Suspended),
+            Resumed => Ok(Resumed),
+            MemoryWarning => Ok(MemoryWarning),
+        }
+    }
 }
 
 /// Describes the reason the event loop is resuming.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum StartCause {
     /// Sent if the time specified by [`ControlFlow::WaitUntil`] has been reached. Contains the
     /// moment the timeout was requested and the requested resume time. The actual resume time is
@@ -340,6 +349,9 @@ pub enum WindowEvent {
     /// touchpad is being pressed) and stage (integer representing the click level).
     TouchpadPressure { device_id: DeviceId, pressure: f32, stage: i64 },
 
+    /// Motion on some analog axis. May report data redundant to other, more specific events.
+    AxisMotion { device_id: DeviceId, axis: AxisId, value: f64 },
+
     /// Touch event has been received
     ///
     /// ## Platform-specific
@@ -377,8 +389,6 @@ pub enum WindowEvent {
     /// Applications might wish to react to this to change the theme of the content of the window
     /// when the system changes the window theme.
     ///
-    /// This only reports a change if the window theme was not overridden by [`Window::set_theme`].
-    ///
     /// ## Platform-specific
     ///
     /// - **iOS / Android / X11 / Wayland / Orbital:** Unsupported.
@@ -434,42 +444,19 @@ pub enum WindowEvent {
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DeviceId(pub(crate) platform_impl::DeviceId);
 
-impl Default for DeviceId {
-    fn default() -> Self {
-        Self::dummy()
-    }
-}
-
 impl DeviceId {
     /// Returns a dummy id, useful for unit testing.
     ///
-    /// # Notes
+    /// # Safety
     ///
     /// The only guarantee made about the return value of this function is that
     /// it will always be equal to itself and to future values returned by this function.
     /// No other guarantees are made. This may be equal to a real `DeviceId`.
-    pub const fn dummy() -> Self {
-        DeviceId(platform_impl::DeviceId::dummy())
-    }
-}
-
-/// Identifier of a finger in a touch event.
-///
-/// Whenever a touch event is received it contains a `FingerId` which uniquely identifies the finger
-/// used for the current interaction.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FingerId(pub(crate) platform_impl::FingerId);
-
-impl FingerId {
-    /// Returns a dummy id, useful for unit testing.
     ///
-    /// # Notes
-    ///
-    /// The only guarantee made about the return value of this function is that
-    /// it will always be equal to itself and to future values returned by this function.
-    /// No other guarantees are made. This may be equal to a real `FingerId`.
-    pub const fn dummy() -> Self {
-        FingerId(platform_impl::FingerId::dummy())
+    /// **Passing this into a winit function will result in undefined behavior.**
+    pub const unsafe fn dummy() -> Self {
+        #[allow(unused_unsafe)]
+        DeviceId(unsafe { platform_impl::DeviceId::dummy() })
     }
 }
 
@@ -481,28 +468,15 @@ impl FingerId {
 /// (corresponding to GUI cursors and keyboard focus) the device IDs may not match.
 ///
 /// Note that these events are delivered regardless of input focus.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum DeviceEvent {
+    Added,
+    Removed,
+
     /// Change in physical position of a pointing device.
     ///
     /// This represents raw, unfiltered physical motion. Not to be confused with
     /// [`WindowEvent::CursorMoved`].
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Web:** Only returns raw data, not OS accelerated, if [`CursorGrabMode::Locked`] is used
-    /// and browser support is available, see
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "[`ActiveEventLoopExtWeb::is_cursor_lock_raw()`][crate::platform::web::ActiveEventLoopExtWeb::is_cursor_lock_raw()]."
-    )]
-    #[cfg_attr(
-        not(any(web_platform, docsrs)),
-        doc = "`ActiveEventLoopExtWeb::is_cursor_lock_raw()`."
-    )]
-    ///
-    #[rustfmt::skip]
-    /// [`CursorGrabMode::Locked`]: crate::window::CursorGrabMode::Locked
     MouseMotion {
         /// (x, y) change in position in unspecified units.
         ///
@@ -515,6 +489,14 @@ pub enum DeviceEvent {
         delta: MouseScrollDelta,
     },
 
+    /// Motion on some analog axis. This event will be reported for all arbitrary input devices
+    /// that winit supports on this platform, including mouse devices.  If the device is a mouse
+    /// device then this will be reported alongside the MouseMotion event.
+    Motion {
+        axis: AxisId,
+        value: f64,
+    },
+
     Button {
         button: ButtonId,
         state: ElementState,
@@ -530,7 +512,7 @@ pub enum DeviceEvent {
 /// repeat or the initial keypress. An application may emulate this by, for
 /// example keeping a Map/Set of pressed keys and determining whether a keypress
 /// corresponds to an already pressed key.
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct RawKeyEvent {
     pub physical_key: keyboard::PhysicalKey,
@@ -551,11 +533,11 @@ pub struct KeyEvent {
     /// ## Caveats
     ///
     /// - Certain niche hardware will shuffle around physical key positions, e.g. a keyboard that
-    ///   implements DVORAK in hardware (or firmware)
+    /// implements DVORAK in hardware (or firmware)
     /// - Your application will likely have to handle keyboards which are missing keys that your
-    ///   own keyboard has.
+    /// own keyboard has.
     /// - Certain `KeyCode`s will move between a couple of different positions depending on what
-    ///   layout the keyboard was manufactured to support.
+    /// layout the keyboard was manufactured to support.
     ///
     ///  **Because of these caveats, it is important that you provide users with a way to configure
     ///  most (if not all) keybinds in your application.**
@@ -577,7 +559,8 @@ pub struct KeyEvent {
     ///
     /// This has two use cases:
     /// - Allows querying whether the current input is a Dead key.
-    /// - Allows handling key-bindings on platforms which don't support [`key_without_modifiers`].
+    /// - Allows handling key-bindings on platforms which don't
+    /// support [`key_without_modifiers`].
     ///
     /// If you use this field (or [`key_without_modifiers`] for that matter) for keyboard
     /// shortcuts, **it is important that you provide users with a way to configure your
@@ -585,8 +568,8 @@ pub struct KeyEvent {
     /// incompatible keyboard layout.**
     ///
     /// ## Platform-specific
-    /// - **Web:** Dead keys might be reported as the real key instead of `Dead` depending on the
-    ///   browser/OS.
+    /// - **Web:** Dead keys might be reported as the real key instead
+    /// of `Dead` depending on the browser/OS.
     ///
     /// [`key_without_modifiers`]: crate::platform::modifier_supplement::KeyEventExtModifierSupplement::key_without_modifiers
     pub logical_key: keyboard::Key,
@@ -643,7 +626,7 @@ pub struct KeyEvent {
     /// In games, you often want to ignore repated key events - this can be
     /// done by ignoring events where this property is set.
     ///
-    /// ```no_run
+    /// ```
     /// use winit::event::{ElementState, KeyEvent, WindowEvent};
     /// use winit::keyboard::{KeyCode, PhysicalKey};
     /// # let window_event = WindowEvent::RedrawRequested; // To make the example compile
@@ -675,8 +658,7 @@ pub struct KeyEvent {
 }
 
 /// Describes keyboard modifiers event.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
 pub struct Modifiers {
     pub(crate) state: ModifiersState,
 
@@ -869,16 +851,15 @@ pub struct Touch {
     ///
     /// - Only available on **iOS** 9.0+, **Windows** 8+, **Web**, and **Android**.
     /// - **Android**: This will never be [None]. If the device doesn't support pressure
-    ///   sensitivity, force will either be 0.0 or 1.0. Also see the
-    ///   [android documentation](https://developer.android.com/reference/android/view/MotionEvent#AXIS_PRESSURE).
+    /// sensitivity, force will either be 0.0 or 1.0. Also see the
+    /// [android documentation](https://developer.android.com/reference/android/view/MotionEvent#AXIS_PRESSURE).
     pub force: Option<Force>,
     /// Unique identifier of a finger.
-    pub finger_id: FingerId,
+    pub id: u64,
 }
 
 /// Describes the force of a touch event
 #[derive(Debug, Clone, Copy, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Force {
     /// On iOS, the force is calibrated so that the same number corresponds to
     /// roughly the same amount of pressure on the screen regardless of the
@@ -1028,21 +1009,17 @@ impl PartialEq for InnerSizeWriter {
     }
 }
 
-impl Eq for InnerSizeWriter {}
-
 #[cfg(test)]
 mod tests {
-    use std::collections::{BTreeSet, HashSet};
-
     use crate::dpi::PhysicalPosition;
     use crate::event;
+    use std::collections::{BTreeSet, HashSet};
 
     macro_rules! foreach_event {
         ($closure:expr) => {{
             #[allow(unused_mut)]
             let mut x = $closure;
-            let did = event::DeviceId::dummy();
-            let fid = event::FingerId::dummy();
+            let did = unsafe { event::DeviceId::dummy() };
 
             #[allow(deprecated)]
             {
@@ -1052,7 +1029,8 @@ mod tests {
                 use crate::window::WindowId;
 
                 // Mainline events.
-                let wid = WindowId::dummy();
+                let wid = unsafe { WindowId::dummy() };
+                x(UserEvent(()));
                 x(NewEvents(event::StartCause::Init));
                 x(AboutToWait);
                 x(LoopExiting);
@@ -1102,11 +1080,12 @@ mod tests {
                     phase: event::TouchPhase::Started,
                 });
                 with_window_event(TouchpadPressure { device_id: did, pressure: 0.0, stage: 0 });
+                with_window_event(AxisMotion { device_id: did, axis: 0, value: 0.0 });
                 with_window_event(Touch(event::Touch {
                     device_id: did,
                     phase: event::TouchPhase::Started,
                     location: (0.0, 0.0).into(),
-                    finger_id: fid,
+                    id: 0,
                     force: Some(event::Force::Normalized(0.0)),
                 }));
                 with_window_event(ThemeChanged(crate::window::Theme::Light));
@@ -1120,10 +1099,13 @@ mod tests {
                 let with_device_event =
                     |dev_ev| x(event::Event::DeviceEvent { device_id: did, event: dev_ev });
 
+                with_device_event(Added);
+                with_device_event(Removed);
                 with_device_event(MouseMotion { delta: (0.0, 0.0).into() });
                 with_device_event(MouseWheel {
                     delta: event::MouseScrollDelta::LineDelta(0.0, 0.0),
                 });
+                with_device_event(Motion { axis: 0, value: 0.0 });
                 with_device_event(Button { button: 0, state: event::ElementState::Pressed });
             }
         }};
@@ -1132,12 +1114,25 @@ mod tests {
     #[allow(clippy::redundant_clone)]
     #[test]
     fn test_event_clone() {
-        foreach_event!(|event: event::Event| {
+        foreach_event!(|event: event::Event<()>| {
             let event2 = event.clone();
             assert_eq!(event, event2);
         })
     }
 
+    #[test]
+    fn test_map_nonuser_event() {
+        foreach_event!(|event: event::Event<()>| {
+            let is_user = matches!(event, event::Event::UserEvent(()));
+            let event2 = event.map_nonuser_event::<()>();
+            if is_user {
+                assert_eq!(event2, Err(event::Event::UserEvent(())));
+            } else {
+                assert!(event2.is_ok());
+            }
+        })
+    }
+
     #[test]
     fn test_force_normalize() {
         let force = event::Force::Normalized(0.0);
@@ -1158,13 +1153,12 @@ mod tests {
     #[allow(clippy::clone_on_copy)]
     #[test]
     fn ensure_attrs_do_not_panic() {
-        foreach_event!(|event: event::Event| {
+        foreach_event!(|event: event::Event<()>| {
             let _ = format!("{:?}", event);
         });
         let _ = event::StartCause::Init.clone();
 
-        let did = crate::event::DeviceId::dummy().clone();
-        let fid = crate::event::FingerId::dummy().clone();
+        let did = unsafe { crate::event::DeviceId::dummy() }.clone();
         HashSet::new().insert(did);
         let mut set = [did, did, did];
         set.sort_unstable();
@@ -1180,7 +1174,7 @@ mod tests {
             device_id: did,
             phase: event::TouchPhase::Started,
             location: (0.0, 0.0).into(),
-            finger_id: fid,
+            id: 0,
             force: Some(event::Force::Normalized(0.0)),
         }
         .clone();

src/event_loop.rs

@@ -3,28 +3,27 @@
 //!
 //! If you want to send custom events to the event loop, use
 //! [`EventLoop::create_proxy`] to acquire an [`EventLoopProxy`] and call its
-//! [`wake_up`][EventLoopProxy::wake_up] method. Then during handling the wake up
-//! you can poll your event sources.
+//! [`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::any::Any;
-use std::fmt;
 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::application::ApplicationHandler;
-use crate::error::{EventLoopError, ExternalError, OsError};
+use crate::error::{EventLoopError, OsError};
+use crate::event::Event;
 use crate::monitor::MonitorHandle;
 use crate::platform_impl;
-use crate::window::{CustomCursor, CustomCursorSource, Theme, Window, WindowAttributes};
+use crate::window::{CustomCursor, CustomCursorSource, Window, WindowAttributes};
 
 /// Provides a way to retrieve events from the system and from the windows that were registered to
 /// the events loop.
@@ -41,8 +40,17 @@ use crate::window::{CustomCursor, CustomCursorSource, Theme, Window, WindowAttri
 /// [`EventLoopProxy`] allows you to wake up an `EventLoop` from another thread.
 ///
 /// [`Window`]: crate::window::Window
-pub struct EventLoop {
-    pub(crate) event_loop: platform_impl::EventLoop,
+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
 }
 
@@ -51,15 +59,25 @@ pub struct EventLoop {
 /// 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::builder`].
-#[derive(Default, PartialEq, Eq, Hash)]
-pub struct EventLoopBuilder {
+/// 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 {
+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,
@@ -94,7 +112,7 @@ impl EventLoopBuilder {
         doc = "[`.with_android_app(app)`]: #only-available-on-android"
     )]
     #[inline]
-    pub fn build(&mut self) -> Result<EventLoop, EventLoopError> {
+    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) {
@@ -115,27 +133,26 @@ impl EventLoopBuilder {
     }
 }
 
-impl fmt::Debug for EventLoopBuilder {
+impl<T> fmt::Debug for EventLoop<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("EventLoopBuilder").finish_non_exhaustive()
+        f.pad("EventLoop { .. }")
     }
 }
 
-impl fmt::Debug for EventLoop {
+impl fmt::Debug for ActiveEventLoop {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("EventLoop").finish_non_exhaustive()
+        f.pad("ActiveEventLoop { .. }")
     }
 }
 
 /// Set through [`ActiveEventLoop::set_control_flow()`].
 ///
-/// Indicates the desired behavior of the event loop after [`about_to_wait`] is called.
+/// Indicates the desired behavior of the event loop after [`Event::AboutToWait`] is emitted.
 ///
 /// Defaults to [`Wait`].
 ///
 /// [`Wait`]: Self::Wait
-/// [`about_to_wait`]: crate::application::ApplicationHandler::about_to_wait
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
+#[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.
@@ -172,12 +189,12 @@ impl ControlFlow {
     }
 }
 
-impl EventLoop {
+impl EventLoop<()> {
     /// Create the event loop.
     ///
     /// This is an alias of `EventLoop::builder().build()`.
     #[inline]
-    pub fn new() -> Result<EventLoop, EventLoopError> {
+    pub fn new() -> Result<EventLoop<()>, EventLoopError> {
         Self::builder().build()
     }
 
@@ -187,12 +204,33 @@ impl EventLoop {
     ///
     /// To get the actual event loop, call [`build`][EventLoopBuilder::build] on that.
     #[inline]
-    pub fn builder() -> EventLoopBuilder {
-        EventLoopBuilder { platform_specific: Default::default() }
+    pub fn builder() -> EventLoopBuilder<()> {
+        Self::with_user_event()
     }
 }
 
-impl EventLoop {
+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 }
+    }
+
+    /// See [`run_app`].
+    ///
+    /// [`run_app`]: Self::run_app
+    #[inline]
+    #[deprecated = "use `EventLoop::run_app` instead"]
+    #[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)
+    }
+
     /// Run the application with the event loop on the calling thread.
     ///
     /// See the [`set_control_flow()`] docs on how to change the event loop's behavior.
@@ -207,38 +245,37 @@ impl EventLoop {
     ///
     ///   Web applications are recommended to use
     #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "  [`EventLoopExtWeb::spawn_app()`][crate::platform::web::EventLoopExtWeb::spawn_app()]"
+        web_platform,
+        doc = "[`EventLoopExtWebSys::spawn_app()`][crate::platform::web::EventLoopExtWebSys::spawn_app()]"
     )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "  `EventLoopExtWeb::spawn_app()`")]
-    ///   [^1] instead of [`run_app()`] 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.
+    #[cfg_attr(not(web_platform), doc = "`EventLoopExtWebSys::spawn()`")]
+    ///   [^1] instead of [`run_app()`] 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"`.
     ///
-    /// [^1]: `spawn_app()` is only available on the Web platform.
-    ///
     /// [`set_control_flow()`]: ActiveEventLoop::set_control_flow()
     /// [`run_app()`]: Self::run_app()
+    /// [^1]: `EventLoopExtWebSys::spawn_app()` is only available on Web.
     #[inline]
     #[cfg(not(all(web_platform, target_feature = "exception-handling")))]
-    pub fn run_app<A: ApplicationHandler>(self, app: A) -> Result<(), EventLoopError> {
-        self.event_loop.run_app(app)
+    pub fn run_app<A: ApplicationHandler<T>>(self, app: &mut A) -> Result<(), EventLoopError> {
+        self.event_loop.run(|event, event_loop| dispatch_event_for_app(app, event_loop, event))
     }
 
     /// 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 {
-        self.event_loop.window_target().create_proxy()
+    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 {
-        self.event_loop.window_target().owned_display_handle()
+        OwnedDisplayHandle { platform: self.event_loop.window_target().p.owned_display_handle() }
     }
 
     /// Change if or when [`DeviceEvent`]s are captured.
@@ -252,36 +289,56 @@ impl EventLoop {
             allowed = ?allowed
         )
         .entered();
-        self.event_loop.window_target().listen_device_events(allowed)
+
+        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().set_control_flow(control_flow);
+        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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **iOS / Android / Orbital:** Unsupported.
-    pub fn create_custom_cursor(
-        &self,
-        custom_cursor: CustomCursorSource,
-    ) -> Result<CustomCursor, ExternalError> {
-        self.event_loop.window_target().create_custom_cursor(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 rwh_06::HasDisplayHandle for EventLoop {
+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().rwh_06_handle())
+        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 AsFd for EventLoop {
+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_app_events`] API.
@@ -295,7 +352,7 @@ impl AsFd for EventLoop {
 }
 
 #[cfg(any(x11_platform, wayland_platform))]
-impl AsRawFd for EventLoop {
+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_app_events`] API.
@@ -308,42 +365,42 @@ impl AsRawFd for EventLoop {
     }
 }
 
-pub trait ActiveEventLoop {
-    /// Creates an [`EventLoopProxy`] that can be used to dispatch user events
-    /// to the main event loop, possibly from another thread.
-    fn create_proxy(&self) -> EventLoopProxy;
-
+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.
-    fn create_window(&self, window_attributes: WindowAttributes) -> Result<Window, OsError>;
+    /// - **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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **iOS / Android / Orbital:** Unsupported.
-    fn create_custom_cursor(
-        &self,
-        custom_cursor: CustomCursorSource,
-    ) -> Result<CustomCursor, ExternalError>;
+    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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Web:** Only returns the current monitor without
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "[detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "detailed monitor permissions.")]
-    fn available_monitors(&self) -> Box<dyn Iterator<Item = MonitorHandle>>;
+    #[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.
     ///
@@ -351,14 +408,13 @@ pub trait ActiveEventLoop {
     ///
     /// ## Platform-specific
     ///
-    /// - **Wayland:** Always returns `None`.
-    /// - **Web:** Always returns `None` without
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "  [detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "  detailed monitor permissions.")]
-    fn primary_monitor(&self) -> Option<MonitorHandle>;
+    /// **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.
     ///
@@ -371,46 +427,65 @@ pub trait ActiveEventLoop {
     /// - **Wayland / macOS / iOS / Android / Orbital:** Unsupported.
     ///
     /// [`DeviceEvent`]: crate::event::DeviceEvent
-    fn listen_device_events(&self, allowed: DeviceEvents);
+    pub fn listen_device_events(&self, allowed: DeviceEvents) {
+        let _span = tracing::debug_span!(
+            "winit::ActiveEventLoop::listen_device_events",
+            allowed = ?allowed
+        )
+        .entered();
 
-    /// Returns the current system theme.
-    ///
-    /// Returns `None` if it cannot be determined on the current platform.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **iOS / Android / Wayland / x11 / Orbital:** Unsupported.
-    fn system_theme(&self) -> Option<Theme>;
+        self.p.listen_device_events(allowed);
+    }
 
     /// Sets the [`ControlFlow`].
-    fn set_control_flow(&self, control_flow: ControlFlow);
+    pub fn set_control_flow(&self, control_flow: ControlFlow) {
+        self.p.set_control_flow(control_flow)
+    }
 
     /// Gets the current [`ControlFlow`].
-    fn control_flow(&self) -> ControlFlow;
+    pub fn control_flow(&self) -> ControlFlow {
+        self.p.control_flow()
+    }
 
     /// This exits the event loop.
     ///
-    /// See [`exiting`][crate::application::ApplicationHandler::exiting].
-    fn exit(&self);
+    /// 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].
-    fn exiting(&self) -> bool;
+    pub fn exiting(&self) -> bool {
+        self.p.exiting()
+    }
 
     /// Gets a persistent reference to the underlying platform display.
     ///
     /// See the [`OwnedDisplayHandle`] type for more information.
-    fn owned_display_handle(&self) -> OwnedDisplayHandle;
+    pub fn owned_display_handle(&self) -> OwnedDisplayHandle {
+        OwnedDisplayHandle { platform: self.p.owned_display_handle() }
+    }
+}
 
-    /// Get the [`ActiveEventLoop`] as [`Any`].
-    ///
-    /// This is useful for downcasting to a concrete event loop type.
-    fn as_any(&self) -> &dyn Any;
+#[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) })
+    }
+}
 
-    /// Get the raw-window-handle handle.
-    #[cfg(feature = "rwh_06")]
-    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle;
+#[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.
@@ -425,10 +500,10 @@ pub trait ActiveEventLoop {
 ///
 /// - A zero-sized type that is likely optimized out.
 /// - A reference-counted pointer to the underlying type.
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone)]
 pub struct OwnedDisplayHandle {
-    #[cfg_attr(not(feature = "rwh_06"), allow(dead_code))]
-    pub(crate) platform: platform_impl::OwnedDisplayHandle,
+    #[cfg_attr(not(any(feature = "rwh_05", feature = "rwh_06")), allow(dead_code))]
+    platform: platform_impl::OwnedDisplayHandle,
 }
 
 impl fmt::Debug for OwnedDisplayHandle {
@@ -451,42 +526,63 @@ impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
     }
 }
 
-/// Control the [`EventLoop`], possibly from a different thread, without referencing it directly.
-#[derive(Clone)]
-pub struct EventLoopProxy {
-    pub(crate) event_loop_proxy: platform_impl::EventLoopProxy,
-}
-
-impl EventLoopProxy {
-    /// Wake up the [`EventLoop`], resulting in [`ApplicationHandler::proxy_wake_up()`] being
-    /// called.
-    ///
-    /// Calls to this method are coalesced into a single call to [`proxy_wake_up`], see the
-    /// documentation on that for details.
-    ///
-    /// If the event loop is no longer running, this is a no-op.
-    ///
-    /// [`proxy_wake_up`]: ApplicationHandler::proxy_wake_up
-    ///
-    /// # Platform-specific
-    ///
-    /// - **Windows**: The wake-up may be ignored under high contention, see [#3687].
-    ///
-    /// [#3687]: https://github.com/rust-windowing/winit/pull/3687
-    pub fn wake_up(&self) {
-        self.event_loop_proxy.wake_up();
+#[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()
     }
 }
 
-impl fmt::Debug for EventLoopProxy {
+/// 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.debug_struct("ActiveEventLoop").finish_non_exhaustive()
+        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)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum DeviceEvents {
     /// Report device events regardless of window focus.
     Always,
@@ -506,7 +602,7 @@ pub enum DeviceEvents {
 /// 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, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct AsyncRequestSerial {
     serial: usize,
 }
@@ -522,3 +618,23 @@ impl AsyncRequestSerial {
         Self { serial }
     }
 }
+
+/// Shim for various run APIs.
+#[inline(always)]
+pub(crate) fn dispatch_event_for_app<T: 'static, A: ApplicationHandler<T>>(
+    app: &mut A,
+    event_loop: &ActiveEventLoop,
+    event: Event<T>,
+) {
+    match event {
+        Event::NewEvents(cause) => app.new_events(event_loop, cause),
+        Event::WindowEvent { window_id, event } => app.window_event(event_loop, window_id, event),
+        Event::DeviceEvent { device_id, event } => app.device_event(event_loop, device_id, event),
+        Event::UserEvent(event) => app.user_event(event_loop, event),
+        Event::Suspended => app.suspended(event_loop),
+        Event::Resumed => app.resumed(event_loop),
+        Event::AboutToWait => app.about_to_wait(event_loop),
+        Event::LoopExiting => app.exiting(event_loop),
+        Event::MemoryWarning => app.memory_warning(event_loop),
+    }
+}

src/icon.rs

@@ -1,8 +1,7 @@
+use crate::platform_impl::PlatformIcon;
 use std::error::Error;
 use std::{fmt, io, mem};
 
-use crate::platform_impl::PlatformIcon;
-
 #[repr(C)]
 #[derive(Debug)]
 pub(crate) struct Pixel {
@@ -50,15 +49,15 @@ impl fmt::Display for BadIcon {
 
 impl Error for BadIcon {}
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[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, Hash)]
+/// 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
@@ -94,7 +93,7 @@ mod constructors {
 }
 
 /// An icon used for the window titlebar, taskbar, etc.
-#[derive(Clone, Eq, Hash, PartialEq)]
+#[derive(Clone)]
 pub struct Icon {
     pub(crate) inner: PlatformIcon,
 }

src/keyboard.rs

@@ -84,7 +84,7 @@ pub use smol_str::SmolStr;
 /// haven't mapped for you yet, this lets you use use [`KeyCode`] to:
 ///
 /// - Correctly match key press and release events.
-/// - On non-Web platforms, support assigning keybinds to virtually any key through a UI.
+/// - On non-web platforms, support assigning keybinds to virtually any key through a UI.
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum NativeKeyCode {
@@ -1568,15 +1568,10 @@ impl NamedKey {
     /// # Examples
     ///
     /// ```
-    /// # #[cfg(web_platform)]
-    /// # wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-    /// # #[cfg_attr(web_platform, wasm_bindgen_test::wasm_bindgen_test)]
-    /// # fn main() {
     /// use winit::keyboard::NamedKey;
     ///
     /// assert_eq!(NamedKey::Enter.to_text(), Some("\r"));
     /// assert_eq!(NamedKey::F20.to_text(), None);
-    /// # }
     /// ```
     pub fn to_text(&self) -> Option<&str> {
         match self {
@@ -1596,16 +1591,11 @@ impl Key {
     /// # Examples
     ///
     /// ```
-    /// # #[cfg(web_platform)]
-    /// # wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-    /// # #[cfg_attr(web_platform, wasm_bindgen_test::wasm_bindgen_test)]
-    /// # fn main() {
     /// use winit::keyboard::{Key, NamedKey};
     ///
     /// assert_eq!(Key::Character("a".into()).to_text(), Some("a"));
     /// assert_eq!(Key::Named(NamedKey::Enter).to_text(), Some("\r"));
     /// assert_eq!(Key::Named(NamedKey::F20).to_text(), None);
-    /// # }
     /// ```
     pub fn to_text(&self) -> Option<&str> {
         match self {
@@ -1628,7 +1618,7 @@ impl Key {
 ///
 /// [`location`]: ../event/struct.KeyEvent.html#structfield.location
 /// [`KeyEvent`]: crate::event::KeyEvent
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum KeyLocation {
     /// The key is in its "normal" location on the keyboard.
@@ -1700,7 +1690,6 @@ bitflags! {
     ///
     /// Each flag represents a modifier and is set if this modifier is active.
     #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     pub struct ModifiersState: u32 {
         /// The "shift" key.
         const SHIFT = 0b100;
@@ -1736,8 +1725,7 @@ impl ModifiersState {
 }
 
 /// The state of the particular modifiers key.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ModifiersKeyState {
     /// The particular key is pressed.
     Pressed,
@@ -1756,7 +1744,6 @@ pub enum ModifiersKeyState {
 // on macOS due to their AltGr/Option situation.
 bitflags! {
     #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     pub(crate) struct ModifiersKeys: u8 {
         const LSHIFT   = 0b0000_0001;
         const RSHIFT   = 0b0000_0010;
@@ -1768,3 +1755,50 @@ bitflags! {
         const RSUPER   = 0b1000_0000;
     }
 }
+
+#[cfg(feature = "serde")]
+mod modifiers_serde {
+    use super::ModifiersState;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    #[derive(Default, Serialize, Deserialize)]
+    #[serde(default)]
+    #[serde(rename = "ModifiersState")]
+    pub struct ModifiersStateSerialize {
+        pub shift_key: bool,
+        pub control_key: bool,
+        pub alt_key: bool,
+        pub super_key: bool,
+    }
+
+    impl Serialize for ModifiersState {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            let s = ModifiersStateSerialize {
+                shift_key: self.shift_key(),
+                control_key: self.control_key(),
+                alt_key: self.alt_key(),
+                super_key: self.super_key(),
+            };
+            s.serialize(serializer)
+        }
+    }
+
+    impl<'de> Deserialize<'de> for ModifiersState {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            let ModifiersStateSerialize { shift_key, control_key, alt_key, super_key } =
+                ModifiersStateSerialize::deserialize(deserializer)?;
+            let mut m = ModifiersState::empty();
+            m.set(ModifiersState::SHIFT, shift_key);
+            m.set(ModifiersState::CONTROL, control_key);
+            m.set(ModifiersState::ALT, alt_key);
+            m.set(ModifiersState::SUPER, super_key);
+            Ok(m)
+        }
+    }
+}

src/lib.rs

@@ -19,14 +19,15 @@
 //! 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`].
+//! [`DeviceEvent`]. You can also create and handle your own custom [`Event::UserEvent`]s, if
+//! desired.
 //!
 //! You can retrieve events by calling [`EventLoop::run_app()`]. 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 [`exiting()`] is called.
+//! will run until [`exit()`] is used, at which point [`Event::LoopExiting`].
 //!
 //! 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
+//! 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),
@@ -52,11 +53,11 @@
 //! }
 //!
 //! impl ApplicationHandler for App {
-//!     fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
+//!     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
 //!         self.window = Some(event_loop.create_window(Window::default_attributes()).unwrap());
 //!     }
 //!
-//!     fn window_event(&mut self, event_loop: &dyn ActiveEventLoop, id: WindowId, event: WindowEvent) {
+//!     fn window_event(&mut self, event_loop: &ActiveEventLoop, id: WindowId, event: WindowEvent) {
 //!         match event {
 //!             WindowEvent::CloseRequested => {
 //!                 println!("The close button was pressed; stopping");
@@ -140,6 +141,8 @@
 //!
 //! * `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.
@@ -160,7 +163,7 @@
 //! [`WindowEvent`]: event::WindowEvent
 //! [`DeviceEvent`]: event::DeviceEvent
 //! [`Event::UserEvent`]: event::Event::UserEvent
-//! [`exiting()`]: crate::application::ApplicationHandler::exiting
+//! [`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_app_events()` is only available on Windows, macOS, Android, X11 and Wayland.
@@ -175,11 +178,16 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg_hide), doc(cfg_hide(doc, docsrs)))]
 #![allow(clippy::missing_safety_doc)]
 
+#[cfg(feature = "rwh_04")]
+pub use rwh_04 as raw_window_handle_04;
+#[cfg(feature = "rwh_05")]
+pub use rwh_05 as raw_window_handle_05;
+#[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;
-#[cfg(feature = "rwh_06")]
-pub use rwh_06 as raw_window_handle;
 
 pub mod application;
 #[cfg(any(doc, doctest, test))]

src/monitor.rs

@@ -5,11 +5,13 @@
 //! 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 std::num::{NonZeroU16, NonZeroU32};
-
 use crate::dpi::{PhysicalPosition, PhysicalSize};
 use crate::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`].
@@ -46,10 +48,7 @@ impl Ord for VideoModeHandle {
 }
 
 impl VideoModeHandle {
-    /// Returns the resolution of this video mode. This **must not** be used to create your
-    /// rendering surface. Use [`Window::inner_size()`] instead.
-    ///
-    /// [`Window::inner_size()`]: crate::window::Window::inner_size
+    /// Returns the resolution of this video mode.
     #[inline]
     pub fn size(&self) -> PhysicalSize<u32> {
         self.video_mode.size()
@@ -58,14 +57,19 @@ impl VideoModeHandle {
     /// 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) -> Option<NonZeroU16> {
+    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) -> Option<NonZeroU32> {
+    pub fn refresh_rate_millihertz(&self) -> u32 {
         self.video_mode.refresh_rate_millihertz()
     }
 
@@ -81,11 +85,11 @@ impl std::fmt::Display for VideoModeHandle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "{}x{} {}{}",
+            "{}x{} @ {} mHz ({} bpp)",
             self.size().width,
             self.size().height,
-            self.refresh_rate_millihertz().map(|rate| format!("@ {rate} mHz ")).unwrap_or_default(),
-            self.bit_depth().map(|bit_depth| format!("({bit_depth} bpp)")).unwrap_or_default(),
+            self.refresh_rate_millihertz(),
+            self.bit_depth()
         )
     }
 }
@@ -94,69 +98,46 @@ impl std::fmt::Display for VideoModeHandle {
 ///
 /// Allows you to retrieve information about a given monitor and can be used in [`Window`] creation.
 ///
-/// ## Platform-specific
-///
-/// **Web:** A [`MonitorHandle`] created without
-#[cfg_attr(
-    any(web_platform, docsrs),
-    doc = "[detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-)]
-#[cfg_attr(not(any(web_platform, docsrs)), doc = "detailed monitor permissions.")]
-/// will always represent the current monitor the browser window is in instead of a specific
-/// monitor. See
-#[cfg_attr(
-    any(web_platform, docsrs),
-    doc = "[`MonitorHandleExtWeb::is_detailed()`][crate::platform::web::MonitorHandleExtWeb::is_detailed]"
-)]
-#[cfg_attr(not(any(web_platform, docsrs)), doc = "`MonitorHandleExtWeb::is_detailed()`")]
-/// to check.
-///
 /// [`Window`]: crate::window::Window
-#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct MonitorHandle {
     pub(crate) inner: platform_impl::MonitorHandle,
 }
 
-impl std::fmt::Debug for MonitorHandle {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.inner.fmt(f)
-    }
-}
-
 impl MonitorHandle {
     /// Returns a human-readable name of the monitor.
     ///
     /// Returns `None` if the monitor doesn't exist anymore.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Web:** Always returns [`None`] without
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "[detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "detailed monitor permissions.")]
     #[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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Web:** Always returns [`None`] without
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "[detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "detailed monitor permissions.")]
     #[inline]
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
+    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`].
     ///
@@ -167,27 +148,18 @@ impl MonitorHandle {
     /// - **X11:** Can be overridden using the `WINIT_X11_SCALE_FACTOR` environment variable.
     /// - **Wayland:** May differ from [`Window::scale_factor`].
     /// - **Android:** Always returns 1.0.
-    /// - **Web:** Always returns `0.0` without
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "  [detailed monitor permissions][crate::platform::web::ActiveEventLoopExtWeb::request_detailed_monitor_permission]."
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "  detailed monitor permissions.")]
     ///
-    #[rustfmt::skip]
     /// [`Window::scale_factor`]: crate::window::Window::scale_factor
     #[inline]
     pub fn scale_factor(&self) -> f64 {
         self.inner.scale_factor()
     }
 
-    /// Returns the currently active video mode of this monitor.
-    #[inline]
-    pub fn current_video_mode(&self) -> Option<VideoModeHandle> {
-        self.inner.current_video_mode().map(|video_mode| VideoModeHandle { video_mode })
-    }
-
     /// 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/platform/android.rs

@@ -62,7 +62,7 @@
 //! 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.30.4",
+//! 2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.30.1",
 //!    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
@@ -70,27 +70,18 @@
 //! 4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your
 //!    event loop (as shown above).
 
-use self::activity::{AndroidApp, ConfigurationRef, Rect};
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::window::{Window, WindowAttributes};
 
-/// Additional methods on [`EventLoop`] that are specific to Android.
-pub trait EventLoopExtAndroid {
-    /// Get the [`AndroidApp`] which was used to create this event loop.
-    fn android_app(&self) -> &AndroidApp;
-}
+use self::activity::{AndroidApp, ConfigurationRef, Rect};
 
-impl EventLoopExtAndroid for EventLoop {
-    fn android_app(&self) -> &AndroidApp {
-        &self.event_loop.android_app
-    }
-}
+/// 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 {
-    /// Get the [`AndroidApp`] which was used to create this event loop.
-    fn android_app(&self) -> &AndroidApp;
-}
+pub trait ActiveEventLoopExtAndroid {}
 
 /// Additional methods on [`Window`] that are specific to Android.
 pub trait WindowExtAndroid {
@@ -109,13 +100,7 @@ impl WindowExtAndroid for Window {
     }
 }
 
-impl ActiveEventLoopExtAndroid for &dyn ActiveEventLoop {
-    fn android_app(&self) -> &AndroidApp {
-        let event_loop =
-            self.as_any().downcast_ref::<crate::platform_impl::ActiveEventLoop>().unwrap();
-        &event_loop.app
-    }
-}
+impl ActiveEventLoopExtAndroid for ActiveEventLoop {}
 
 /// Additional methods on [`WindowAttributes`] that are specific to Android.
 pub trait WindowAttributesExtAndroid {}
@@ -123,9 +108,9 @@ pub trait WindowAttributesExtAndroid {}
 impl WindowAttributesExtAndroid for WindowAttributes {}
 
 pub trait EventLoopBuilderExtAndroid {
-    /// Associates the [`AndroidApp`] that was passed to `android_main()` with the event loop
+    /// 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.
+    /// 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
@@ -134,7 +119,7 @@ pub trait EventLoopBuilderExtAndroid {
     fn handle_volume_keys(&mut self) -> &mut Self;
 }
 
-impl EventLoopBuilderExtAndroid for EventLoopBuilder {
+impl<T> EventLoopBuilderExtAndroid for EventLoopBuilder<T> {
     fn with_android_app(&mut self, app: AndroidApp) -> &mut Self {
         self.platform_specific.android_app = Some(app);
         self
@@ -162,7 +147,7 @@ impl EventLoopBuilderExtAndroid for EventLoopBuilder {
 /// 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
+/// For compatibility applications should then import the `AndroidApp` type for
 /// their `android_main(app: AndroidApp)` function like:
 /// ```rust
 /// #[cfg(target_os = "android")]

src/platform/ios.rs

@@ -66,12 +66,22 @@
 
 use std::os::raw::c_void;
 
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
+use crate::event_loop::EventLoop;
 use crate::monitor::{MonitorHandle, VideoModeHandle};
 use crate::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`.
@@ -358,7 +368,6 @@ impl MonitorHandleExtIOS for MonitorHandle {
 
 /// Valid orientations for a particular [`Window`].
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ValidOrientations {
     /// Excludes `PortraitUpsideDown` on iphone
     #[default]
@@ -370,12 +379,29 @@ pub enum ValidOrientations {
     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)]
-    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     pub struct ScreenEdge: u8 {
         const NONE   = 0;
         const TOP    = 1 << 0;
@@ -387,8 +413,7 @@ bitflags::bitflags! {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub enum StatusBarStyle {
     #[default]
     Default,

src/platform/macos.rs

@@ -170,7 +170,6 @@ impl WindowExtMacOS for Window {
 
 /// Corresponds to `NSApplicationActivationPolicy`.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ActivationPolicy {
     /// Corresponds to `NSApplicationActivationPolicyRegular`.
     #[default]
@@ -339,7 +338,7 @@ pub trait EventLoopBuilderExtMacOS {
     fn with_activate_ignoring_other_apps(&mut self, ignore: bool) -> &mut Self;
 }
 
-impl EventLoopBuilderExtMacOS for EventLoopBuilder {
+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;
@@ -396,44 +395,28 @@ pub trait ActiveEventLoopExtMacOS {
     fn allows_automatic_window_tabbing(&self) -> bool;
 }
 
-impl ActiveEventLoopExtMacOS for &dyn ActiveEventLoop {
+impl ActiveEventLoopExtMacOS for ActiveEventLoop {
     fn hide_application(&self) {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non macOS event loop on macOS");
-        event_loop.hide_application()
+        self.p.hide_application()
     }
 
     fn hide_other_applications(&self) {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non macOS event loop on macOS");
-        event_loop.hide_other_applications()
+        self.p.hide_other_applications()
     }
 
     fn set_allows_automatic_window_tabbing(&self, enabled: bool) {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non macOS event loop on macOS");
-        event_loop.set_allows_automatic_window_tabbing(enabled);
+        self.p.set_allows_automatic_window_tabbing(enabled);
     }
 
     fn allows_automatic_window_tabbing(&self) -> bool {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non macOS event loop on macOS");
-        event_loop.allows_automatic_window_tabbing()
+        self.p.allows_automatic_window_tabbing()
     }
 }
 
 /// Option as alt behavior.
 ///
 /// The default is `None`.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[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`.

src/platform/pump_events.rs

@@ -1,10 +1,14 @@
 use std::time::Duration;
 
 use crate::application::ApplicationHandler;
-use crate::event_loop::EventLoop;
+use crate::event::Event;
+use crate::event_loop::{self, ActiveEventLoop, EventLoop};
 
 /// 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: 'static;
+
     /// Pump the `EventLoop` to check for and dispatch pending events.
     ///
     /// This API is designed to enable applications to integrate Winit into an
@@ -48,18 +52,18 @@ pub trait EventLoopExtPumpEvents {
     /// - `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.
+    /// 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.
+    /// 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.
+    /// 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
     ///
@@ -70,13 +74,13 @@ pub trait EventLoopExtPumpEvents {
     ///
     /// ## 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.
+    /// - **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.
+    /// there's no way to support the same approach to polling as on MacOS.
     ///
     /// ## Platform-specific
     ///
@@ -99,25 +103,38 @@ pub trait EventLoopExtPumpEvents {
     ///   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_app_events<A: ApplicationHandler>(
+    fn pump_app_events<A: ApplicationHandler<Self::UserEvent>>(
         &mut self,
         timeout: Option<Duration>,
-        app: A,
-    ) -> PumpStatus;
+        app: &mut A,
+    ) -> PumpStatus {
+        #[allow(deprecated)]
+        self.pump_events(timeout, |event, event_loop| {
+            event_loop::dispatch_event_for_app(app, event_loop, event)
+        })
+    }
+
+    /// See [`pump_app_events`].
+    ///
+    /// [`pump_app_events`]: Self::pump_app_events
+    #[deprecated = "use EventLoopExtPumpEvents::pump_app_events"]
+    fn pump_events<F>(&mut self, timeout: Option<Duration>, event_handler: F) -> PumpStatus
+    where
+        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop);
 }
 
-impl EventLoopExtPumpEvents for EventLoop {
-    fn pump_app_events<A: ApplicationHandler>(
-        &mut self,
-        timeout: Option<Duration>,
-        app: A,
-    ) -> PumpStatus {
-        self.event_loop.pump_app_events(timeout, app)
+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)
     }
 }
 
 /// The return status for `pump_events`
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub enum PumpStatus {
     /// Continue running external loop.
     Continue,

src/platform/run_on_demand.rs

@@ -1,13 +1,24 @@
 use crate::application::ApplicationHandler;
 use crate::error::EventLoopError;
-use crate::event_loop::EventLoop;
+use crate::event::Event;
+use crate::event_loop::{self, ActiveEventLoop, EventLoop};
+
 #[cfg(doc)]
-use crate::{
-    event_loop::ActiveEventLoop, platform::pump_events::EventLoopExtPumpEvents, window::Window,
-};
+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: 'static;
+
+    /// See [`run_app_on_demand`].
+    ///
+    /// [`run_app_on_demand`]: Self::run_app_on_demand
+    #[deprecated = "use EventLoopExtRunOnDemand::run_app_on_demand"]
+    fn run_on_demand<F>(&mut self, event_handler: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(Event<Self::UserEvent>, &ActiveEventLoop);
+
     /// Run the application with the event loop on the calling thread.
     ///
     /// Unlike [`EventLoop::run_app`], this function accepts non-`'static` (i.e. non-`move`)
@@ -31,13 +42,7 @@ pub trait EventLoopExtRunOnDemand {
     /// # 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
-    #[cfg_attr(
-        any(web_platform, docsrs),
-        doc = "  [`EventLoopExtWeb::spawn_app()`][crate::platform::web::EventLoopExtWeb::spawn_app()]"
-    )]
-    #[cfg_attr(not(any(web_platform, docsrs)), doc = "  `EventLoopExtWeb::spawn_app()`")]
-    ///   [^1] more than once instead).
+    ///   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_app()`] for portability, unless you
@@ -55,17 +60,38 @@ pub trait EventLoopExtRunOnDemand {
     ///   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.
-    ///
-    /// [^1]: `spawn_app()` is only available on the Web platforms.
+    #[cfg_attr(not(web_platform), doc = "[^1]: `spawn()` is only available on `wasm` platforms.")]
+    #[rustfmt::skip]
     ///
     /// [`exit()`]: ActiveEventLoop::exit()
     /// [`set_control_flow()`]: ActiveEventLoop::set_control_flow()
-    fn run_app_on_demand<A: ApplicationHandler>(&mut self, app: A) -> Result<(), EventLoopError>;
+    fn run_app_on_demand<A: ApplicationHandler<Self::UserEvent>>(
+        &mut self,
+        app: &mut A,
+    ) -> Result<(), EventLoopError> {
+        #[allow(deprecated)]
+        self.run_on_demand(|event, event_loop| {
+            event_loop::dispatch_event_for_app(app, event_loop, event)
+        })
+    }
 }
 
-impl EventLoopExtRunOnDemand for EventLoop {
-    fn run_app_on_demand<A: ApplicationHandler>(&mut self, app: A) -> Result<(), EventLoopError> {
-        self.event_loop.run_app_on_demand(app)
+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()
     }
 }
 

src/platform/startup_notify.rs

@@ -25,8 +25,6 @@ use std::env;
 
 use crate::error::NotSupportedError;
 use crate::event_loop::{ActiveEventLoop, AsyncRequestSerial};
-#[cfg(wayland_platform)]
-use crate::platform::wayland::ActiveEventLoopExtWayland;
 use crate::window::{ActivationToken, Window, WindowAttributes};
 
 /// The variable which is used mostly on X11.
@@ -57,18 +55,16 @@ pub trait WindowAttributesExtStartupNotify {
     fn with_activation_token(self, token: ActivationToken) -> Self;
 }
 
-impl EventLoopExtStartupNotify for &dyn ActiveEventLoop {
+impl EventLoopExtStartupNotify for ActiveEventLoop {
     fn read_token_from_env(&self) -> Option<ActivationToken> {
-        #[cfg(x11_platform)]
-        let _is_wayland = false;
-        #[cfg(wayland_platform)]
-        let _is_wayland = self.is_wayland();
-
-        if _is_wayland {
-            env::var(WAYLAND_VAR).ok().map(ActivationToken::_new)
-        } else {
-            env::var(X11_VAR).ok().map(ActivationToken::_new)
+        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)
     }
 }
 

src/platform/wayland.rs

@@ -13,26 +13,22 @@
 //! * `wayland-csd-adwaita` (default).
 //! * `wayland-csd-adwaita-crossfont`.
 //! * `wayland-csd-adwaita-notitle`.
-use crate::application::ApplicationHandler;
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::monitor::MonitorHandle;
-pub use crate::window::Theme;
 use crate::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;
 }
 
-pub trait WaylandApplicationHandler: ApplicationHandler + 'static {
-    fn wayland_callback(&mut self);
-}
-
-impl ActiveEventLoopExtWayland for &dyn ActiveEventLoop {
+impl ActiveEventLoopExtWayland for ActiveEventLoop {
     #[inline]
     fn is_wayland(&self) -> bool {
-        self.as_any().downcast_ref::<crate::platform_impl::wayland::ActiveEventLoop>().is_some()
+        self.p.is_wayland()
     }
 }
 
@@ -40,31 +36,13 @@ impl ActiveEventLoopExtWayland for &dyn ActiveEventLoop {
 pub trait EventLoopExtWayland {
     /// True if the [`EventLoop`] uses Wayland.
     fn is_wayland(&self) -> bool;
-
-    fn register_wayland_callback<T: WaylandApplicationHandler>(&mut self);
 }
 
-impl EventLoopExtWayland for EventLoop {
+impl<T: 'static> EventLoopExtWayland for EventLoop<T> {
     #[inline]
     fn is_wayland(&self) -> bool {
         self.event_loop.is_wayland()
     }
-
-    fn register_wayland_callback<T: WaylandApplicationHandler>(&mut self) {
-        let event_loop = match &self.event_loop {
-            crate::platform_impl::EventLoop::Wayland(event_loop) => &event_loop.active_event_loop,
-            #[cfg(x11_platform)]
-            crate::platform_impl::EventLoop::X(_) => return,
-        };
-
-        event_loop.wayland_callback.set(Some(|app: &mut dyn ApplicationHandler| {
-            app.as_any()
-                .expect("as_any_mut is not implemented")
-                .downcast_mut::<T>()
-                .unwrap()
-                .wayland_callback()
-        }));
-    }
 }
 
 /// Additional methods on [`EventLoopBuilder`] that are specific to Wayland.
@@ -79,7 +57,7 @@ pub trait EventLoopBuilderExtWayland {
     fn with_any_thread(&mut self, any_thread: bool) -> &mut Self;
 }
 
-impl EventLoopBuilderExtWayland for EventLoopBuilder {
+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);

src/platform/web.rs

@@ -1,23 +1,24 @@
 //! # Web
 //!
-//! Winit supports running in Browsers by compiling to WebAssembly with
-//! [`wasm-bindgen`][wasm_bindgen]. For information on using Rust on WebAssembly, check out the
-//! [Rust and WebAssembly book].
+//! The officially supported browsers are Chrome, Firefox and Safari 13.1+,
+//! though forks of these should work fine.
 //!
-//! 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 [`HTMLCanvasElement`][canvas]. Winit will
-//! create that canvas for you or you can [provide your own][with_canvas]. Then you can either let
-//! Winit [insert it into the DOM for you][insert], or [retrieve the canvas][get] and insert it
-//! yourself.
+//! 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.
 //!
-//! [canvas]: https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement
-//! [with_canvas]: WindowAttributesExtWeb::with_canvas
-//! [get]: WindowExtWeb::canvas
-//! [insert]: WindowAttributesExtWeb::with_append
-#![cfg_attr(not(web_platform), doc = "[wasm_bindgen]: https://docs.rs/wasm-bindgen")]
-//! [Rust and WebAssembly book]: https://rustwasm.github.io/book
+//! 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
 //!
@@ -42,7 +43,6 @@
 //! [`WindowEvent::Touch`]: crate::event::WindowEvent::Touch
 //! [`Window::set_outer_position()`]: crate::window::Window::set_outer_position
 
-use std::cell::Ref;
 use std::error::Error;
 use std::fmt::{self, Display, Formatter};
 use std::future::Future;
@@ -50,35 +50,26 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Duration;
 
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 #[cfg(web_platform)]
 use web_sys::HtmlCanvasElement;
 
 use crate::application::ApplicationHandler;
 use crate::cursor::CustomCursorSource;
-use crate::error::NotSupportedError;
-use crate::event::FingerId;
-use crate::event_loop::{ActiveEventLoop, EventLoop};
-use crate::monitor::MonitorHandle;
-use crate::platform_impl::PlatformCustomCursorSource;
+use crate::event::Event;
+use crate::event_loop::{self, ActiveEventLoop, EventLoop};
 #[cfg(web_platform)]
-use crate::platform_impl::{
-    CustomCursorFuture as PlatformCustomCursorFuture,
-    HasMonitorPermissionFuture as PlatformHasMonitorPermissionFuture,
-    MonitorPermissionFuture as PlatformMonitorPermissionFuture,
-    OrientationLockFuture as PlatformOrientationLockFuture,
-};
+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 WindowExtWeb {
+pub trait WindowExtWebSys {
     /// Only returns the canvas if called from inside the window context (the
     /// main thread).
-    fn canvas(&self) -> Option<Ref<'_, HtmlCanvasElement>>;
+    fn canvas(&self) -> Option<HtmlCanvasElement>;
 
     /// Returns [`true`] if calling `event.preventDefault()` is enabled.
     ///
@@ -94,19 +85,11 @@ pub trait WindowExtWeb {
     /// 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);
-
-    /// Returns whether using [`CursorGrabMode::Locked`] returns raw, un-accelerated mouse input.
-    ///
-    /// This is the same as [`ActiveEventLoopExtWeb::is_cursor_lock_raw()`], and is provided for
-    /// convenience.
-    ///
-    /// [`CursorGrabMode::Locked`]: crate::window::CursorGrabMode::Locked
-    fn is_cursor_lock_raw(&self) -> bool;
 }
 
-impl WindowExtWeb for Window {
+impl WindowExtWebSys for Window {
     #[inline]
-    fn canvas(&self) -> Option<Ref<'_, HtmlCanvasElement>> {
+    fn canvas(&self) -> Option<HtmlCanvasElement> {
         self.window.canvas()
     }
 
@@ -117,17 +100,13 @@ impl WindowExtWeb for Window {
     fn set_prevent_default(&self, prevent_default: bool) {
         self.window.set_prevent_default(prevent_default)
     }
-
-    fn is_cursor_lock_raw(&self) -> bool {
-        self.window.is_cursor_lock_raw()
-    }
 }
 
-pub trait WindowAttributesExtWeb {
+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.
+    /// 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")]
@@ -147,13 +126,13 @@ pub trait WindowAttributesExtWeb {
     /// 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.
+    /// 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 WindowAttributesExtWeb for WindowAttributes {
+impl WindowAttributesExtWebSys for WindowAttributes {
     fn with_canvas(mut self, canvas: Option<HtmlCanvasElement>) -> Self {
         self.platform_specific.set_canvas(canvas);
         self
@@ -175,8 +154,11 @@ impl WindowAttributesExtWeb for WindowAttributes {
     }
 }
 
-/// Additional methods on `EventLoop` that are specific to the Web.
-pub trait EventLoopExtWeb {
+/// 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: 'static;
+
     /// Initializes the winit event loop.
     ///
     /// Unlike
@@ -198,9 +180,36 @@ pub trait EventLoopExtWeb {
         not(all(web_platform, target_feature = "exception-handling")),
         doc = "[`run_app()`]: EventLoop::run_app()"
     )]
-    /// [^1]: `run_app()` is _not_ available on Wasm when the target supports `exception-handling`.
-    fn spawn_app<A: ApplicationHandler + 'static>(self, app: A);
+    /// [^1]: `run_app()` is _not_ available on WASM when the target supports `exception-handling`.
+    fn spawn_app<A: ApplicationHandler<Self::UserEvent> + 'static>(self, app: A);
 
+    /// See [`spawn_app`].
+    ///
+    /// [`spawn_app`]: Self::spawn_app
+    #[deprecated = "use EventLoopExtWebSys::spawn_app"]
+    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_app<A: ApplicationHandler<Self::UserEvent> + 'static>(self, mut app: A) {
+        self.event_loop.spawn(move |event, event_loop| {
+            event_loop::dispatch_event_for_app(&mut app, event_loop, event)
+        });
+    }
+
+    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`].
@@ -215,224 +224,30 @@ pub trait EventLoopExtWeb {
     /// [`ControlFlow::Poll`]: crate::event_loop::ControlFlow::Poll
     fn poll_strategy(&self) -> PollStrategy;
 
-    /// Sets the strategy for [`ControlFlow::WaitUntil`].
-    ///
-    /// See [`WaitUntilStrategy`].
-    ///
-    /// [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
-    fn set_wait_until_strategy(&self, strategy: WaitUntilStrategy);
-
-    /// Gets the strategy for [`ControlFlow::WaitUntil`].
-    ///
-    /// See [`WaitUntilStrategy`].
-    ///
-    /// [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
-    fn wait_until_strategy(&self) -> WaitUntilStrategy;
-
-    /// Returns if the users device has multiple screens. Useful to check before prompting the user
-    /// with [`EventLoopExtWeb::request_detailed_monitor_permission()`].
-    ///
-    /// Browsers might always return [`false`] to reduce fingerprinting.
-    fn has_multiple_screens(&self) -> Result<bool, NotSupportedError>;
-
-    /// Prompts the user for permission to query detailed information about available monitors. The
-    /// returned [`MonitorPermissionFuture`] can be dropped without aborting the request.
-    ///
-    /// Check [`EventLoopExtWeb::has_multiple_screens()`] before unnecessarily prompting the user
-    /// for such permissions.
-    ///
-    /// [`MonitorHandle`]s don't automatically make use of this after permission is granted. New
-    /// [`MonitorHandle`]s have to be created instead.
-    fn request_detailed_monitor_permission(&self) -> MonitorPermissionFuture;
-
-    /// Returns whether the user has given permission to access detailed monitor information.
-    ///
-    /// [`MonitorHandle`]s don't automatically make use of detailed monitor information after
-    /// permission is granted. New [`MonitorHandle`]s have to be created instead.
-    fn has_detailed_monitor_permission(&self) -> HasMonitorPermissionFuture;
-}
-
-impl EventLoopExtWeb for EventLoop {
-    fn spawn_app<A: ApplicationHandler + 'static>(self, app: A) {
-        self.event_loop.spawn_app(app);
-    }
-
-    fn set_poll_strategy(&self, strategy: PollStrategy) {
-        self.event_loop.set_poll_strategy(strategy);
-    }
-
-    fn poll_strategy(&self) -> PollStrategy {
-        self.event_loop.poll_strategy()
-    }
-
-    fn set_wait_until_strategy(&self, strategy: WaitUntilStrategy) {
-        self.event_loop.set_wait_until_strategy(strategy);
-    }
-
-    fn wait_until_strategy(&self) -> WaitUntilStrategy {
-        self.event_loop.wait_until_strategy()
-    }
-
-    fn has_multiple_screens(&self) -> Result<bool, NotSupportedError> {
-        self.event_loop.has_multiple_screens()
-    }
-
-    fn request_detailed_monitor_permission(&self) -> MonitorPermissionFuture {
-        MonitorPermissionFuture(self.event_loop.request_detailed_monitor_permission())
-    }
-
-    fn has_detailed_monitor_permission(&self) -> HasMonitorPermissionFuture {
-        HasMonitorPermissionFuture(self.event_loop.has_detailed_monitor_permission())
-    }
-}
-
-pub trait ActiveEventLoopExtWeb {
-    /// 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;
-
-    /// Sets the strategy for [`ControlFlow::WaitUntil`].
-    ///
-    /// See [`WaitUntilStrategy`].
-    ///
-    /// [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
-    fn set_wait_until_strategy(&self, strategy: WaitUntilStrategy);
-
-    /// Gets the strategy for [`ControlFlow::WaitUntil`].
-    ///
-    /// See [`WaitUntilStrategy`].
-    ///
-    /// [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
-    fn wait_until_strategy(&self) -> WaitUntilStrategy;
-
     /// 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;
-
-    /// Returns whether using [`CursorGrabMode::Locked`] returns raw, un-accelerated mouse input.
-    ///
-    /// [`CursorGrabMode::Locked`]: crate::window::CursorGrabMode::Locked
-    fn is_cursor_lock_raw(&self) -> bool;
-
-    /// Returns if the users device has multiple screens. Useful to check before prompting the user
-    /// with [`EventLoopExtWeb::request_detailed_monitor_permission()`].
-    ///
-    /// Browsers might always return [`false`] to reduce fingerprinting.
-    fn has_multiple_screens(&self) -> Result<bool, NotSupportedError>;
-
-    /// Prompts the user for permission to query detailed information about available monitors. The
-    /// returned [`MonitorPermissionFuture`] can be dropped without aborting the request.
-    ///
-    /// Check [`EventLoopExtWeb::has_multiple_screens()`] before unnecessarily prompting the user
-    /// for such permissions.
-    ///
-    /// [`MonitorHandle`]s don't automatically make use of this after permission is granted. New
-    /// [`MonitorHandle`]s have to be created instead.
-    fn request_detailed_monitor_permission(&self) -> MonitorPermissionFuture;
-
-    /// Returns whether the user has given permission to access detailed monitor information.
-    ///
-    /// [`MonitorHandle`]s don't automatically make use of detailed monitor information after
-    /// permission is granted. New [`MonitorHandle`]s have to be created instead.
-    fn has_detailed_monitor_permission(&self) -> bool;
 }
 
-impl ActiveEventLoopExtWeb for &dyn ActiveEventLoop {
+impl ActiveEventLoopExtWebSys for ActiveEventLoop {
     #[inline]
     fn create_custom_cursor_async(&self, source: CustomCursorSource) -> CustomCursorFuture {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.create_custom_cursor_async(source)
+        self.p.create_custom_cursor_async(source)
     }
 
     #[inline]
     fn set_poll_strategy(&self, strategy: PollStrategy) {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.set_poll_strategy(strategy);
+        self.p.set_poll_strategy(strategy);
     }
 
     #[inline]
     fn poll_strategy(&self) -> PollStrategy {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.poll_strategy()
-    }
-
-    #[inline]
-    fn set_wait_until_strategy(&self, strategy: WaitUntilStrategy) {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.set_wait_until_strategy(strategy);
-    }
-
-    #[inline]
-    fn wait_until_strategy(&self) -> WaitUntilStrategy {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.wait_until_strategy()
-    }
-
-    #[inline]
-    fn is_cursor_lock_raw(&self) -> bool {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.is_cursor_lock_raw()
-    }
-
-    #[inline]
-    fn has_multiple_screens(&self) -> Result<bool, NotSupportedError> {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.has_multiple_screens()
-    }
-
-    #[inline]
-    fn request_detailed_monitor_permission(&self) -> MonitorPermissionFuture {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        MonitorPermissionFuture(event_loop.request_detailed_monitor_permission())
-    }
-
-    #[inline]
-    fn has_detailed_monitor_permission(&self) -> bool {
-        let event_loop = self
-            .as_any()
-            .downcast_ref::<crate::platform_impl::ActiveEventLoop>()
-            .expect("non Web event loop on Web");
-        event_loop.has_detailed_monitor_permission()
+        self.p.poll_strategy()
     }
 }
 
 /// Strategy used for [`ControlFlow::Poll`][crate::event_loop::ControlFlow::Poll].
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[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()`].
@@ -457,31 +272,7 @@ pub enum PollStrategy {
     Scheduler,
 }
 
-/// Strategy used for [`ControlFlow::WaitUntil`][crate::event_loop::ControlFlow::WaitUntil].
-#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum WaitUntilStrategy {
-    /// Uses the [Prioritized Task Scheduling API] to queue the next event loop. If not available
-    /// this will fallback to [`setTimeout()`].
-    ///
-    /// This strategy is commonly not affected by browser throttling unless the window is not
-    /// focused.
-    ///
-    /// 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,
-    /// Equal to [`Scheduler`][Self::Scheduler] but wakes up the event loop from a [worker].
-    ///
-    /// This strategy is commonly not affected by browser throttling regardless of window focus.
-    ///
-    /// [worker]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API
-    Worker,
-}
-
-pub trait CustomCursorExtWeb {
+pub trait CustomCursorExtWebSys {
     /// Returns if this cursor is an animation.
     fn is_animation(&self) -> bool;
 
@@ -500,7 +291,7 @@ pub trait CustomCursorExtWeb {
     ) -> Result<CustomCursorSource, BadAnimation>;
 }
 
-impl CustomCursorExtWeb for CustomCursor {
+impl CustomCursorExtWebSys for CustomCursor {
     fn is_animation(&self) -> bool {
         self.inner.animation
     }
@@ -528,8 +319,7 @@ impl CustomCursorExtWeb for CustomCursor {
 }
 
 /// An error produced when using [`CustomCursor::from_animation`] with invalid arguments.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone)]
 pub enum BadAnimation {
     /// Produced when no cursors were supplied.
     Empty,
@@ -541,7 +331,7 @@ 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 animation"),
+            Self::Animation => write!(f, "A supplied cursor is an animtion"),
         }
     }
 }
@@ -562,11 +352,11 @@ impl Future for CustomCursorFuture {
     }
 }
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Clone, Debug)]
 pub enum CustomCursorError {
     Blob,
     Decode(String),
+    Animation,
 }
 
 impl Display for CustomCursorError {
@@ -574,212 +364,9 @@ impl Display for CustomCursorError {
         match self {
             Self::Blob => write!(f, "failed to create `Blob`"),
             Self::Decode(error) => write!(f, "failed to decode image: {error}"),
-        }
-    }
-}
-
-impl Error for CustomCursorError {}
-
-#[cfg(not(web_platform))]
-struct PlatformMonitorPermissionFuture;
-
-/// Can be dropped without aborting the request for detailed monitor permissions.
-#[derive(Debug)]
-pub struct MonitorPermissionFuture(pub(crate) PlatformMonitorPermissionFuture);
-
-impl Future for MonitorPermissionFuture {
-    type Output = Result<(), MonitorPermissionError>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.0).poll(cx)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum MonitorPermissionError {
-    /// User has explicitly denied permission to query detailed monitor information.
-    Denied,
-    /// User has not decided to give permission to query detailed monitor information.
-    Prompt,
-    /// Browser does not support detailed monitor information.
-    Unsupported,
-}
-
-impl Display for MonitorPermissionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            MonitorPermissionError::Denied => write!(
-                f,
-                "User has explicitly denied permission to query detailed monitor information"
-            ),
-            MonitorPermissionError::Prompt => write!(
-                f,
-                "User has not decided to give permission to query detailed monitor information"
-            ),
-            MonitorPermissionError::Unsupported => {
-                write!(f, "Browser does not support detailed monitor information")
+            Self::Animation => {
+                write!(f, "found `CustomCursor` that is an animation when building an animation")
             },
         }
     }
 }
-
-impl Error for MonitorPermissionError {}
-
-#[cfg(not(web_platform))]
-struct PlatformHasMonitorPermissionFuture;
-
-#[derive(Debug)]
-pub struct HasMonitorPermissionFuture(PlatformHasMonitorPermissionFuture);
-
-impl Future for HasMonitorPermissionFuture {
-    type Output = bool;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.0).poll(cx)
-    }
-}
-
-/// Additional methods on [`MonitorHandle`] that are specific to the Web.
-pub trait MonitorHandleExtWeb {
-    /// Returns whether the screen is internal to the device or external.
-    ///
-    /// External devices are generally manufactured separately from the device they are attached to
-    /// and can be connected and disconnected as needed, whereas internal screens are part of
-    /// the device and not intended to be disconnected.
-    fn is_internal(&self) -> Option<bool>;
-
-    /// Returns screen orientation data for this monitor.
-    fn orientation(&self) -> OrientationData;
-
-    /// Lock the screen orientation. The returned [`OrientationLockFuture`] can be dropped without
-    /// aborting the request.
-    ///
-    /// Will fail if another locking call is in progress.
-    fn request_lock(&self, orientation: OrientationLock) -> OrientationLockFuture;
-
-    /// Unlock the screen orientation.
-    ///
-    /// Will fail if a locking call is in progress.
-    fn unlock(&self) -> Result<(), OrientationLockError>;
-
-    /// Returns whether this [`MonitorHandle`] was created using detailed monitor permissions. If
-    /// [`false`] will always represent the current monitor the browser window is in instead of a
-    /// specific monitor.
-    ///
-    /// See [`ActiveEventLoopExtWeb::request_detailed_monitor_permission()`].
-    fn is_detailed(&self) -> bool;
-}
-
-impl MonitorHandleExtWeb for MonitorHandle {
-    fn is_internal(&self) -> Option<bool> {
-        self.inner.is_internal()
-    }
-
-    fn orientation(&self) -> OrientationData {
-        self.inner.orientation()
-    }
-
-    fn request_lock(&self, orientation_lock: OrientationLock) -> OrientationLockFuture {
-        OrientationLockFuture(self.inner.request_lock(orientation_lock))
-    }
-
-    fn unlock(&self) -> Result<(), OrientationLockError> {
-        self.inner.unlock()
-    }
-
-    fn is_detailed(&self) -> bool {
-        self.inner.is_detailed()
-    }
-}
-
-/// Screen orientation data.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub struct OrientationData {
-    /// The orientation.
-    pub orientation: Orientation,
-    /// [`true`] if the [`orientation`](Self::orientation) is flipped upside down.
-    pub flipped: bool,
-    /// [`true`] if the [`Orientation`] is the most natural one for the screen regardless of being
-    /// flipped. Computer monitors are commonly naturally landscape mode, while mobile phones
-    /// are commonly naturally portrait mode.
-    pub natural: bool,
-}
-
-/// Screen orientation.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum Orientation {
-    /// The screen's aspect ratio has a width greater than the height.
-    Landscape,
-    /// The screen's aspect ratio has a height greater than the width.
-    Portrait,
-}
-
-/// Screen orientation lock options. Reoresents which orientations a user can use.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum OrientationLock {
-    /// User is free to use any orientation.
-    Any,
-    /// User is locked to the most upright natural orientation for the screen. Computer monitors
-    /// are commonly naturally landscape mode, while mobile phones are commonly
-    /// naturally portrait mode.
-    Natural,
-    /// User is locked to landscape mode.
-    Landscape {
-        /// - [`None`]: User is locked to both upright or upside down landscape mode.
-        /// - [`false`]: User is locked to upright landscape mode.
-        /// - [`false`]: User is locked to upside down landscape mode.
-        flipped: Option<bool>,
-    },
-    /// User is locked to portrait mode.
-    Portrait {
-        /// - [`None`]: User is locked to both upright or upside down portrait mode.
-        /// - [`false`]: User is locked to upright portrait mode.
-        /// - [`false`]: User is locked to upside down portrait mode.
-        flipped: Option<bool>,
-    },
-}
-
-#[cfg(not(web_platform))]
-struct PlatformOrientationLockFuture;
-
-/// Can be dropped without aborting the request to lock the screen.
-#[derive(Debug)]
-pub struct OrientationLockFuture(PlatformOrientationLockFuture);
-
-impl Future for OrientationLockFuture {
-    type Output = Result<(), OrientationLockError>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.0).poll(cx)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum OrientationLockError {
-    Unsupported,
-    Busy,
-}
-
-impl Display for OrientationLockError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Unsupported => write!(f, "Locking the screen orientation is not supported"),
-            Self::Busy => write!(f, "Another locking call is in progress"),
-        }
-    }
-}
-
-impl Error for OrientationLockError {}
-
-/// Additional methods on [`FingerId`] that are specific to Web.
-pub trait FingerIdExtWeb {
-    /// Indicates if the finger represents the first contact in a multi-touch interaction.
-    #[allow(clippy::wrong_self_convention)]
-    fn is_primary(self) -> bool;
-}
-
-impl FingerIdExtWeb for FingerId {
-    fn is_primary(self) -> bool {
-        self.0.is_primary()
-    }
-}

src/platform/windows.rs

@@ -6,11 +6,8 @@ use std::borrow::Borrow;
 use std::ffi::c_void;
 use std::path::Path;
 
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
 use crate::dpi::PhysicalSize;
-use crate::event::{DeviceId, FingerId};
+use crate::event::DeviceId;
 use crate::event_loop::EventLoopBuilder;
 use crate::monitor::MonitorHandle;
 use crate::window::{BadIcon, Icon, Window, WindowAttributes};
@@ -28,7 +25,6 @@ pub type HMONITOR = isize;
 ///
 /// [`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)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum BackdropType {
     /// Corresponds to `DWMSBT_AUTO`.
     ///
@@ -58,7 +54,6 @@ pub enum BackdropType {
 /// Describes a color used by Windows
 #[repr(transparent)]
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Color(u32);
 
 impl Color {
@@ -87,7 +82,6 @@ impl Default for Color {
 /// [`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)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum CornerPreference {
     /// Corresponds to `DWMWCP_DEFAULT`.
     ///
@@ -114,7 +108,7 @@ pub enum CornerPreference {
 /// A wrapper around a [`Window`] that ignores thread-specific window handle limitations.
 ///
 /// See [`WindowBorrowExtWindows::any_thread`] for more information.
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct AnyThread<W>(W);
 
 impl<W: Borrow<Window>> AnyThread<W> {
@@ -189,11 +183,11 @@ pub trait EventLoopBuilderExtWindows {
     /// Disable process-wide DPI awareness.
     ///
     /// ```
-    /// use winit::event_loop::EventLoop;
+    /// use winit::event_loop::EventLoopBuilder;
     /// #[cfg(target_os = "windows")]
     /// use winit::platform::windows::EventLoopBuilderExtWindows;
     ///
-    /// let mut builder = EventLoop::builder();
+    /// let mut builder = EventLoopBuilder::new();
     /// #[cfg(target_os = "windows")]
     /// builder.with_dpi_aware(false);
     /// # if false { // We can't test this part
@@ -209,11 +203,11 @@ pub trait EventLoopBuilderExtWindows {
     ///
     /// ```
     /// # use windows_sys::Win32::UI::WindowsAndMessaging::{ACCEL, CreateAcceleratorTableW, TranslateAcceleratorW, DispatchMessageW, TranslateMessage, MSG};
-    /// use winit::event_loop::EventLoop;
+    /// use winit::event_loop::EventLoopBuilder;
     /// #[cfg(target_os = "windows")]
     /// use winit::platform::windows::EventLoopBuilderExtWindows;
     ///
-    /// let mut builder = EventLoop::builder();
+    /// let mut builder = EventLoopBuilder::new();
     /// #[cfg(target_os = "windows")]
     /// builder.with_msg_hook(|msg|{
     ///     let msg = msg as *const MSG;
@@ -233,7 +227,7 @@ pub trait EventLoopBuilderExtWindows {
         F: FnMut(*const c_void) -> bool + 'static;
 }
 
-impl EventLoopBuilderExtWindows for EventLoopBuilder {
+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;
@@ -343,7 +337,6 @@ pub trait WindowExtWindows {
     /// # use winit::window::Window;
     /// # fn scope(window: Window) {
     /// use std::thread;
-    ///
     /// use winit::platform::windows::WindowExtWindows;
     /// use winit::raw_window_handle::HasWindowHandle;
     ///
@@ -446,17 +439,9 @@ pub trait WindowBorrowExtWindows: Borrow<Window> + Sized {
     /// It is the responsibility of the user to only pass the window handle into thread-safe
     /// Win32 APIs.
     ///
+    /// [`window_handle_any_thread`]: WindowExtWindows::window_handle_any_thread
     /// [`Window`]: crate::window::Window
-    #[cfg_attr(
-        feature = "rwh_06",
-        doc = "[`HasWindowHandle`]: rwh_06::HasWindowHandle",
-        doc = "[`window_handle_any_thread`]: WindowExtWindows::window_handle_any_thread"
-    )]
-    #[cfg_attr(
-        not(feature = "rwh_06"),
-        doc = "[`HasWindowHandle`]: #only-available-with-rwh_06",
-        doc = "[`window_handle_any_thread`]: #only-available-with-rwh_06"
-    )]
+    /// [`HasWindowHandle`]: rwh_06::HasWindowHandle
     unsafe fn any_thread(self) -> AnyThread<Self> {
         AnyThread(self)
     }
@@ -674,20 +659,6 @@ impl DeviceIdExtWindows for DeviceId {
     }
 }
 
-/// Additional methods on `FingerId` that are specific to Windows.
-pub trait FingerIdExtWindows {
-    /// Indicates if the finger represents the first contact in a multi-touch interaction.
-    #[allow(clippy::wrong_self_convention)]
-    fn is_primary(self) -> bool;
-}
-
-impl FingerIdExtWindows for FingerId {
-    #[inline]
-    fn is_primary(self) -> bool {
-        self.0.is_primary()
-    }
-}
-
 /// Additional methods on `Icon` that are specific to Windows.
 pub trait IconExtWindows: Sized {
     /// Create an icon from a file path.

src/platform/x11.rs

@@ -2,11 +2,12 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use crate::dpi::Size;
 use crate::event_loop::{ActiveEventLoop, EventLoop, EventLoopBuilder};
 use crate::monitor::MonitorHandle;
 use crate::window::{Window, WindowAttributes};
 
+use crate::dpi::Size;
+
 /// X window type. Maps directly to
 /// [`_NET_WM_WINDOW_TYPE`](https://specifications.freedesktop.org/wm-spec/wm-spec-1.5.html).
 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Hash)]
@@ -91,10 +92,10 @@ pub trait ActiveEventLoopExtX11 {
     fn is_x11(&self) -> bool;
 }
 
-impl ActiveEventLoopExtX11 for &dyn ActiveEventLoop {
+impl ActiveEventLoopExtX11 for ActiveEventLoop {
     #[inline]
     fn is_x11(&self) -> bool {
-        self.as_any().downcast_ref::<crate::platform_impl::x11::ActiveEventLoop>().is_some()
+        !self.p.is_wayland()
     }
 }
 
@@ -104,7 +105,7 @@ pub trait EventLoopExtX11 {
     fn is_x11(&self) -> bool;
 }
 
-impl EventLoopExtX11 for EventLoop {
+impl<T: 'static> EventLoopExtX11 for EventLoop<T> {
     #[inline]
     fn is_x11(&self) -> bool {
         !self.event_loop.is_wayland()
@@ -123,7 +124,7 @@ pub trait EventLoopBuilderExtX11 {
     fn with_any_thread(&mut self, any_thread: bool) -> &mut Self;
 }
 
-impl EventLoopBuilderExtX11 for EventLoopBuilder {
+impl<T> EventLoopBuilderExtX11 for EventLoopBuilder<T> {
     #[inline]
     fn with_x11(&mut self) -> &mut Self {
         self.platform_specific.forced_backend = Some(crate::platform_impl::Backend::X);
@@ -187,7 +188,7 @@ pub trait WindowAttributesExtX11 {
     /// use winit::window::Window;
     /// use winit::event_loop::ActiveEventLoop;
     /// use winit::platform::x11::{XWindow, WindowAttributesExtX11};
-    /// # fn create_window(event_loop: &dyn ActiveEventLoop) -> Result<(), Box<dyn std::error::Error>> {
+    /// # fn create_window(event_loop: &ActiveEventLoop) -> Result<(), Box<dyn std::error::Error>> {
     /// let parent_window_id = std::env::args().nth(1).unwrap().parse::<XWindow>()?;
     /// let window_attributes = Window::default_attributes().with_embed_parent_window(parent_window_id);
     /// let window = event_loop.create_window(window_attributes)?;

src/platform_impl/android/mod.rs

@@ -1,9 +1,11 @@
-use std::any::Any;
+#![cfg(android_platform)]
+
 use std::cell::Cell;
+use std::collections::VecDeque;
 use std::hash::Hash;
-use std::num::{NonZeroU16, NonZeroU32};
+use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
+use std::sync::{mpsc, Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use android_activity::input::{InputEvent, KeyAction, Keycode, MotionAction};
@@ -12,21 +14,17 @@ use android_activity::{
 };
 use tracing::{debug, trace, warn};
 
-use crate::application::ApplicationHandler;
 use crate::cursor::Cursor;
 use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
-use crate::error::{self, EventLoopError, ExternalError, NotSupportedError};
+use crate::error;
+use crate::error::EventLoopError;
 use crate::event::{self, Force, InnerSizeWriter, StartCause};
-use crate::event_loop::{
-    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
-};
-use crate::monitor::MonitorHandle as RootMonitorHandle;
+use crate::event_loop::{self, ActiveEventLoop as RootAEL, ControlFlow, DeviceEvents};
 use crate::platform::pump_events::PumpStatus;
 use crate::platform_impl::Fullscreen;
 use crate::window::{
     self, CursorGrabMode, CustomCursor, CustomCursorSource, ImePurpose, ResizeDirection, Theme,
-    Window as RootWindow, WindowAttributes, WindowButtons, WindowLevel,
+    WindowButtons, WindowLevel,
 };
 
 mod keycodes;
@@ -45,6 +43,41 @@ fn min_timeout(a: Option<Duration>, b: Option<Duration>) -> Option<Duration> {
     a.map_or(b, |a_timeout| b.map_or(Some(a_timeout), |b_timeout| Some(a_timeout.min(b_timeout))))
 }
 
+struct PeekableReceiver<T> {
+    recv: mpsc::Receiver<T>,
+    first: Option<T>,
+}
+
+impl<T> PeekableReceiver<T> {
+    pub fn from_recv(recv: mpsc::Receiver<T>) -> Self {
+        Self { recv, first: None }
+    }
+
+    pub fn has_incoming(&mut self) -> bool {
+        if self.first.is_some() {
+            return true;
+        }
+        match self.recv.try_recv() {
+            Ok(v) => {
+                self.first = Some(v);
+                true
+            },
+            Err(mpsc::TryRecvError::Empty) => false,
+            Err(mpsc::TryRecvError::Disconnected) => {
+                warn!("Channel was disconnected when checking incoming");
+                false
+            },
+        }
+    }
+
+    pub fn try_recv(&mut self) -> Result<T, mpsc::TryRecvError> {
+        if let Some(first) = self.first.take() {
+            return Ok(first);
+        }
+        self.recv.try_recv()
+    }
+}
+
 #[derive(Clone)]
 struct SharedFlagSetter {
     flag: Arc<AtomicBool>,
@@ -100,11 +133,13 @@ impl RedrawRequester {
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct KeyEventExtra {}
 
-pub struct EventLoop {
-    pub(crate) android_app: AndroidApp,
-    window_target: ActiveEventLoop,
+pub struct EventLoop<T: 'static> {
+    android_app: AndroidApp,
+    window_target: event_loop::ActiveEventLoop,
     redraw_flag: SharedFlag,
-    loop_running: bool, // Dispatched `NewEvents<Init>`
+    user_events_sender: mpsc::Sender<T>,
+    user_events_receiver: PeekableReceiver<T>, // must wake looper whenever something gets sent
+    loop_running: bool,                        // Dispatched `NewEvents<Init>`
     running: bool,
     pending_redraw: bool,
     cause: StartCause,
@@ -112,7 +147,7 @@ pub struct EventLoop {
     combining_accent: Option<char>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq)]
 pub(crate) struct PlatformSpecificEventLoopAttributes {
     pub(crate) android_app: Option<AndroidApp>,
     pub(crate) ignore_volume_keys: bool,
@@ -124,11 +159,11 @@ impl Default for PlatformSpecificEventLoopAttributes {
     }
 }
 
-impl EventLoop {
+impl<T: 'static> EventLoop<T> {
     pub(crate) fn new(
         attributes: &PlatformSpecificEventLoopAttributes,
     ) -> Result<Self, EventLoopError> {
-        let proxy_wake_up = Arc::new(AtomicBool::new(false));
+        let (user_events_sender, user_events_receiver) = mpsc::channel();
 
         let android_app = attributes.android_app.as_ref().expect(
             "An `AndroidApp` as passed to android_main() is required to create an `EventLoop` on \
@@ -138,14 +173,21 @@ impl EventLoop {
 
         Ok(Self {
             android_app: android_app.clone(),
-            window_target: ActiveEventLoop {
-                app: android_app.clone(),
-                control_flow: Cell::new(ControlFlow::default()),
-                exit: Cell::new(false),
-                redraw_requester: RedrawRequester::new(&redraw_flag, android_app.create_waker()),
-                proxy_wake_up,
+            window_target: event_loop::ActiveEventLoop {
+                p: ActiveEventLoop {
+                    app: android_app.clone(),
+                    control_flow: Cell::new(ControlFlow::default()),
+                    exit: Cell::new(false),
+                    redraw_requester: RedrawRequester::new(
+                        &redraw_flag,
+                        android_app.create_waker(),
+                    ),
+                },
+                _marker: PhantomData,
             },
             redraw_flag,
+            user_events_sender,
+            user_events_receiver: PeekableReceiver::from_recv(user_events_receiver),
             loop_running: false,
             running: false,
             pending_redraw: false,
@@ -155,32 +197,27 @@ impl EventLoop {
         })
     }
 
-    pub(crate) fn window_target(&self) -> &dyn RootActiveEventLoop {
-        &self.window_target
-    }
-
-    fn single_iteration<A: ApplicationHandler>(
-        &mut self,
-        main_event: Option<MainEvent<'_>>,
-        app: &mut A,
-    ) {
+    fn single_iteration<F>(&mut self, main_event: Option<MainEvent<'_>>, callback: &mut F)
+    where
+        F: FnMut(event::Event<T>, &RootAEL),
+    {
         trace!("Mainloop iteration");
 
         let cause = self.cause;
         let mut pending_redraw = self.pending_redraw;
         let mut resized = false;
 
-        app.new_events(&self.window_target, cause);
+        callback(event::Event::NewEvents(cause), self.window_target());
 
         if let Some(event) = main_event {
             trace!("Handling main event {:?}", event);
 
             match event {
                 MainEvent::InitWindow { .. } => {
-                    app.can_create_surfaces(&self.window_target);
+                    callback(event::Event::Resumed, self.window_target());
                 },
                 MainEvent::TerminateWindow { .. } => {
-                    app.destroy_surfaces(&self.window_target);
+                    callback(event::Event::Suspended, self.window_target());
                 },
                 MainEvent::WindowResized { .. } => resized = true,
                 MainEvent::RedrawNeeded { .. } => pending_redraw = true,
@@ -189,34 +226,46 @@ impl EventLoop {
                 },
                 MainEvent::GainedFocus => {
                     HAS_FOCUS.store(true, Ordering::Relaxed);
-                    let window_id = window::WindowId(WindowId);
-                    let event = event::WindowEvent::Focused(true);
-                    app.window_event(&self.window_target, window_id, event);
+                    callback(
+                        event::Event::WindowEvent {
+                            window_id: window::WindowId(WindowId),
+                            event: event::WindowEvent::Focused(true),
+                        },
+                        self.window_target(),
+                    );
                 },
                 MainEvent::LostFocus => {
                     HAS_FOCUS.store(false, Ordering::Relaxed);
-                    let window_id = window::WindowId(WindowId);
-                    let event = event::WindowEvent::Focused(false);
-                    app.window_event(&self.window_target, window_id, event);
+                    callback(
+                        event::Event::WindowEvent {
+                            window_id: window::WindowId(WindowId),
+                            event: event::WindowEvent::Focused(false),
+                        },
+                        self.window_target(),
+                    );
                 },
                 MainEvent::ConfigChanged { .. } => {
-                    let old_scale_factor = scale_factor(&self.android_app);
-                    let scale_factor = scale_factor(&self.android_app);
+                    let monitor = MonitorHandle::new(self.android_app.clone());
+                    let old_scale_factor = monitor.scale_factor();
+                    let scale_factor = monitor.scale_factor();
                     if (scale_factor - old_scale_factor).abs() < f64::EPSILON {
-                        let new_inner_size = Arc::new(Mutex::new(screen_size(&self.android_app)));
-                        let window_id = window::WindowId(WindowId);
-                        let event = event::WindowEvent::ScaleFactorChanged {
-                            inner_size_writer: InnerSizeWriter::new(Arc::downgrade(
-                                &new_inner_size,
-                            )),
-                            scale_factor,
+                        let new_inner_size = Arc::new(Mutex::new(
+                            MonitorHandle::new(self.android_app.clone()).size(),
+                        ));
+                        let event = event::Event::WindowEvent {
+                            window_id: window::WindowId(WindowId),
+                            event: event::WindowEvent::ScaleFactorChanged {
+                                inner_size_writer: InnerSizeWriter::new(Arc::downgrade(
+                                    &new_inner_size,
+                                )),
+                                scale_factor,
+                            },
                         };
-
-                        app.window_event(&self.window_target, window_id, event);
+                        callback(event, self.window_target());
                     }
                 },
                 MainEvent::LowMemory => {
-                    app.memory_warning(&self.window_target);
+                    callback(event::Event::MemoryWarning, self.window_target());
                 },
                 MainEvent::Start => {
                     // XXX: how to forward this state to applications?
@@ -264,7 +313,7 @@ impl EventLoop {
         match android_app.input_events_iter() {
             Ok(mut input_iter) => loop {
                 let read_event =
-                    input_iter.next(|event| self.handle_input_event(&android_app, event, app));
+                    input_iter.next(|event| self.handle_input_event(&android_app, event, callback));
 
                 if !read_event {
                     break;
@@ -275,8 +324,11 @@ impl EventLoop {
             },
         }
 
-        if self.window_target.proxy_wake_up.swap(false, Ordering::Relaxed) {
-            app.proxy_wake_up(&self.window_target);
+        // Empty the user event buffer
+        {
+            while let Ok(event) = self.user_events_receiver.try_recv() {
+                callback(crate::event::Event::UserEvent(event), self.window_target());
+            }
         }
 
         if self.running {
@@ -288,32 +340,39 @@ impl EventLoop {
                 } else {
                     PhysicalSize::new(0, 0)
                 };
-                let window_id = window::WindowId(WindowId);
-                let event = event::WindowEvent::Resized(size);
-                app.window_event(&self.window_target, window_id, event);
+                let event = event::Event::WindowEvent {
+                    window_id: window::WindowId(WindowId),
+                    event: event::WindowEvent::Resized(size),
+                };
+                callback(event, self.window_target());
             }
 
             pending_redraw |= self.redraw_flag.get_and_reset();
             if pending_redraw {
                 pending_redraw = false;
-                let window_id = window::WindowId(WindowId);
-                let event = event::WindowEvent::RedrawRequested;
-                app.window_event(&self.window_target, window_id, event);
+                let event = event::Event::WindowEvent {
+                    window_id: window::WindowId(WindowId),
+                    event: event::WindowEvent::RedrawRequested,
+                };
+                callback(event, self.window_target());
             }
         }
 
         // This is always the last event we dispatch before poll again
-        app.about_to_wait(&self.window_target);
+        callback(event::Event::AboutToWait, self.window_target());
 
         self.pending_redraw = pending_redraw;
     }
 
-    fn handle_input_event<A: ApplicationHandler>(
+    fn handle_input_event<F>(
         &mut self,
         android_app: &AndroidApp,
         event: &InputEvent<'_>,
-        app: &mut A,
-    ) -> InputStatus {
+        callback: &mut F,
+    ) -> InputStatus
+    where
+        F: FnMut(event::Event<T>, &RootAEL),
+    {
         let mut input_status = InputStatus::Handled;
         match event {
             InputEvent::MotionEvent(motion_event) => {
@@ -351,16 +410,17 @@ impl EventLoop {
                             "Input event {device_id:?}, {phase:?}, loc={location:?}, \
                              pointer={pointer:?}"
                         );
-
-                        let event = event::WindowEvent::Touch(event::Touch {
-                            device_id,
-                            phase,
-                            location,
-                            finger_id: event::FingerId(FingerId(pointer.pointer_id())),
-                            force: Some(Force::Normalized(pointer.pressure() as f64)),
-                        });
-
-                        app.window_event(&self.window_target, window_id, event);
+                        let event = event::Event::WindowEvent {
+                            window_id,
+                            event: event::WindowEvent::Touch(event::Touch {
+                                device_id,
+                                phase,
+                                location,
+                                id: pointer.pointer_id() as u64,
+                                force: Some(Force::Normalized(pointer.pressure() as f64)),
+                            }),
+                        };
+                        callback(event, self.window_target());
                     }
                 }
             },
@@ -388,22 +448,23 @@ impl EventLoop {
                             &mut self.combining_accent,
                         );
 
-                        let window_id = window::WindowId(WindowId);
-                        let event = event::WindowEvent::KeyboardInput {
-                            device_id: event::DeviceId(DeviceId(key.device_id())),
-                            event: event::KeyEvent {
-                                state,
-                                physical_key: keycodes::to_physical_key(keycode),
-                                logical_key: keycodes::to_logical(key_char, keycode),
-                                location: keycodes::to_location(keycode),
-                                repeat: key.repeat_count() > 0,
-                                text: None,
-                                platform_specific: KeyEventExtra {},
+                        let event = event::Event::WindowEvent {
+                            window_id: window::WindowId(WindowId),
+                            event: event::WindowEvent::KeyboardInput {
+                                device_id: event::DeviceId(DeviceId(key.device_id())),
+                                event: event::KeyEvent {
+                                    state,
+                                    physical_key: keycodes::to_physical_key(keycode),
+                                    logical_key: keycodes::to_logical(key_char, keycode),
+                                    location: keycodes::to_location(keycode),
+                                    repeat: key.repeat_count() > 0,
+                                    text: None,
+                                    platform_specific: KeyEventExtra {},
+                                },
+                                is_synthetic: false,
                             },
-                            is_synthetic: false,
                         };
-
-                        app.window_event(&self.window_target, window_id, event);
+                        callback(event, self.window_target());
                     },
                 }
             },
@@ -415,17 +476,19 @@ impl EventLoop {
         input_status
     }
 
-    pub fn run_app<A: ApplicationHandler>(mut self, app: A) -> Result<(), EventLoopError> {
-        self.run_app_on_demand(app)
+    pub fn run<F>(mut self, event_handler: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(event::Event<T>, &event_loop::ActiveEventLoop),
+    {
+        self.run_on_demand(event_handler)
     }
 
-    pub fn run_app_on_demand<A: ApplicationHandler>(
-        &mut self,
-        mut app: A,
-    ) -> Result<(), EventLoopError> {
-        self.window_target.clear_exit();
+    pub fn run_on_demand<F>(&mut self, mut event_handler: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(event::Event<T>, &event_loop::ActiveEventLoop),
+    {
         loop {
-            match self.pump_app_events(None, &mut app) {
+            match self.pump_events(None, &mut event_handler) {
                 PumpStatus::Exit(0) => {
                     break Ok(());
                 },
@@ -439,11 +502,10 @@ impl EventLoop {
         }
     }
 
-    pub fn pump_app_events<A: ApplicationHandler>(
-        &mut self,
-        timeout: Option<Duration>,
-        mut app: A,
-    ) -> PumpStatus {
+    pub fn pump_events<F>(&mut self, timeout: Option<Duration>, mut callback: F) -> PumpStatus
+    where
+        F: FnMut(event::Event<T>, &RootAEL),
+    {
         if !self.loop_running {
             self.loop_running = true;
 
@@ -454,18 +516,18 @@ impl EventLoop {
             self.cause = StartCause::Init;
 
             // run the initial loop iteration
-            self.single_iteration(None, &mut app);
+            self.single_iteration(None, &mut callback);
         }
 
         // Consider the possibility that the `StartCause::Init` iteration could
         // request to Exit
         if !self.exiting() {
-            self.poll_events_with_timeout(timeout, &mut app);
+            self.poll_events_with_timeout(timeout, &mut callback);
         }
         if self.exiting() {
             self.loop_running = false;
 
-            app.exiting(&self.window_target);
+            callback(event::Event::LoopExiting, self.window_target());
 
             PumpStatus::Exit(0)
         } else {
@@ -473,34 +535,32 @@ impl EventLoop {
         }
     }
 
-    fn poll_events_with_timeout<A: ApplicationHandler>(
-        &mut self,
-        mut timeout: Option<Duration>,
-        app: &mut A,
-    ) {
+    fn poll_events_with_timeout<F>(&mut self, mut timeout: Option<Duration>, mut callback: F)
+    where
+        F: FnMut(event::Event<T>, &RootAEL),
+    {
         let start = Instant::now();
 
         self.pending_redraw |= self.redraw_flag.get_and_reset();
 
-        timeout = if self.running
-            && (self.pending_redraw || self.window_target.proxy_wake_up.load(Ordering::Relaxed))
-        {
-            // If we already have work to do then we don't want to block on the next poll
-            Some(Duration::ZERO)
-        } else {
-            let control_flow_timeout = match self.control_flow() {
-                ControlFlow::Wait => None,
-                ControlFlow::Poll => Some(Duration::ZERO),
-                ControlFlow::WaitUntil(wait_deadline) => {
-                    Some(wait_deadline.saturating_duration_since(start))
-                },
+        timeout =
+            if self.running && (self.pending_redraw || self.user_events_receiver.has_incoming()) {
+                // If we already have work to do then we don't want to block on the next poll
+                Some(Duration::ZERO)
+            } else {
+                let control_flow_timeout = match self.control_flow() {
+                    ControlFlow::Wait => None,
+                    ControlFlow::Poll => Some(Duration::ZERO),
+                    ControlFlow::WaitUntil(wait_deadline) => {
+                        Some(wait_deadline.saturating_duration_since(start))
+                    },
+                };
+
+                min_timeout(control_flow_timeout, timeout)
             };
 
-            min_timeout(control_flow_timeout, timeout)
-        };
-
-        let android_app = self.android_app.clone(); // Don't borrow self as part of poll expression
-        android_app.poll_events(timeout, |poll_event| {
+        let app = self.android_app.clone(); // Don't borrow self as part of poll expression
+        app.poll_events(timeout, |poll_event| {
             let mut main_event = None;
 
             match poll_event {
@@ -515,8 +575,7 @@ impl EventLoop {
                     // We also ignore wake ups while suspended.
                     self.pending_redraw |= self.redraw_flag.get_and_reset();
                     if !self.running
-                        || (!self.pending_redraw
-                            && !self.window_target.proxy_wake_up.load(Ordering::Relaxed))
+                        || (!self.pending_redraw && !self.user_events_receiver.has_incoming())
                     {
                         return;
                     }
@@ -542,126 +601,127 @@ impl EventLoop {
                 },
             };
 
-            self.single_iteration(main_event, app);
+            self.single_iteration(main_event, &mut callback);
         });
     }
 
+    pub fn window_target(&self) -> &event_loop::ActiveEventLoop {
+        &self.window_target
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy {
+            user_events_sender: self.user_events_sender.clone(),
+            waker: self.android_app.create_waker(),
+        }
+    }
+
     fn control_flow(&self) -> ControlFlow {
-        self.window_target.control_flow()
+        self.window_target.p.control_flow()
     }
 
     fn exiting(&self) -> bool {
-        self.window_target.exiting()
+        self.window_target.p.exiting()
     }
 }
 
-#[derive(Clone)]
-pub struct EventLoopProxy {
-    proxy_wake_up: Arc<AtomicBool>,
+pub struct EventLoopProxy<T: 'static> {
+    user_events_sender: mpsc::Sender<T>,
     waker: AndroidAppWaker,
 }
 
-impl EventLoopProxy {
-    pub fn wake_up(&self) {
-        self.proxy_wake_up.store(true, Ordering::Relaxed);
+impl<T: 'static> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> Self {
+        EventLoopProxy {
+            user_events_sender: self.user_events_sender.clone(),
+            waker: self.waker.clone(),
+        }
+    }
+}
+
+impl<T> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), event_loop::EventLoopClosed<T>> {
+        self.user_events_sender.send(event).map_err(|err| event_loop::EventLoopClosed(err.0))?;
         self.waker.wake();
+        Ok(())
     }
 }
 
 pub struct ActiveEventLoop {
-    pub(crate) app: AndroidApp,
+    app: AndroidApp,
     control_flow: Cell<ControlFlow>,
     exit: Cell<bool>,
     redraw_requester: RedrawRequester,
-    proxy_wake_up: Arc<AtomicBool>,
 }
 
 impl ActiveEventLoop {
-    fn clear_exit(&self) {
-        self.exit.set(false);
-    }
-}
-
-impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> RootEventLoopProxy {
-        let event_loop_proxy = EventLoopProxy {
-            proxy_wake_up: self.proxy_wake_up.clone(),
-            waker: self.app.create_waker(),
-        };
-        RootEventLoopProxy { event_loop_proxy }
+    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
+        Some(MonitorHandle::new(self.app.clone()))
     }
 
-    fn create_window(
-        &self,
-        window_attributes: WindowAttributes,
-    ) -> Result<RootWindow, error::OsError> {
-        let window = Window::new(self, window_attributes)?;
-        Ok(RootWindow { window })
+    pub fn create_custom_cursor(&self, source: CustomCursorSource) -> CustomCursor {
+        let _ = source.inner;
+        CustomCursor { inner: PlatformCustomCursor }
     }
 
-    fn create_custom_cursor(
-        &self,
-        _source: CustomCursorSource,
-    ) -> Result<CustomCursor, ExternalError> {
-        Err(ExternalError::NotSupported(NotSupportedError::new()))
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        let mut v = VecDeque::with_capacity(1);
+        v.push_back(MonitorHandle::new(self.app.clone()));
+        v
     }
 
-    fn available_monitors(&self) -> Box<dyn Iterator<Item = RootMonitorHandle>> {
-        Box::new(std::iter::empty())
-    }
+    #[inline]
+    pub fn listen_device_events(&self, _allowed: DeviceEvents) {}
 
-    fn primary_monitor(&self) -> Option<RootMonitorHandle> {
-        None
-    }
-
-    fn system_theme(&self) -> Option<Theme> {
-        None
-    }
-
-    fn listen_device_events(&self, _allowed: DeviceEvents) {}
-
-    fn set_control_flow(&self, control_flow: ControlFlow) {
-        self.control_flow.set(control_flow)
-    }
-
-    fn control_flow(&self) -> ControlFlow {
-        self.control_flow.get()
-    }
-
-    fn exit(&self) {
-        self.exit.set(true)
-    }
-
-    fn exiting(&self) -> bool {
-        self.exit.get()
-    }
-
-    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
-        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::RawDisplayHandle::Android(rwh_05::AndroidDisplayHandle::empty())
     }
 
     #[cfg(feature = "rwh_06")]
-    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
-        self
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::RawDisplayHandle::Android(rwh_06::AndroidDisplayHandle::new()))
+    }
+
+    pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
+        self.control_flow.set(control_flow)
+    }
+
+    pub(crate) fn control_flow(&self) -> ControlFlow {
+        self.control_flow.get()
+    }
+
+    pub(crate) fn exit(&self) {
+        self.exit.set(true)
+    }
+
+    pub(crate) fn clear_exit(&self) {
+        self.exit.set(false)
+    }
+
+    pub(crate) fn exiting(&self) -> bool {
+        self.exit.get()
+    }
+
+    pub(crate) fn owned_display_handle(&self) -> OwnedDisplayHandle {
+        OwnedDisplayHandle
     }
 }
 
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::AndroidDisplayHandle::new();
-        Ok(unsafe { rwh_06::DisplayHandle::borrow_raw(raw.into()) })
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone)]
 pub(crate) struct OwnedDisplayHandle;
 
 impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::AndroidDisplayHandle::empty().into()
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_display_handle_rwh_06(
@@ -701,15 +761,6 @@ impl DeviceId {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct FingerId(i32);
-
-impl FingerId {
-    pub const fn dummy() -> Self {
-        FingerId(0)
-    }
-}
-
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub struct PlatformSpecificWindowAttributes;
 
@@ -741,19 +792,21 @@ impl Window {
     }
 
     pub fn primary_monitor(&self) -> Option<MonitorHandle> {
-        None
+        Some(MonitorHandle::new(self.app.clone()))
     }
 
-    pub fn available_monitors(&self) -> Option<MonitorHandle> {
-        None
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        let mut v = VecDeque::with_capacity(1);
+        v.push_back(MonitorHandle::new(self.app.clone()));
+        v
     }
 
     pub fn current_monitor(&self) -> Option<MonitorHandle> {
-        None
+        Some(MonitorHandle::new(self.app.clone()))
     }
 
     pub fn scale_factor(&self) -> f64 {
-        scale_factor(&self.app)
+        MonitorHandle::new(self.app.clone()).scale_factor()
     }
 
     pub fn request_redraw(&self) {
@@ -783,7 +836,7 @@ impl Window {
     }
 
     pub fn outer_size(&self) -> PhysicalSize<u32> {
-        screen_size(&self.app)
+        MonitorHandle::new(self.app.clone()).size()
     }
 
     pub fn set_min_inner_size(&self, _: Option<Size>) {}
@@ -890,6 +943,41 @@ impl Window {
         Err(error::ExternalError::NotSupported(error::NotSupportedError::new()))
     }
 
+    #[cfg(feature = "rwh_04")]
+    pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
+        use rwh_04::HasRawWindowHandle;
+
+        if let Some(native_window) = self.app.native_window().as_ref() {
+            native_window.raw_window_handle()
+        } else {
+            panic!(
+                "Cannot get the native window, it's null and will always be null before \
+                 Event::Resumed and after Event::Suspended. Make sure you only call this function \
+                 between those events."
+            );
+        }
+    }
+
+    #[cfg(feature = "rwh_05")]
+    pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
+        use rwh_05::HasRawWindowHandle;
+
+        if let Some(native_window) = self.app.native_window().as_ref() {
+            native_window.raw_window_handle()
+        } else {
+            panic!(
+                "Cannot get the native window, it's null and will always be null before \
+                 Event::Resumed and after Event::Suspended. Make sure you only call this function \
+                 between those events."
+            );
+        }
+    }
+
+    #[cfg(feature = "rwh_05")]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::RawDisplayHandle::Android(rwh_05::AndroidDisplayHandle::empty())
+    }
+
     #[cfg(feature = "rwh_06")]
     // Allow the usage of HasRawWindowHandle inside this function
     #[allow(deprecated)]
@@ -952,60 +1040,86 @@ impl Display for OsError {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct MonitorHandle;
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct MonitorHandle {
+    app: AndroidApp,
+}
+impl PartialOrd for MonitorHandle {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+impl Ord for MonitorHandle {
+    fn cmp(&self, _other: &Self) -> std::cmp::Ordering {
+        std::cmp::Ordering::Equal
+    }
+}
 
 impl MonitorHandle {
-    pub fn name(&self) -> Option<String> {
-        unreachable!()
+    pub(crate) fn new(app: AndroidApp) -> Self {
+        Self { app }
     }
 
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
-        unreachable!()
+    pub fn name(&self) -> Option<String> {
+        Some("Android Device".to_owned())
+    }
+
+    pub fn size(&self) -> PhysicalSize<u32> {
+        if let Some(native_window) = self.app.native_window() {
+            PhysicalSize::new(native_window.width() as _, native_window.height() as _)
+        } else {
+            PhysicalSize::new(0, 0)
+        }
+    }
+
+    pub fn position(&self) -> PhysicalPosition<i32> {
+        (0, 0).into()
     }
 
     pub fn scale_factor(&self) -> f64 {
-        unreachable!()
+        self.app.config().density().map(|dpi| dpi as f64 / 160.0).unwrap_or(1.0)
     }
 
-    pub fn current_video_mode(&self) -> Option<VideoModeHandle> {
-        unreachable!()
+    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
+        // FIXME no way to get real refresh rate for now.
+        None
     }
 
-    pub fn video_modes(&self) -> std::iter::Empty<VideoModeHandle> {
-        unreachable!()
+    pub fn video_modes(&self) -> impl Iterator<Item = VideoModeHandle> {
+        let size = self.size().into();
+        // FIXME this is not the real refresh rate
+        // (it is guaranteed to support 32 bit color though)
+        std::iter::once(VideoModeHandle {
+            size,
+            bit_depth: 32,
+            refresh_rate_millihertz: 60000,
+            monitor: self.clone(),
+        })
     }
 }
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct VideoModeHandle;
+pub struct VideoModeHandle {
+    size: (u32, u32),
+    bit_depth: u16,
+    refresh_rate_millihertz: u32,
+    monitor: MonitorHandle,
+}
 
 impl VideoModeHandle {
     pub fn size(&self) -> PhysicalSize<u32> {
-        unreachable!()
+        self.size.into()
     }
 
-    pub fn bit_depth(&self) -> Option<NonZeroU16> {
-        unreachable!()
+    pub fn bit_depth(&self) -> u16 {
+        self.bit_depth
     }
 
-    pub fn refresh_rate_millihertz(&self) -> Option<NonZeroU32> {
-        unreachable!()
+    pub fn refresh_rate_millihertz(&self) -> u32 {
+        self.refresh_rate_millihertz
     }
 
     pub fn monitor(&self) -> MonitorHandle {
-        unreachable!()
+        self.monitor.clone()
     }
 }
-
-fn screen_size(app: &AndroidApp) -> PhysicalSize<u32> {
-    if let Some(native_window) = app.native_window() {
-        PhysicalSize::new(native_window.width() as _, native_window.height() as _)
-    } else {
-        PhysicalSize::new(0, 0)
-    }
-}
-
-fn scale_factor(app: &AndroidApp) -> f64 {
-    app.config().density().map(|dpi| dpi as f64 / 160.0).unwrap_or(1.0)
-}

src/platform_impl/apple/mod.rs

@@ -1,11 +0,0 @@
-//! Apple/Darwin-specific implementations
-
-#[cfg(target_os = "macos")]
-mod appkit;
-#[cfg(not(target_os = "macos"))]
-mod uikit;
-
-#[cfg(target_os = "macos")]
-pub use self::appkit::*;
-#[cfg(not(target_os = "macos"))]
-pub use self::uikit::*;

src/platform_impl/ios/app_state.rs

@@ -3,7 +3,6 @@
 use std::cell::{RefCell, RefMut};
 use std::collections::HashSet;
 use std::os::raw::c_void;
-use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Instant;
 use std::{fmt, mem, ptr};
@@ -24,7 +23,6 @@ use objc2_foundation::{
 use objc2_ui_kit::{UIApplication, UICoordinateSpace, UIView, UIWindow};
 
 use super::window::WinitUIWindow;
-use super::ActiveEventLoop;
 use crate::dpi::PhysicalSize;
 use crate::event::{Event, InnerSizeWriter, StartCause, WindowEvent};
 use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow};
@@ -42,10 +40,13 @@ macro_rules! bug_assert {
     };
 }
 
+#[derive(Debug)]
+pub(crate) struct HandlePendingUserEvents;
+
 pub(crate) struct EventLoopHandler {
     #[allow(clippy::type_complexity)]
-    pub(crate) handler: Box<dyn FnMut(Event, &dyn RootActiveEventLoop)>,
-    pub(crate) event_loop: ActiveEventLoop,
+    pub(crate) handler: Box<dyn FnMut(Event<HandlePendingUserEvents>, &RootActiveEventLoop)>,
+    pub(crate) event_loop: RootActiveEventLoop,
 }
 
 impl fmt::Debug for EventLoopHandler {
@@ -58,14 +59,14 @@ impl fmt::Debug for EventLoopHandler {
 }
 
 impl EventLoopHandler {
-    fn handle_event(&mut self, event: Event) {
+    fn handle_event(&mut self, event: Event<HandlePendingUserEvents>) {
         (self.handler)(event, &self.event_loop)
     }
 }
 
 #[derive(Debug)]
 pub(crate) enum EventWrapper {
-    StaticEvent(Event),
+    StaticEvent(Event<HandlePendingUserEvents>),
     ScaleFactorChanged(ScaleFactorChanged),
 }
 
@@ -87,7 +88,7 @@ enum UserCallbackTransitionResult<'a> {
     },
 }
 
-impl Event {
+impl Event<HandlePendingUserEvents> {
     fn is_redraw(&self) -> bool {
         matches!(self, Event::WindowEvent { event: WindowEvent::RedrawRequested, .. })
     }
@@ -137,7 +138,6 @@ pub(crate) struct AppState {
     app_state: Option<AppStateImpl>,
     control_flow: ControlFlow,
     waker: EventLoopWaker,
-    proxy_wake_up: Arc<AtomicBool>,
 }
 
 impl AppState {
@@ -161,7 +161,6 @@ impl AppState {
                     }),
                     control_flow: ControlFlow::default(),
                     waker,
-                    proxy_wake_up: Arc::new(AtomicBool::new(false)),
                 });
             }
             init_guard(&mut guard);
@@ -406,10 +405,6 @@ impl AppState {
         }
     }
 
-    pub(crate) fn proxy_wake_up(&self) -> Arc<AtomicBool> {
-        self.proxy_wake_up.clone()
-    }
-
     pub(crate) fn set_control_flow(&mut self, control_flow: ControlFlow) {
         self.control_flow = control_flow;
     }
@@ -497,12 +492,8 @@ pub fn did_finish_launching(mtm: MainThreadMarker) {
 
     let (windows, events) = AppState::get_mut(mtm).did_finish_launching_transition();
 
-    let events = [
-        EventWrapper::StaticEvent(Event::NewEvents(StartCause::Init)),
-        EventWrapper::StaticEvent(Event::CreateSurfaces),
-    ]
-    .into_iter()
-    .chain(events);
+    let events = std::iter::once(EventWrapper::StaticEvent(Event::NewEvents(StartCause::Init)))
+        .chain(events);
     handle_nonuser_events(mtm, events);
 
     // the above window dance hack, could possibly trigger new windows to be created.
@@ -634,7 +625,7 @@ fn handle_user_events(mtm: MainThreadMarker) {
     }
     drop(this);
 
-    handler.handle_event(Event::UserWakeUp);
+    handler.handle_event(Event::UserEvent(HandlePendingUserEvents));
 
     loop {
         let mut this = AppState::get_mut(mtm);
@@ -667,7 +658,7 @@ fn handle_user_events(mtm: MainThreadMarker) {
             }
         }
 
-        handler.handle_event(Event::UserWakeUp);
+        handler.handle_event(Event::UserEvent(HandlePendingUserEvents));
     }
 }
 
@@ -807,7 +798,7 @@ impl EventLoopWaker {
             // future, but that gets changed to fire immediately in did_finish_launching
             let timer = CFRunLoopTimerCreate(
                 ptr::null_mut(),
-                f64::MAX,
+                std::f64::MAX,
                 0.000_000_1,
                 0,
                 0,
@@ -821,11 +812,11 @@ impl EventLoopWaker {
     }
 
     fn stop(&mut self) {
-        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, f64::MAX) }
+        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MAX) }
     }
 
     fn start(&mut self) {
-        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, f64::MIN) }
+        unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MIN) }
     }
 
     fn start_at(&mut self, instant: Instant) {

src/platform_impl/ios/event_loop.rs

@@ -1,8 +1,8 @@
-use std::any::Any;
+use std::collections::VecDeque;
 use std::ffi::{c_char, c_int, c_void};
+use std::marker::PhantomData;
 use std::ptr::{self, NonNull};
-use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
-use std::sync::Arc;
+use std::sync::mpsc::{self, Receiver, Sender};
 
 use core_foundation::base::{CFIndex, CFRelease};
 use core_foundation::runloop::{
@@ -14,108 +14,91 @@ use core_foundation::runloop::{
 use objc2::rc::Retained;
 use objc2::{msg_send_id, ClassType};
 use objc2_foundation::{MainThreadMarker, NSString};
-use objc2_ui_kit::{UIApplication, UIApplicationMain, UIScreen};
+use objc2_ui_kit::{UIApplication, UIApplicationMain, UIDevice, UIScreen, UIUserInterfaceIdiom};
 
-use super::app_delegate::AppDelegate;
-use super::app_state::{AppState, EventLoopHandler};
-use super::{app_state, monitor, MonitorHandle};
-use crate::application::ApplicationHandler;
-use crate::error::{EventLoopError, ExternalError, NotSupportedError, OsError};
+use crate::error::EventLoopError;
 use crate::event::Event;
 use crate::event_loop::{
-    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
+    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents, EventLoopClosed,
 };
-use crate::monitor::MonitorHandle as RootMonitorHandle;
-use crate::platform_impl::Window;
-use crate::window::{CustomCursor, CustomCursorSource, Theme, Window as RootWindow};
+use crate::platform::ios::Idiom;
+use crate::platform_impl::platform::app_state::{EventLoopHandler, HandlePendingUserEvents};
+use crate::window::{CustomCursor, CustomCursorSource};
+
+use super::app_delegate::AppDelegate;
+use super::app_state::AppState;
+use super::{app_state, monitor, MonitorHandle};
 
 #[derive(Debug)]
-pub(crate) struct ActiveEventLoop {
+pub struct ActiveEventLoop {
     pub(super) mtm: MainThreadMarker,
 }
 
-impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
-        let event_loop_proxy = EventLoopProxy::new(AppState::get_mut(self.mtm).proxy_wake_up());
-        RootEventLoopProxy { event_loop_proxy }
+impl ActiveEventLoop {
+    pub fn create_custom_cursor(&self, source: CustomCursorSource) -> CustomCursor {
+        let _ = source.inner;
+        CustomCursor { inner: super::PlatformCustomCursor }
     }
 
-    fn create_window(
-        &self,
-        window_attributes: crate::window::WindowAttributes,
-    ) -> Result<RootWindow, OsError> {
-        let window = Window::new(self, window_attributes)?;
-        Ok(RootWindow { window })
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        monitor::uiscreens(self.mtm)
     }
 
-    fn create_custom_cursor(
-        &self,
-        _source: CustomCursorSource,
-    ) -> Result<CustomCursor, ExternalError> {
-        Err(ExternalError::NotSupported(NotSupportedError::new()))
-    }
-
-    fn available_monitors(&self) -> Box<dyn Iterator<Item = RootMonitorHandle>> {
-        Box::new(monitor::uiscreens(self.mtm).into_iter().map(|inner| RootMonitorHandle { inner }))
-    }
-
-    fn primary_monitor(&self) -> Option<crate::monitor::MonitorHandle> {
+    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
         #[allow(deprecated)]
-        let monitor = MonitorHandle::new(UIScreen::mainScreen(self.mtm));
-        Some(RootMonitorHandle { inner: monitor })
+        Some(MonitorHandle::new(UIScreen::mainScreen(self.mtm)))
     }
 
-    fn listen_device_events(&self, _allowed: DeviceEvents) {}
+    #[inline]
+    pub fn listen_device_events(&self, _allowed: DeviceEvents) {}
 
-    fn set_control_flow(&self, control_flow: ControlFlow) {
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::RawDisplayHandle::UiKit(rwh_05::UiKitDisplayHandle::empty())
+    }
+
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::RawDisplayHandle::UiKit(rwh_06::UiKitDisplayHandle::new()))
+    }
+
+    pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
         AppState::get_mut(self.mtm).set_control_flow(control_flow)
     }
 
-    fn system_theme(&self) -> Option<Theme> {
-        None
-    }
-
-    fn control_flow(&self) -> ControlFlow {
+    pub(crate) fn control_flow(&self) -> ControlFlow {
         AppState::get_mut(self.mtm).control_flow()
     }
 
-    fn exit(&self) {
+    pub(crate) fn exit(&self) {
         // https://developer.apple.com/library/archive/qa/qa1561/_index.html
         // it is not possible to quit an iOS app gracefully and programmatically
         tracing::warn!("`ControlFlow::Exit` ignored on iOS");
     }
 
-    fn exiting(&self) -> bool {
+    pub(crate) fn exiting(&self) -> bool {
         false
     }
 
-    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
-        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    #[cfg(feature = "rwh_06")]
-    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
-        self
+    pub(crate) fn owned_display_handle(&self) -> OwnedDisplayHandle {
+        OwnedDisplayHandle
     }
 }
 
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::RawDisplayHandle::UiKit(rwh_06::UiKitDisplayHandle::new());
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone)]
 pub(crate) struct OwnedDisplayHandle;
 
 impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::UiKitDisplayHandle::empty().into()
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_display_handle_rwh_06(
@@ -125,44 +108,34 @@ impl OwnedDisplayHandle {
     }
 }
 
-fn map_user_event<'a, A: ApplicationHandler + 'a>(
-    mut app: A,
-    proxy_wake_up: Arc<AtomicBool>,
-) -> impl FnMut(Event, &dyn RootActiveEventLoop) + 'a {
-    move |event, window_target| match event {
-        Event::NewEvents(cause) => app.new_events(window_target, cause),
-        Event::WindowEvent { window_id, event } => {
-            app.window_event(window_target, window_id, event)
-        },
-        Event::DeviceEvent { device_id, event } => {
-            app.device_event(window_target, device_id, event)
-        },
-        Event::UserWakeUp => {
-            if proxy_wake_up.swap(false, AtomicOrdering::Relaxed) {
-                app.proxy_wake_up(window_target);
+fn map_user_event<T: 'static>(
+    mut handler: impl FnMut(Event<T>, &RootActiveEventLoop),
+    receiver: mpsc::Receiver<T>,
+) -> impl FnMut(Event<HandlePendingUserEvents>, &RootActiveEventLoop) {
+    move |event, window_target| match event.map_nonuser_event() {
+        Ok(event) => (handler)(event, window_target),
+        Err(_) => {
+            for event in receiver.try_iter() {
+                (handler)(Event::UserEvent(event), window_target);
             }
         },
-        Event::Suspended => app.suspended(window_target),
-        Event::Resumed => app.resumed(window_target),
-        Event::CreateSurfaces => app.can_create_surfaces(window_target),
-        Event::AboutToWait => app.about_to_wait(window_target),
-        Event::LoopExiting => app.exiting(window_target),
-        Event::MemoryWarning => app.memory_warning(window_target),
     }
 }
 
-pub struct EventLoop {
+pub struct EventLoop<T: 'static> {
     mtm: MainThreadMarker,
-    window_target: ActiveEventLoop,
+    sender: Sender<T>,
+    receiver: Receiver<T>,
+    window_target: RootActiveEventLoop,
 }
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PlatformSpecificEventLoopAttributes {}
 
-impl EventLoop {
+impl<T: 'static> EventLoop<T> {
     pub(crate) fn new(
         _: &PlatformSpecificEventLoopAttributes,
-    ) -> Result<EventLoop, EventLoopError> {
+    ) -> Result<EventLoop<T>, EventLoopError> {
         let mtm = MainThreadMarker::new()
             .expect("On iOS, `EventLoop` must be created on the main thread");
 
@@ -175,13 +148,23 @@ impl EventLoop {
             SINGLETON_INIT = true;
         }
 
+        let (sender, receiver) = mpsc::channel();
+
         // this line sets up the main run loop before `UIApplicationMain`
         setup_control_flow_observers();
 
-        Ok(EventLoop { mtm, window_target: ActiveEventLoop { mtm } })
+        Ok(EventLoop {
+            mtm,
+            sender,
+            receiver,
+            window_target: RootActiveEventLoop { p: ActiveEventLoop { mtm }, _marker: PhantomData },
+        })
     }
 
-    pub fn run_app<A: ApplicationHandler>(self, app: A) -> ! {
+    pub fn run<F>(self, handler: F) -> !
+    where
+        F: FnMut(Event<T>, &RootActiveEventLoop),
+    {
         let application: Option<Retained<UIApplication>> =
             unsafe { msg_send_id![UIApplication::class(), sharedApplication] };
         assert!(
@@ -191,12 +174,12 @@ impl EventLoop {
              `EventLoop::run_app` calls `UIApplicationMain` on iOS",
         );
 
-        let handler = map_user_event(app, AppState::get_mut(self.mtm).proxy_wake_up());
+        let handler = map_user_event(handler, self.receiver);
 
         let handler = unsafe {
             std::mem::transmute::<
-                Box<dyn FnMut(Event, &dyn RootActiveEventLoop)>,
-                Box<dyn FnMut(Event, &dyn RootActiveEventLoop)>,
+                Box<dyn FnMut(Event<HandlePendingUserEvents>, &RootActiveEventLoop)>,
+                Box<dyn FnMut(Event<HandlePendingUserEvents>, &RootActiveEventLoop)>,
             >(Box::new(handler))
         };
 
@@ -224,26 +207,44 @@ impl EventLoop {
         unreachable!()
     }
 
-    pub fn window_target(&self) -> &dyn RootActiveEventLoop {
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy::new(self.sender.clone())
+    }
+
+    pub fn window_target(&self) -> &RootActiveEventLoop {
         &self.window_target
     }
 }
 
-pub struct EventLoopProxy {
-    proxy_wake_up: Arc<AtomicBool>,
-    source: CFRunLoopSourceRef,
-}
-
-unsafe impl Send for EventLoopProxy {}
-unsafe impl Sync for EventLoopProxy {}
-
-impl Clone for EventLoopProxy {
-    fn clone(&self) -> EventLoopProxy {
-        EventLoopProxy::new(self.proxy_wake_up.clone())
+// EventLoopExtIOS
+impl<T: 'static> EventLoop<T> {
+    pub fn idiom(&self) -> Idiom {
+        match UIDevice::currentDevice(self.mtm).userInterfaceIdiom() {
+            UIUserInterfaceIdiom::Unspecified => Idiom::Unspecified,
+            UIUserInterfaceIdiom::Phone => Idiom::Phone,
+            UIUserInterfaceIdiom::Pad => Idiom::Pad,
+            UIUserInterfaceIdiom::TV => Idiom::TV,
+            UIUserInterfaceIdiom::CarPlay => Idiom::CarPlay,
+            _ => Idiom::Unspecified,
+        }
     }
 }
 
-impl Drop for EventLoopProxy {
+pub struct EventLoopProxy<T> {
+    sender: Sender<T>,
+    source: CFRunLoopSourceRef,
+}
+
+unsafe impl<T: Send> Send for EventLoopProxy<T> {}
+unsafe impl<T: Send> Sync for EventLoopProxy<T> {}
+
+impl<T> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> EventLoopProxy<T> {
+        EventLoopProxy::new(self.sender.clone())
+    }
+}
+
+impl<T> Drop for EventLoopProxy<T> {
     fn drop(&mut self) {
         unsafe {
             CFRunLoopSourceInvalidate(self.source);
@@ -252,8 +253,8 @@ impl Drop for EventLoopProxy {
     }
 }
 
-impl EventLoopProxy {
-    fn new(proxy_wake_up: Arc<AtomicBool>) -> EventLoopProxy {
+impl<T> EventLoopProxy<T> {
+    fn new(sender: Sender<T>) -> EventLoopProxy<T> {
         unsafe {
             // just wake up the eventloop
             extern "C" fn event_loop_proxy_handler(_: *const c_void) {}
@@ -273,22 +274,24 @@ impl EventLoopProxy {
                 cancel: None,
                 perform: event_loop_proxy_handler,
             };
-            let source = CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::MAX - 1, &mut context);
+            let source =
+                CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context);
             CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);
             CFRunLoopWakeUp(rl);
 
-            EventLoopProxy { proxy_wake_up, source }
+            EventLoopProxy { sender, source }
         }
     }
 
-    pub fn wake_up(&self) {
-        self.proxy_wake_up.store(true, AtomicOrdering::Relaxed);
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.sender.send(event).map_err(|::std::sync::mpsc::SendError(x)| EventLoopClosed(x))?;
         unsafe {
             // let the main thread know there's a new event
             CFRunLoopSourceSignal(self.source);
             let rl = CFRunLoopGetMain();
             CFRunLoopWakeUp(rl);
         }
+        Ok(())
     }
 }
 
@@ -355,7 +358,7 @@ fn setup_control_flow_observers() {
             ptr::null_mut(),
             kCFRunLoopAfterWaiting,
             1, // repeat = true
-            CFIndex::MIN,
+            CFIndex::min_value(),
             control_flow_begin_handler,
             ptr::null_mut(),
         );
@@ -375,7 +378,7 @@ fn setup_control_flow_observers() {
             ptr::null_mut(),
             kCFRunLoopExit | kCFRunLoopBeforeWaiting,
             1, // repeat = true
-            CFIndex::MAX,
+            CFIndex::max_value(),
             control_flow_end_handler,
             ptr::null_mut(),
         );

src/platform_impl/ios/mod.rs

@@ -1,3 +1,4 @@
+#![cfg(ios_platform)]
 #![allow(clippy::let_unit_value)]
 
 mod app_delegate;
@@ -10,6 +11,8 @@ mod window;
 
 use std::fmt;
 
+use crate::event::DeviceId as RootDeviceId;
+
 pub(crate) use self::event_loop::{
     ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
     PlatformSpecificEventLoopAttributes,
@@ -19,7 +22,6 @@ pub(crate) use self::window::{PlatformSpecificWindowAttributes, Window, WindowId
 pub(crate) use crate::cursor::{
     NoCustomCursor as PlatformCustomCursor, NoCustomCursor as PlatformCustomCursorSource,
 };
-use crate::event::DeviceId as RootDeviceId;
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
 pub(crate) use crate::platform_impl::Fullscreen;
 
@@ -31,22 +33,13 @@ pub(crate) use crate::platform_impl::Fullscreen;
 pub struct DeviceId;
 
 impl DeviceId {
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         DeviceId
     }
 }
 
 pub(crate) const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId);
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FingerId(usize);
-
-impl FingerId {
-    pub const fn dummy() -> Self {
-        FingerId(0)
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct KeyEventExtra {}
 

src/platform_impl/ios/monitor.rs

@@ -1,7 +1,6 @@
 #![allow(clippy::unnecessary_cast)]
 
 use std::collections::{BTreeSet, VecDeque};
-use std::num::{NonZeroU16, NonZeroU32};
 use std::{fmt, hash, ptr};
 
 use objc2::mutability::IsRetainable;
@@ -10,9 +9,9 @@ use objc2::Message;
 use objc2_foundation::{run_on_main, MainThreadBound, MainThreadMarker, NSInteger};
 use objc2_ui_kit::{UIScreen, UIScreenMode};
 
-use super::app_state;
 use crate::dpi::{PhysicalPosition, PhysicalSize};
 use crate::monitor::VideoModeHandle as RootVideoModeHandle;
+use crate::platform_impl::platform::app_state;
 
 // Workaround for `MainThreadBound` implementing almost no traits
 #[derive(Debug)]
@@ -45,7 +44,8 @@ impl<T: IsRetainable + Message> Eq for MainThreadBoundDelegateImpls<T> {}
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct VideoModeHandle {
     pub(crate) size: (u32, u32),
-    pub(crate) refresh_rate_millihertz: Option<NonZeroU32>,
+    pub(crate) bit_depth: u16,
+    pub(crate) refresh_rate_millihertz: u32,
     screen_mode: MainThreadBoundDelegateImpls<UIScreenMode>,
     pub(crate) monitor: MonitorHandle,
 }
@@ -60,6 +60,7 @@ impl VideoModeHandle {
         let size = screen_mode.size();
         VideoModeHandle {
             size: (size.width as u32, size.height as u32),
+            bit_depth: 32,
             refresh_rate_millihertz,
             screen_mode: MainThreadBoundDelegateImpls(MainThreadBound::new(screen_mode, mtm)),
             monitor: MonitorHandle::new(uiscreen),
@@ -70,11 +71,11 @@ impl VideoModeHandle {
         self.size.into()
     }
 
-    pub fn bit_depth(&self) -> Option<NonZeroU16> {
-        None
+    pub fn bit_depth(&self) -> u16 {
+        self.bit_depth
     }
 
-    pub fn refresh_rate_millihertz(&self) -> Option<NonZeroU32> {
+    pub fn refresh_rate_millihertz(&self) -> u32 {
         self.refresh_rate_millihertz
     }
 
@@ -130,8 +131,10 @@ impl fmt::Debug for MonitorHandle {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("MonitorHandle")
             .field("name", &self.name())
+            .field("size", &self.size())
             .field("position", &self.position())
             .field("scale_factor", &self.scale_factor())
+            .field("refresh_rate_millihertz", &self.refresh_rate_millihertz())
             .finish_non_exhaustive()
     }
 }
@@ -161,23 +164,22 @@ impl MonitorHandle {
         })
     }
 
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
+    pub fn size(&self) -> PhysicalSize<u32> {
         let bounds = self.ui_screen.get_on_main(|ui_screen| ui_screen.nativeBounds());
-        Some((bounds.origin.x as f64, bounds.origin.y as f64).into())
+        PhysicalSize::new(bounds.size.width as u32, bounds.size.height as u32)
+    }
+
+    pub fn position(&self) -> PhysicalPosition<i32> {
+        let bounds = self.ui_screen.get_on_main(|ui_screen| ui_screen.nativeBounds());
+        (bounds.origin.x as f64, bounds.origin.y as f64).into()
     }
 
     pub fn scale_factor(&self) -> f64 {
         self.ui_screen.get_on_main(|ui_screen| ui_screen.nativeScale()) as f64
     }
 
-    pub fn current_video_mode(&self) -> Option<VideoModeHandle> {
-        Some(run_on_main(|mtm| {
-            VideoModeHandle::new(
-                self.ui_screen(mtm).clone(),
-                self.ui_screen(mtm).currentMode().unwrap(),
-                mtm,
-            )
-        }))
+    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
+        Some(self.ui_screen.get_on_main(|ui_screen| refresh_rate_millihertz(ui_screen)))
     }
 
     pub fn video_modes(&self) -> impl Iterator<Item = VideoModeHandle> {
@@ -212,7 +214,7 @@ impl MonitorHandle {
     }
 }
 
-fn refresh_rate_millihertz(uiscreen: &UIScreen) -> Option<NonZeroU32> {
+fn refresh_rate_millihertz(uiscreen: &UIScreen) -> u32 {
     let refresh_rate_millihertz: NSInteger = {
         let os_capabilities = app_state::os_capabilities();
         if os_capabilities.maximum_frames_per_second {
@@ -233,7 +235,7 @@ fn refresh_rate_millihertz(uiscreen: &UIScreen) -> Option<NonZeroU32> {
         }
     };
 
-    NonZeroU32::new(refresh_rate_millihertz as u32 * 1000)
+    refresh_rate_millihertz as u32 * 1000
 }
 
 pub fn uiscreens(mtm: MainThreadMarker) -> VecDeque<MonitorHandle> {

src/platform_impl/ios/view.rs

@@ -14,9 +14,9 @@ use objc2_ui_kit::{
 
 use super::app_state::{self, EventWrapper};
 use super::window::WinitUIWindow;
-use super::{FingerId, DEVICE_ID};
 use crate::dpi::PhysicalPosition;
-use crate::event::{Event, FingerId as RootFingerId, Force, Touch, TouchPhase, WindowEvent};
+use crate::event::{Event, Force, Touch, TouchPhase, WindowEvent};
+use crate::platform_impl::platform::DEVICE_ID;
 use crate::window::{WindowAttributes, WindowId as RootWindowId};
 
 pub struct WinitViewState {
@@ -480,7 +480,7 @@ impl WinitView {
             } else {
                 None
             };
-            let touch_id = touch as *const UITouch as usize;
+            let touch_id = touch as *const UITouch as u64;
             let phase = touch.phase();
             let phase = match phase {
                 UITouchPhase::Began => TouchPhase::Started,
@@ -502,7 +502,7 @@ impl WinitView {
                 window_id: RootWindowId(window.id()),
                 event: WindowEvent::Touch(Touch {
                     device_id: DEVICE_ID,
-                    finger_id: RootFingerId(FingerId(touch_id)),
+                    id: touch_id,
                     location: physical_location,
                     force,
                     phase,

src/platform_impl/ios/window.rs

@@ -17,13 +17,15 @@ use tracing::{debug, warn};
 use super::app_state::EventWrapper;
 use super::view::WinitView;
 use super::view_controller::WinitViewController;
-use super::{app_state, monitor, ActiveEventLoop, Fullscreen, MonitorHandle};
 use crate::cursor::Cursor;
 use crate::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{ExternalError, NotSupportedError, OsError as RootOsError};
 use crate::event::{Event, WindowEvent};
 use crate::icon::Icon;
 use crate::platform::ios::{ScreenEdge, StatusBarStyle, ValidOrientations};
+use crate::platform_impl::platform::{
+    app_state, monitor, ActiveEventLoop, Fullscreen, MonitorHandle,
+};
 use crate::window::{
     CursorGrabMode, ImePurpose, ResizeDirection, Theme, UserAttentionType, WindowAttributes,
     WindowButtons, WindowId as RootWindowId, WindowLevel,
@@ -403,6 +405,29 @@ impl Inner {
         self.window.id()
     }
 
+    #[cfg(feature = "rwh_04")]
+    pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
+        let mut window_handle = rwh_04::UiKitHandle::empty();
+        window_handle.ui_window = Retained::as_ptr(&self.window) as _;
+        window_handle.ui_view = Retained::as_ptr(&self.view) as _;
+        window_handle.ui_view_controller = Retained::as_ptr(&self.view_controller) as _;
+        rwh_04::RawWindowHandle::UiKit(window_handle)
+    }
+
+    #[cfg(feature = "rwh_05")]
+    pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
+        let mut window_handle = rwh_05::UiKitWindowHandle::empty();
+        window_handle.ui_window = Retained::as_ptr(&self.window) as _;
+        window_handle.ui_view = Retained::as_ptr(&self.view) as _;
+        window_handle.ui_view_controller = Retained::as_ptr(&self.view_controller) as _;
+        rwh_05::RawWindowHandle::UiKit(window_handle)
+    }
+
+    #[cfg(feature = "rwh_05")]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        rwh_05::RawDisplayHandle::UiKit(rwh_05::UiKitDisplayHandle::empty())
+    }
+
     #[cfg(feature = "rwh_06")]
     pub fn raw_window_handle_rwh_06(&self) -> rwh_06::RawWindowHandle {
         let mut window_handle = rwh_06::UiKitWindowHandle::new({
@@ -676,7 +701,7 @@ pub struct WindowId {
 }
 
 impl WindowId {
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         WindowId { window: std::ptr::null_mut() }
     }
 }
@@ -702,7 +727,7 @@ impl From<&AnyObject> for WindowId {
     }
 }
 
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default)]
 pub struct PlatformSpecificWindowAttributes {
     pub scale_factor: Option<f64>,
     pub valid_orientations: ValidOrientations,

src/platform_impl/linux/common/xkb/compose.rs

@@ -6,14 +6,13 @@ use std::ops::Deref;
 use std::os::unix::ffi::OsStringExt;
 use std::ptr::NonNull;
 
+use super::{XkbContext, XKBCH};
 use smol_str::SmolStr;
 use xkbcommon_dl::{
     xkb_compose_compile_flags, xkb_compose_feed_result, xkb_compose_state, xkb_compose_state_flags,
     xkb_compose_status, xkb_compose_table, xkb_keysym_t,
 };
 
-use super::{XkbContext, XKBCH};
-
 #[derive(Debug)]
 pub struct XkbComposeTable {
     table: NonNull<xkb_compose_table>,

src/platform_impl/linux/common/xkb/keymap.rs

@@ -6,13 +6,14 @@ use std::ptr::{self, NonNull};
 
 #[cfg(x11_platform)]
 use x11_dl::xlib_xcb::xcb_connection_t;
+#[cfg(wayland_platform)]
+use {memmap2::MmapOptions, std::os::unix::io::OwnedFd};
+
 use xkb::XKB_MOD_INVALID;
 use xkbcommon_dl::{
     self as xkb, xkb_keycode_t, xkb_keymap, xkb_keymap_compile_flags, xkb_keysym_t,
     xkb_layout_index_t, xkb_mod_index_t,
 };
-#[cfg(wayland_platform)]
-use {memmap2::MmapOptions, std::os::unix::io::OwnedFd};
 
 use crate::keyboard::{Key, KeyCode, KeyLocation, NamedKey, NativeKey, NativeKeyCode, PhysicalKey};
 #[cfg(x11_platform)]

src/platform_impl/linux/common/xkb/mod.rs

@@ -1,11 +1,12 @@
 use std::ops::Deref;
 use std::os::raw::c_char;
-#[cfg(wayland_platform)]
-use std::os::unix::io::OwnedFd;
 use std::ptr::{self, NonNull};
 use std::sync::atomic::{AtomicBool, Ordering};
 
+use crate::utils::Lazy;
 use smol_str::SmolStr;
+#[cfg(wayland_platform)]
+use std::os::unix::io::OwnedFd;
 use tracing::warn;
 use xkbcommon_dl::{
     self as xkb, xkb_compose_status, xkb_context, xkb_context_flags, xkbcommon_compose_handle,
@@ -17,16 +18,16 @@ use {x11_dl::xlib_xcb::xcb_connection_t, xkbcommon_dl::x11::xkbcommon_x11_handle
 use crate::event::{ElementState, KeyEvent};
 use crate::keyboard::{Key, KeyLocation};
 use crate::platform_impl::KeyEventExtra;
-use crate::utils::Lazy;
 
 mod compose;
 mod keymap;
 mod state;
 
 use compose::{ComposeStatus, XkbComposeState, XkbComposeTable};
+use keymap::XkbKeymap;
+
 #[cfg(x11_platform)]
 pub use keymap::raw_keycode_to_physicalkey;
-use keymap::XkbKeymap;
 pub use keymap::{physicalkey_to_scancode, scancode_to_physicalkey};
 pub use state::XkbState;
 

src/platform_impl/linux/mod.rs

@@ -4,7 +4,6 @@
 compile_error!("Please select a feature to build for unix: `x11`, `wayland`");
 
 use std::collections::VecDeque;
-use std::num::{NonZeroU16, NonZeroU32};
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 use std::sync::Arc;
 use std::time::Duration;
@@ -12,30 +11,32 @@ use std::{env, fmt};
 #[cfg(x11_platform)]
 use std::{ffi::CStr, mem::MaybeUninit, os::raw::*, sync::Mutex};
 
+#[cfg(x11_platform)]
+use crate::utils::Lazy;
 use smol_str::SmolStr;
 
-pub(crate) use self::common::xkb::{physicalkey_to_scancode, scancode_to_physicalkey};
 #[cfg(x11_platform)]
 use self::x11::{X11Error, XConnection, XError, XNotSupported};
-use crate::application::ApplicationHandler;
-pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
 use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
-use crate::error::{EventLoopError, ExternalError, NotSupportedError};
-use crate::event_loop::{ActiveEventLoop, AsyncRequestSerial};
+use crate::error::{EventLoopError, ExternalError, NotSupportedError, OsError as RootOsError};
+use crate::event_loop::{
+    ActiveEventLoop as RootELW, AsyncRequestSerial, ControlFlow, DeviceEvents, EventLoopClosed,
+};
 use crate::icon::Icon;
-pub(crate) use crate::icon::RgbaIcon as PlatformIcon;
 use crate::keyboard::Key;
 use crate::platform::pump_events::PumpStatus;
 #[cfg(x11_platform)]
 use crate::platform::x11::{WindowType as XWindowType, XlibErrorHook};
-pub(crate) use crate::platform_impl::Fullscreen;
-#[cfg(x11_platform)]
-use crate::utils::Lazy;
 use crate::window::{
-    ActivationToken, Cursor, CursorGrabMode, ImePurpose, ResizeDirection, Theme, UserAttentionType,
-    WindowButtons, WindowLevel,
+    ActivationToken, Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, ImePurpose,
+    ResizeDirection, Theme, UserAttentionType, WindowAttributes, WindowButtons, WindowLevel,
 };
 
+pub(crate) use self::common::xkb::{physicalkey_to_scancode, scancode_to_physicalkey};
+pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
+pub(crate) use crate::icon::RgbaIcon as PlatformIcon;
+pub(crate) use crate::platform_impl::Fullscreen;
+
 pub(crate) mod common;
 #[cfg(wayland_platform)]
 pub(crate) mod wayland;
@@ -68,7 +69,7 @@ impl ApplicationName {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
 pub struct PlatformSpecificWindowAttributes {
     pub name: Option<ApplicationName>,
     pub activation_token: Option<ActivationToken>,
@@ -76,7 +77,7 @@ pub struct PlatformSpecificWindowAttributes {
     pub x11: X11WindowAttributes,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
 #[cfg(x11_platform)]
 pub struct X11WindowAttributes {
     pub visual_id: Option<x11rb::protocol::xproto::Visualid>,
@@ -156,7 +157,7 @@ impl From<u64> for WindowId {
 }
 
 impl WindowId {
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         Self(0)
     }
 }
@@ -170,32 +171,15 @@ pub enum DeviceId {
 }
 
 impl DeviceId {
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         #[cfg(wayland_platform)]
-        return DeviceId::Wayland(wayland::DeviceId::dummy());
+        return DeviceId::Wayland(unsafe { wayland::DeviceId::dummy() });
         #[cfg(all(not(wayland_platform), x11_platform))]
-        return DeviceId::X(x11::DeviceId::dummy());
+        return DeviceId::X(unsafe { x11::DeviceId::dummy() });
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum FingerId {
-    #[cfg(x11_platform)]
-    X(x11::FingerId),
-    #[cfg(wayland_platform)]
-    Wayland(wayland::FingerId),
-}
-
-impl FingerId {
-    pub const fn dummy() -> Self {
-        #[cfg(wayland_platform)]
-        return FingerId::Wayland(wayland::FingerId::dummy());
-        #[cfg(all(not(wayland_platform), x11_platform))]
-        return FingerId::X(x11::FingerId::dummy());
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum MonitorHandle {
     #[cfg(x11_platform)]
     X(x11::MonitorHandle),
@@ -243,20 +227,25 @@ impl MonitorHandle {
     }
 
     #[inline]
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
+    pub fn size(&self) -> PhysicalSize<u32> {
+        x11_or_wayland!(match self; MonitorHandle(m) => m.size())
+    }
+
+    #[inline]
+    pub fn position(&self) -> PhysicalPosition<i32> {
         x11_or_wayland!(match self; MonitorHandle(m) => m.position())
     }
 
+    #[inline]
+    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
+        x11_or_wayland!(match self; MonitorHandle(m) => m.refresh_rate_millihertz())
+    }
+
     #[inline]
     pub fn scale_factor(&self) -> f64 {
         x11_or_wayland!(match self; MonitorHandle(m) => m.scale_factor() as _)
     }
 
-    #[inline]
-    pub fn current_video_mode(&self) -> Option<VideoModeHandle> {
-        x11_or_wayland!(match self; MonitorHandle(m) => m.current_video_mode())
-    }
-
     #[inline]
     pub fn video_modes(&self) -> Box<dyn Iterator<Item = VideoModeHandle>> {
         x11_or_wayland!(match self; MonitorHandle(m) => Box::new(m.video_modes()))
@@ -278,12 +267,12 @@ impl VideoModeHandle {
     }
 
     #[inline]
-    pub fn bit_depth(&self) -> Option<NonZeroU16> {
+    pub fn bit_depth(&self) -> u16 {
         x11_or_wayland!(match self; VideoModeHandle(m) => m.bit_depth())
     }
 
     #[inline]
-    pub fn refresh_rate_millihertz(&self) -> Option<NonZeroU32> {
+    pub fn refresh_rate_millihertz(&self) -> u32 {
         x11_or_wayland!(match self; VideoModeHandle(m) => m.refresh_rate_millihertz())
     }
 
@@ -294,6 +283,23 @@ impl VideoModeHandle {
 }
 
 impl Window {
+    #[inline]
+    pub(crate) fn new(
+        window_target: &ActiveEventLoop,
+        attribs: WindowAttributes,
+    ) -> Result<Self, RootOsError> {
+        match *window_target {
+            #[cfg(wayland_platform)]
+            ActiveEventLoop::Wayland(ref window_target) => {
+                wayland::Window::new(window_target, attribs).map(Window::Wayland)
+            },
+            #[cfg(x11_platform)]
+            ActiveEventLoop::X(ref window_target) => {
+                x11::Window::new(window_target, attribs).map(Window::X)
+            },
+        }
+    }
+
     pub(crate) fn maybe_queue_on_main(&self, f: impl FnOnce(&Self) + Send + 'static) {
         f(self)
     }
@@ -565,6 +571,24 @@ impl Window {
         Some(x11_or_wayland!(match self; Window(w) => w.primary_monitor()?; as MonitorHandle))
     }
 
+    #[cfg(feature = "rwh_04")]
+    #[inline]
+    pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
+        x11_or_wayland!(match self; Window(window) => window.raw_window_handle_rwh_04())
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
+        x11_or_wayland!(match self; Window(window) => window.raw_window_handle_rwh_05())
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        x11_or_wayland!(match self; Window(window) => window.raw_display_handle_rwh_05())
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
@@ -668,22 +692,27 @@ unsafe extern "C" fn x_error_callback(
     0
 }
 
-pub enum EventLoop {
+pub enum EventLoop<T: 'static> {
     #[cfg(wayland_platform)]
-    Wayland(Box<wayland::EventLoop>),
+    Wayland(Box<wayland::EventLoop<T>>),
     #[cfg(x11_platform)]
-    X(x11::EventLoop),
+    X(x11::EventLoop<T>),
 }
 
-#[derive(Clone)]
-pub enum EventLoopProxy {
+pub enum EventLoopProxy<T: 'static> {
     #[cfg(x11_platform)]
-    X(x11::EventLoopProxy),
+    X(x11::EventLoopProxy<T>),
     #[cfg(wayland_platform)]
-    Wayland(wayland::EventLoopProxy),
+    Wayland(wayland::EventLoopProxy<T>),
 }
 
-impl EventLoop {
+impl<T: 'static> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> Self {
+        x11_or_wayland!(match self; EventLoopProxy(proxy) => proxy.clone(); as EventLoopProxy)
+    }
+}
+
+impl<T: 'static> EventLoop<T> {
     pub(crate) fn new(
         attributes: &PlatformSpecificEventLoopAttributes,
     ) -> Result<Self, EventLoopError> {
@@ -742,12 +771,12 @@ impl EventLoop {
     }
 
     #[cfg(wayland_platform)]
-    fn new_wayland_any_thread() -> Result<EventLoop, EventLoopError> {
+    fn new_wayland_any_thread() -> Result<EventLoop<T>, EventLoopError> {
         wayland::EventLoop::new().map(|evlp| EventLoop::Wayland(Box::new(evlp)))
     }
 
     #[cfg(x11_platform)]
-    fn new_x11_any_thread() -> Result<EventLoop, EventLoopError> {
+    fn new_x11_any_thread() -> Result<EventLoop<T>, EventLoopError> {
         let xconn = match X11_BACKEND.lock().unwrap().as_ref() {
             Ok(xconn) => xconn.clone(),
             Err(_) => return Err(EventLoopError::NotSupported(NotSupportedError::new())),
@@ -766,45 +795,153 @@ impl EventLoop {
         }
     }
 
-    pub fn run_app<A: ApplicationHandler>(self, app: A) -> Result<(), EventLoopError> {
-        x11_or_wayland!(match self; EventLoop(evlp) => evlp.run_app(app))
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        x11_or_wayland!(match self; EventLoop(evlp) => evlp.create_proxy(); as EventLoopProxy)
     }
 
-    pub fn run_app_on_demand<A: ApplicationHandler>(
-        &mut self,
-        app: A,
-    ) -> Result<(), EventLoopError> {
-        x11_or_wayland!(match self; EventLoop(evlp) => evlp.run_app_on_demand(app))
+    pub fn run<F>(mut self, callback: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(crate::event::Event<T>, &RootELW),
+    {
+        self.run_on_demand(callback)
     }
 
-    pub fn pump_app_events<A: ApplicationHandler>(
-        &mut self,
-        timeout: Option<Duration>,
-        app: A,
-    ) -> PumpStatus {
-        x11_or_wayland!(match self; EventLoop(evlp) => evlp.pump_app_events(timeout, app))
+    pub fn run_on_demand<F>(&mut self, callback: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(crate::event::Event<T>, &RootELW),
+    {
+        x11_or_wayland!(match self; EventLoop(evlp) => evlp.run_on_demand(callback))
     }
 
-    pub fn window_target(&self) -> &dyn ActiveEventLoop {
+    pub fn pump_events<F>(&mut self, timeout: Option<Duration>, callback: F) -> PumpStatus
+    where
+        F: FnMut(crate::event::Event<T>, &RootELW),
+    {
+        x11_or_wayland!(match self; EventLoop(evlp) => evlp.pump_events(timeout, callback))
+    }
+
+    pub fn window_target(&self) -> &crate::event_loop::ActiveEventLoop {
         x11_or_wayland!(match self; EventLoop(evlp) => evlp.window_target())
     }
 }
 
-impl AsFd for EventLoop {
+impl<T> AsFd for EventLoop<T> {
     fn as_fd(&self) -> BorrowedFd<'_> {
         x11_or_wayland!(match self; EventLoop(evlp) => evlp.as_fd())
     }
 }
 
-impl AsRawFd for EventLoop {
+impl<T> AsRawFd for EventLoop<T> {
     fn as_raw_fd(&self) -> RawFd {
         x11_or_wayland!(match self; EventLoop(evlp) => evlp.as_raw_fd())
     }
 }
 
-impl EventLoopProxy {
-    pub fn wake_up(&self) {
-        x11_or_wayland!(match self; EventLoopProxy(proxy) => proxy.wake_up())
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        x11_or_wayland!(match self; EventLoopProxy(proxy) => proxy.send_event(event))
+    }
+}
+
+pub enum ActiveEventLoop {
+    #[cfg(wayland_platform)]
+    Wayland(wayland::ActiveEventLoop),
+    #[cfg(x11_platform)]
+    X(x11::ActiveEventLoop),
+}
+
+impl ActiveEventLoop {
+    #[inline]
+    pub fn is_wayland(&self) -> bool {
+        match *self {
+            #[cfg(wayland_platform)]
+            ActiveEventLoop::Wayland(_) => true,
+            #[cfg(x11_platform)]
+            _ => false,
+        }
+    }
+
+    pub fn create_custom_cursor(&self, cursor: CustomCursorSource) -> CustomCursor {
+        x11_or_wayland!(match self; ActiveEventLoop(evlp) => evlp.create_custom_cursor(cursor))
+    }
+
+    #[inline]
+    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
+        match *self {
+            #[cfg(wayland_platform)]
+            ActiveEventLoop::Wayland(ref evlp) => {
+                evlp.available_monitors().map(MonitorHandle::Wayland).collect()
+            },
+            #[cfg(x11_platform)]
+            ActiveEventLoop::X(ref evlp) => {
+                evlp.available_monitors().map(MonitorHandle::X).collect()
+            },
+        }
+    }
+
+    #[inline]
+    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
+        Some(
+            x11_or_wayland!(match self; ActiveEventLoop(evlp) => evlp.primary_monitor()?; as MonitorHandle),
+        )
+    }
+
+    #[inline]
+    pub fn listen_device_events(&self, allowed: DeviceEvents) {
+        x11_or_wayland!(match self; Self(evlp) => evlp.listen_device_events(allowed))
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        x11_or_wayland!(match self; Self(evlp) => evlp.raw_display_handle_rwh_05())
+    }
+
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        x11_or_wayland!(match self; Self(evlp) => evlp.raw_display_handle_rwh_06())
+    }
+
+    pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
+        x11_or_wayland!(match self; Self(evlp) => evlp.set_control_flow(control_flow))
+    }
+
+    pub(crate) fn control_flow(&self) -> ControlFlow {
+        x11_or_wayland!(match self; Self(evlp) => evlp.control_flow())
+    }
+
+    pub(crate) fn clear_exit(&self) {
+        x11_or_wayland!(match self; Self(evlp) => evlp.clear_exit())
+    }
+
+    pub(crate) fn exit(&self) {
+        x11_or_wayland!(match self; Self(evlp) => evlp.exit())
+    }
+
+    pub(crate) fn exiting(&self) -> bool {
+        x11_or_wayland!(match self; Self(evlp) => evlp.exiting())
+    }
+
+    pub(crate) fn owned_display_handle(&self) -> OwnedDisplayHandle {
+        match self {
+            #[cfg(x11_platform)]
+            Self::X(conn) => OwnedDisplayHandle::X(conn.x_connection().clone()),
+            #[cfg(wayland_platform)]
+            Self::Wayland(conn) => OwnedDisplayHandle::Wayland(conn.connection.clone()),
+        }
+    }
+
+    #[allow(dead_code)]
+    fn set_exit_code(&self, code: i32) {
+        x11_or_wayland!(match self; Self(evlp) => evlp.set_exit_code(code))
+    }
+
+    #[allow(dead_code)]
+    fn exit_code(&self) -> Option<i32> {
+        x11_or_wayland!(match self; Self(evlp) => evlp.exit_code())
     }
 }
 
@@ -818,6 +955,29 @@ pub(crate) enum OwnedDisplayHandle {
 }
 
 impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        match self {
+            #[cfg(x11_platform)]
+            Self::X(xconn) => {
+                let mut xlib_handle = rwh_05::XlibDisplayHandle::empty();
+                xlib_handle.display = xconn.display.cast();
+                xlib_handle.screen = xconn.default_screen_index() as _;
+                xlib_handle.into()
+            },
+
+            #[cfg(wayland_platform)]
+            Self::Wayland(conn) => {
+                use sctk::reexports::client::Proxy;
+
+                let mut wayland_handle = rwh_05::WaylandDisplayHandle::empty();
+                wayland_handle.display = conn.display().id().as_ptr() as *mut _;
+                wayland_handle.into()
+            },
+        }
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_display_handle_rwh_06(
@@ -846,21 +1006,6 @@ impl OwnedDisplayHandle {
     }
 }
 
-impl PartialEq for OwnedDisplayHandle {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            #[cfg(x11_platform)]
-            (Self::X(this), Self::X(other)) => Arc::as_ptr(this).eq(&Arc::as_ptr(other)),
-            #[cfg(wayland_platform)]
-            (Self::Wayland(this), Self::Wayland(other)) => this.eq(other),
-            #[cfg(all(x11_platform, wayland_platform))]
-            _ => false,
-        }
-    }
-}
-
-impl Eq for OwnedDisplayHandle {}
-
 /// Returns the minimum `Option<Duration>`, taking into account that `None`
 /// equates to an infinite timeout, not a zero timeout (so can't just use
 /// `Option::min`)

src/platform_impl/linux/wayland/event_loop/mod.rs

@@ -1,10 +1,11 @@
 //! The event-loop routines.
 
-use std::any::Any;
 use std::cell::{Cell, RefCell};
 use std::io::Result as IOResult;
+use std::marker::PhantomData;
 use std::mem;
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
+use std::rc::Rc;
 use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
@@ -13,16 +14,17 @@ use sctk::reexports::calloop::Error as CalloopError;
 use sctk::reexports::calloop_wayland_source::WaylandSource;
 use sctk::reexports::client::{globals, Connection, QueueHandle};
 
-use crate::application::ApplicationHandler;
 use crate::cursor::OnlyCursorImage;
 use crate::dpi::LogicalSize;
-use crate::error::{EventLoopError, ExternalError, OsError as RootOsError};
+use crate::error::{EventLoopError, OsError as RootOsError};
 use crate::event::{Event, InnerSizeWriter, StartCause, WindowEvent};
 use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents};
 use crate::platform::pump_events::PumpStatus;
 use crate::platform_impl::platform::min_timeout;
-use crate::platform_impl::{OsError, PlatformCustomCursor};
-use crate::window::{CustomCursor as RootCustomCursor, CustomCursorSource, Theme};
+use crate::platform_impl::{
+    ActiveEventLoop as PlatformActiveEventLoop, OsError, PlatformCustomCursor,
+};
+use crate::window::{CustomCursor as RootCustomCursor, CustomCursorSource};
 
 mod proxy;
 pub mod sink;
@@ -37,7 +39,7 @@ use super::{logical_to_physical_rounded, DeviceId, WaylandError, WindowId};
 type WaylandDispatcher = calloop::Dispatcher<'static, WaylandSource<WinitState>, WinitState>;
 
 /// The Wayland event loop.
-pub struct EventLoop {
+pub struct EventLoop<T: 'static> {
     /// Has `run` or `run_on_demand` been called or a call to `pump_events` that starts the loop
     loop_running: bool,
 
@@ -45,6 +47,14 @@ pub struct EventLoop {
     compositor_updates: Vec<WindowCompositorUpdate>,
     window_ids: Vec<WindowId>,
 
+    /// Sender of user events.
+    user_events_sender: calloop::channel::Sender<T>,
+
+    // XXX can't remove RefCell out of here, unless we can plumb generics into the `Window`, which
+    // we don't really want, since it'll break public API by a lot.
+    /// Pending events from the user.
+    pending_user_events: Rc<RefCell<Vec<T>>>,
+
     /// The Wayland dispatcher to has raw access to the queue when needed, such as
     /// when creating a new window.
     wayland_dispatcher: WaylandDispatcher,
@@ -53,15 +63,15 @@ pub struct EventLoop {
     connection: Connection,
 
     /// Event loop window target.
-    pub(crate) active_event_loop: ActiveEventLoop,
+    window_target: RootActiveEventLoop,
 
     // XXX drop after everything else, just to be safe.
     /// Calloop's event loop.
     event_loop: calloop::EventLoop<'static, WinitState>,
 }
 
-impl EventLoop {
-    pub fn new() -> Result<EventLoop, EventLoopError> {
+impl<T: 'static> EventLoop<T> {
+    pub fn new() -> Result<EventLoop<T>, EventLoopError> {
         macro_rules! map_err {
             ($e:expr, $err:expr) => {
                 $e.map_err(|error| os_error!($err(error).into()))
@@ -104,12 +114,16 @@ impl EventLoop {
         )?;
 
         // Setup the user proxy.
-        let (ping, ping_source) = calloop::ping::make_ping().unwrap();
+        let pending_user_events = Rc::new(RefCell::new(Vec::new()));
+        let pending_user_events_clone = pending_user_events.clone();
+        let (user_events_sender, user_events_channel) = calloop::channel::channel();
         let result = event_loop
             .handle()
-            .insert_source(ping_source, move |_, _, winit_state: &mut WinitState| {
-                winit_state.dispatched_events = true;
-                winit_state.proxy_wake_up = true;
+            .insert_source(user_events_channel, move |event, _, winit_state: &mut WinitState| {
+                if let calloop::channel::Event::Msg(msg) = event {
+                    winit_state.dispatched_events = true;
+                    pending_user_events_clone.borrow_mut().push(msg);
+                }
             })
             .map_err(|error| error.error);
         map_err!(result, WaylandError::Calloop)?;
@@ -130,16 +144,14 @@ impl EventLoop {
             .map_err(|error| error.error);
         map_err!(result, WaylandError::Calloop)?;
 
-        let active_event_loop = ActiveEventLoop {
+        let window_target = ActiveEventLoop {
             connection: connection.clone(),
             wayland_dispatcher: wayland_dispatcher.clone(),
             event_loop_awakener,
-            event_loop_proxy: EventLoopProxy::new(ping),
             queue_handle,
             control_flow: Cell::new(ControlFlow::default()),
             exit: Cell::new(None),
             state: RefCell::new(winit_state),
-            wayland_callback: Default::default(),
         };
 
         let event_loop = Self {
@@ -149,24 +161,24 @@ impl EventLoop {
             window_ids: Vec::new(),
             connection,
             wayland_dispatcher,
+            user_events_sender,
+            pending_user_events,
             event_loop,
-            active_event_loop,
+            window_target: RootActiveEventLoop {
+                p: PlatformActiveEventLoop::Wayland(window_target),
+                _marker: PhantomData,
+            },
         };
 
         Ok(event_loop)
     }
 
-    pub fn run_app<A: ApplicationHandler>(mut self, app: A) -> Result<(), EventLoopError> {
-        self.run_app_on_demand(app)
-    }
-
-    pub fn run_app_on_demand<A: ApplicationHandler>(
-        &mut self,
-        mut app: A,
-    ) -> Result<(), EventLoopError> {
-        self.active_event_loop.clear_exit();
+    pub fn run_on_demand<F>(&mut self, mut event_handler: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(Event<T>, &RootActiveEventLoop),
+    {
         let exit = loop {
-            match self.pump_app_events(None, &mut app) {
+            match self.pump_events(None, &mut event_handler) {
                 PumpStatus::Exit(0) => {
                     break Ok(());
                 },
@@ -188,27 +200,26 @@ impl EventLoop {
         exit
     }
 
-    pub fn pump_app_events<A: ApplicationHandler>(
-        &mut self,
-        timeout: Option<Duration>,
-        mut app: A,
-    ) -> PumpStatus {
+    pub fn pump_events<F>(&mut self, timeout: Option<Duration>, mut callback: F) -> PumpStatus
+    where
+        F: FnMut(Event<T>, &RootActiveEventLoop),
+    {
         if !self.loop_running {
             self.loop_running = true;
 
             // Run the initial loop iteration.
-            self.single_iteration(&mut app, StartCause::Init);
+            self.single_iteration(&mut callback, StartCause::Init);
         }
 
         // Consider the possibility that the `StartCause::Init` iteration could
         // request to Exit.
         if !self.exiting() {
-            self.poll_events_with_timeout(timeout, &mut app);
+            self.poll_events_with_timeout(timeout, &mut callback);
         }
         if let Some(code) = self.exit_code() {
             self.loop_running = false;
 
-            app.exiting(&self.active_event_loop);
+            callback(Event::LoopExiting, self.window_target());
 
             PumpStatus::Exit(code)
         } else {
@@ -216,11 +227,10 @@ impl EventLoop {
         }
     }
 
-    fn poll_events_with_timeout<A: ApplicationHandler>(
-        &mut self,
-        mut timeout: Option<Duration>,
-        app: &mut A,
-    ) {
+    pub fn poll_events_with_timeout<F>(&mut self, mut timeout: Option<Duration>, mut callback: F)
+    where
+        F: FnMut(Event<T>, &RootActiveEventLoop),
+    {
         let cause = loop {
             let start = Instant::now();
 
@@ -282,10 +292,13 @@ impl EventLoop {
             break cause;
         };
 
-        self.single_iteration(app, cause);
+        self.single_iteration(&mut callback, cause);
     }
 
-    fn single_iteration<A: ApplicationHandler>(&mut self, app: &mut A, cause: StartCause) {
+    fn single_iteration<F>(&mut self, callback: &mut F, cause: StartCause)
+    where
+        F: FnMut(Event<T>, &RootActiveEventLoop),
+    {
         // NOTE currently just indented to simplify the diff
 
         // We retain these grow-only scratch buffers as part of the EventLoop
@@ -296,21 +309,18 @@ impl EventLoop {
         let mut buffer_sink = std::mem::take(&mut self.buffer_sink);
         let mut window_ids = std::mem::take(&mut self.window_ids);
 
-        app.new_events(&self.active_event_loop, cause);
+        callback(Event::NewEvents(cause), &self.window_target);
 
-        if let Some(callback) = self.active_event_loop.wayland_callback.get() {
-            callback(app);
-        }
-
-        // NB: For consistency all platforms must call `can_create_surfaces` even though Wayland
-        // applications don't themselves have a formal surface destroy/create lifecycle.
+        // NB: For consistency all platforms must emit a 'resumed' event even though Wayland
+        // applications don't themselves have a formal suspend/resume lifecycle.
         if cause == StartCause::Init {
-            app.can_create_surfaces(&self.active_event_loop);
+            callback(Event::Resumed, &self.window_target);
         }
 
-        // Indicate user wake up.
-        if self.with_state(|state| mem::take(&mut state.proxy_wake_up)) {
-            app.proxy_wake_up(&self.active_event_loop);
+        // Handle pending user events. We don't need back buffer, since we can't dispatch
+        // user events indirectly via callback to the user.
+        for user_event in self.pending_user_events.borrow_mut().drain(..) {
+            callback(Event::UserEvent(user_event), &self.window_target);
         }
 
         // Drain the pending compositor updates.
@@ -331,13 +341,18 @@ impl EventLoop {
                 let old_physical_size = physical_size;
 
                 let new_inner_size = Arc::new(Mutex::new(physical_size));
-                let root_window_id = crate::window::WindowId(window_id);
-                let event = WindowEvent::ScaleFactorChanged {
-                    scale_factor,
-                    inner_size_writer: InnerSizeWriter::new(Arc::downgrade(&new_inner_size)),
-                };
-
-                app.window_event(&self.active_event_loop, root_window_id, event);
+                callback(
+                    Event::WindowEvent {
+                        window_id: crate::window::WindowId(window_id),
+                        event: WindowEvent::ScaleFactorChanged {
+                            scale_factor,
+                            inner_size_writer: InnerSizeWriter::new(Arc::downgrade(
+                                &new_inner_size,
+                            )),
+                        },
+                    },
+                    &self.window_target,
+                );
 
                 let physical_size = *new_inner_size.lock().unwrap();
                 drop(new_inner_size);
@@ -380,14 +395,23 @@ impl EventLoop {
                     size
                 });
 
-                let window_id = crate::window::WindowId(window_id);
-                let event = WindowEvent::Resized(physical_size);
-                app.window_event(&self.active_event_loop, window_id, event);
+                callback(
+                    Event::WindowEvent {
+                        window_id: crate::window::WindowId(window_id),
+                        event: WindowEvent::Resized(physical_size),
+                    },
+                    &self.window_target,
+                );
             }
 
             if compositor_update.close_window {
-                let window_id = crate::window::WindowId(window_id);
-                app.window_event(&self.active_event_loop, window_id, WindowEvent::CloseRequested);
+                callback(
+                    Event::WindowEvent {
+                        window_id: crate::window::WindowId(window_id),
+                        event: WindowEvent::CloseRequested,
+                    },
+                    &self.window_target,
+                );
             }
         }
 
@@ -396,15 +420,8 @@ impl EventLoop {
             buffer_sink.append(&mut state.window_events_sink.lock().unwrap());
         });
         for event in buffer_sink.drain() {
-            match event {
-                Event::WindowEvent { window_id, event } => {
-                    app.window_event(&self.active_event_loop, window_id, event)
-                },
-                Event::DeviceEvent { device_id, event } => {
-                    app.device_event(&self.active_event_loop, device_id, event)
-                },
-                _ => unreachable!("event which is neither device nor window event."),
-            }
+            let event = event.map_nonuser_event().unwrap();
+            callback(event, &self.window_target);
         }
 
         // Handle non-synthetic events.
@@ -412,15 +429,8 @@ impl EventLoop {
             buffer_sink.append(&mut state.events_sink);
         });
         for event in buffer_sink.drain() {
-            match event {
-                Event::WindowEvent { window_id, event } => {
-                    app.window_event(&self.active_event_loop, window_id, event)
-                },
-                Event::DeviceEvent { device_id, event } => {
-                    app.device_event(&self.active_event_loop, device_id, event)
-                },
-                _ => unreachable!("event which is neither device nor window event."),
-            }
+            let event = event.map_nonuser_event().unwrap();
+            callback(event, &self.window_target);
         }
 
         // Collect the window ids
@@ -456,8 +466,10 @@ impl EventLoop {
             });
 
             if let Some(event) = event {
-                let window_id = crate::window::WindowId(*window_id);
-                app.window_event(&self.active_event_loop, window_id, event);
+                callback(
+                    Event::WindowEvent { window_id: crate::window::WindowId(*window_id), event },
+                    &self.window_target,
+                );
             }
         }
 
@@ -467,7 +479,7 @@ impl EventLoop {
         });
 
         // This is always the last event we dispatch before poll again
-        app.about_to_wait(&self.active_event_loop);
+        callback(Event::AboutToWait, &self.window_target);
 
         // Update the window frames and schedule redraws.
         let mut wake_up = false;
@@ -496,7 +508,13 @@ impl EventLoop {
         // If the user draws from the `AboutToWait` this is likely not required, however
         // we can't do much about it.
         if wake_up {
-            self.active_event_loop.event_loop_awakener.ping();
+            match &self.window_target.p {
+                PlatformActiveEventLoop::Wayland(window_target) => {
+                    window_target.event_loop_awakener.ping();
+                },
+                #[cfg(x11_platform)]
+                PlatformActiveEventLoop::X(_) => unreachable!(),
+            }
         }
 
         std::mem::swap(&mut self.compositor_updates, &mut compositor_updates);
@@ -505,17 +523,31 @@ impl EventLoop {
     }
 
     #[inline]
-    pub fn window_target(&self) -> &dyn RootActiveEventLoop {
-        &self.active_event_loop
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy::new(self.user_events_sender.clone())
+    }
+
+    #[inline]
+    pub fn window_target(&self) -> &RootActiveEventLoop {
+        &self.window_target
     }
 
     fn with_state<'a, U: 'a, F: FnOnce(&'a mut WinitState) -> U>(&'a mut self, callback: F) -> U {
-        let state = self.active_event_loop.state.get_mut();
+        let state = match &mut self.window_target.p {
+            PlatformActiveEventLoop::Wayland(window_target) => window_target.state.get_mut(),
+            #[cfg(x11_platform)]
+            _ => unreachable!(),
+        };
+
         callback(state)
     }
 
     fn loop_dispatch<D: Into<Option<std::time::Duration>>>(&mut self, timeout: D) -> IOResult<()> {
-        let state = &mut self.active_event_loop.state.get_mut();
+        let state = match &mut self.window_target.p {
+            PlatformActiveEventLoop::Wayland(window_target) => window_target.state.get_mut(),
+            #[cfg(feature = "x11")]
+            _ => unreachable!(),
+        };
 
         self.event_loop.dispatch(timeout, state).map_err(|error| {
             tracing::error!("Error dispatching event loop: {}", error);
@@ -524,7 +556,11 @@ impl EventLoop {
     }
 
     fn roundtrip(&mut self) -> Result<usize, RootOsError> {
-        let state = &mut self.active_event_loop.state.get_mut();
+        let state = match &mut self.window_target.p {
+            PlatformActiveEventLoop::Wayland(window_target) => window_target.state.get_mut(),
+            #[cfg(feature = "x11")]
+            _ => unreachable!(),
+        };
 
         let mut wayland_source = self.wayland_dispatcher.as_source_mut();
         let event_queue = wayland_source.queue();
@@ -534,38 +570,35 @@ impl EventLoop {
     }
 
     fn control_flow(&self) -> ControlFlow {
-        self.active_event_loop.control_flow()
+        self.window_target.p.control_flow()
     }
 
     fn exiting(&self) -> bool {
-        self.active_event_loop.exiting()
+        self.window_target.p.exiting()
     }
 
     fn set_exit_code(&self, code: i32) {
-        self.active_event_loop.set_exit_code(code)
+        self.window_target.p.set_exit_code(code)
     }
 
     fn exit_code(&self) -> Option<i32> {
-        self.active_event_loop.exit_code()
+        self.window_target.p.exit_code()
     }
 }
 
-impl AsFd for EventLoop {
+impl<T> AsFd for EventLoop<T> {
     fn as_fd(&self) -> BorrowedFd<'_> {
         self.event_loop.as_fd()
     }
 }
 
-impl AsRawFd for EventLoop {
+impl<T> AsRawFd for EventLoop<T> {
     fn as_raw_fd(&self) -> RawFd {
         self.event_loop.as_raw_fd()
     }
 }
 
 pub struct ActiveEventLoop {
-    /// Event loop proxy
-    event_loop_proxy: EventLoopProxy,
-
     /// The event loop wakeup source.
     pub event_loop_awakener: calloop::ping::Ping,
 
@@ -587,119 +620,67 @@ pub struct ActiveEventLoop {
 
     /// Connection to the wayland server.
     pub connection: Connection,
-
-    pub wayland_callback: Cell<Option<fn(&mut dyn ApplicationHandler)>>,
-}
-
-impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
-        crate::event_loop::EventLoopProxy {
-            event_loop_proxy: crate::platform_impl::EventLoopProxy::Wayland(
-                self.event_loop_proxy.clone(),
-            ),
-        }
-    }
-
-    fn set_control_flow(&self, control_flow: ControlFlow) {
-        self.control_flow.set(control_flow)
-    }
-
-    fn control_flow(&self) -> ControlFlow {
-        self.control_flow.get()
-    }
-
-    fn exit(&self) {
-        self.exit.set(Some(0))
-    }
-
-    fn exiting(&self) -> bool {
-        self.exit.get().is_some()
-    }
-
-    #[inline]
-    fn listen_device_events(&self, _allowed: DeviceEvents) {}
-
-    fn create_custom_cursor(
-        &self,
-        cursor: CustomCursorSource,
-    ) -> Result<RootCustomCursor, ExternalError> {
-        Ok(RootCustomCursor {
-            inner: PlatformCustomCursor::Wayland(OnlyCursorImage(Arc::from(cursor.inner.0))),
-        })
-    }
-
-    #[inline]
-    fn system_theme(&self) -> Option<Theme> {
-        None
-    }
-
-    fn create_window(
-        &self,
-        window_attributes: crate::window::WindowAttributes,
-    ) -> Result<crate::window::Window, RootOsError> {
-        let window = crate::platform_impl::wayland::Window::new(self, window_attributes)?;
-        let window = crate::platform_impl::Window::Wayland(window);
-        Ok(crate::window::Window { window })
-    }
-
-    fn available_monitors(&self) -> Box<dyn Iterator<Item = crate::monitor::MonitorHandle>> {
-        Box::new(
-            self.state
-                .borrow()
-                .output_state
-                .outputs()
-                .map(crate::platform_impl::wayland::output::MonitorHandle::new)
-                .map(crate::platform_impl::MonitorHandle::Wayland)
-                .map(|inner| crate::monitor::MonitorHandle { inner }),
-        )
-    }
-
-    fn primary_monitor(&self) -> Option<crate::monitor::MonitorHandle> {
-        // There's no primary monitor on Wayland.
-        None
-    }
-
-    fn owned_display_handle(&self) -> crate::event_loop::OwnedDisplayHandle {
-        crate::event_loop::OwnedDisplayHandle {
-            platform: crate::platform_impl::OwnedDisplayHandle::Wayland(self.connection.clone()),
-        }
-    }
-
-    #[inline(always)]
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    #[cfg(feature = "rwh_06")]
-    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
-        self
-    }
 }
 
 impl ActiveEventLoop {
-    fn clear_exit(&self) {
+    pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
+        self.control_flow.set(control_flow)
+    }
+
+    pub(crate) fn control_flow(&self) -> ControlFlow {
+        self.control_flow.get()
+    }
+
+    pub(crate) fn exit(&self) {
+        self.exit.set(Some(0))
+    }
+
+    pub(crate) fn clear_exit(&self) {
         self.exit.set(None)
     }
 
-    fn set_exit_code(&self, code: i32) {
+    pub(crate) fn exiting(&self) -> bool {
+        self.exit.get().is_some()
+    }
+
+    pub(crate) fn set_exit_code(&self, code: i32) {
         self.exit.set(Some(code))
     }
 
-    fn exit_code(&self) -> Option<i32> {
+    pub(crate) fn exit_code(&self) -> Option<i32> {
         self.exit.get()
     }
-}
 
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
+    #[inline]
+    pub fn listen_device_events(&self, _allowed: DeviceEvents) {}
+
+    pub(crate) fn create_custom_cursor(&self, cursor: CustomCursorSource) -> RootCustomCursor {
+        RootCustomCursor {
+            inner: PlatformCustomCursor::Wayland(OnlyCursorImage(Arc::from(cursor.inner.0))),
+        }
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
         use sctk::reexports::client::Proxy;
 
-        let raw = rwh_06::WaylandDisplayHandle::new({
+        let mut display_handle = rwh_05::WaylandDisplayHandle::empty();
+        display_handle.display = self.connection.display().id().as_ptr() as *mut _;
+        rwh_05::RawDisplayHandle::Wayland(display_handle)
+    }
+
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        use sctk::reexports::client::Proxy;
+
+        Ok(rwh_06::WaylandDisplayHandle::new({
             let ptr = self.connection.display().id().as_ptr();
             std::ptr::NonNull::new(ptr as *mut _).expect("wl_display should never be null")
-        });
-
-        Ok(unsafe { rwh_06::DisplayHandle::borrow_raw(raw.into()) })
+        })
+        .into())
     }
 }

src/platform_impl/linux/wayland/event_loop/proxy.rs

@@ -1,19 +1,28 @@
 //! An event loop proxy.
 
-use sctk::reexports::calloop::ping::Ping;
+use std::sync::mpsc::SendError;
+
+use sctk::reexports::calloop::channel::Sender;
+
+use crate::event_loop::EventLoopClosed;
 
 /// A handle that can be sent across the threads and used to wake up the `EventLoop`.
-#[derive(Clone)]
-pub struct EventLoopProxy {
-    ping: Ping,
+pub struct EventLoopProxy<T: 'static> {
+    user_events_sender: Sender<T>,
 }
 
-impl EventLoopProxy {
-    pub fn new(ping: Ping) -> Self {
-        Self { ping }
-    }
-
-    pub fn wake_up(&self) {
-        self.ping.ping();
+impl<T: 'static> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> Self {
+        EventLoopProxy { user_events_sender: self.user_events_sender.clone() }
+    }
+}
+
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn new(user_events_sender: Sender<T>) -> Self {
+        Self { user_events_sender }
+    }
+
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.user_events_sender.send(event).map_err(|SendError(error)| EventLoopClosed(error))
     }
 }

src/platform_impl/linux/wayland/event_loop/sink.rs

@@ -2,16 +2,17 @@
 
 use std::vec::Drain;
 
-use super::{DeviceId, WindowId};
 use crate::event::{DeviceEvent, DeviceId as RootDeviceId, Event, WindowEvent};
 use crate::platform_impl::platform::DeviceId as PlatformDeviceId;
 use crate::window::WindowId as RootWindowId;
 
+use super::{DeviceId, WindowId};
+
 /// An event loop's sink to deliver events from the Wayland event callbacks
 /// to the winit's user.
 #[derive(Default)]
 pub struct EventSink {
-    pub(crate) window_events: Vec<Event>,
+    pub window_events: Vec<Event<()>>,
 }
 
 impl EventSink {
@@ -46,7 +47,7 @@ impl EventSink {
     }
 
     #[inline]
-    pub(crate) fn drain(&mut self) -> Drain<'_, Event> {
+    pub fn drain(&mut self) -> Drain<'_, Event<()>> {
         self.window_events.drain(..)
     }
 }

src/platform_impl/linux/wayland/mod.rs

@@ -1,18 +1,20 @@
+#![cfg(wayland_platform)]
+
 //! Winit's Wayland backend.
 
 use std::fmt::Display;
 use std::sync::Arc;
 
-pub use event_loop::{ActiveEventLoop, EventLoop, EventLoopProxy};
-pub use output::{MonitorHandle, VideoModeHandle};
 use sctk::reexports::client::globals::{BindError, GlobalError};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{self, ConnectError, DispatchError, Proxy};
-pub use window::Window;
 
 pub(super) use crate::cursor::OnlyCursorImage as CustomCursor;
 use crate::dpi::{LogicalSize, PhysicalSize};
 pub use crate::platform_impl::platform::{OsError, WindowId};
+pub use event_loop::{ActiveEventLoop, EventLoop, EventLoopProxy};
+pub use output::{MonitorHandle, VideoModeHandle};
+pub use window::Window;
 
 mod event_loop;
 mod output;
@@ -66,20 +68,11 @@ impl From<WaylandError> for OsError {
 pub struct DeviceId;
 
 impl DeviceId {
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         DeviceId
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FingerId(i32);
-
-impl FingerId {
-    pub const fn dummy() -> Self {
-        FingerId(0)
-    }
-}
-
 /// Get the WindowId out of the surface.
 #[inline]
 fn make_wid(surface: &WlSurface) -> WindowId {

src/platform_impl/linux/wayland/output.rs

@@ -1,12 +1,26 @@
-use std::num::{NonZeroU16, NonZeroU32};
-
-use sctk::output::{Mode, OutputData};
 use sctk::reexports::client::protocol::wl_output::WlOutput;
 use sctk::reexports::client::Proxy;
 
+use sctk::output::OutputData;
+
 use crate::dpi::{LogicalPosition, PhysicalPosition, PhysicalSize};
 use crate::platform_impl::platform::VideoModeHandle as PlatformVideoModeHandle;
 
+use super::event_loop::ActiveEventLoop;
+
+impl ActiveEventLoop {
+    #[inline]
+    pub fn available_monitors(&self) -> impl Iterator<Item = MonitorHandle> {
+        self.state.borrow().output_state.outputs().map(MonitorHandle::new)
+    }
+
+    #[inline]
+    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
+        // There's no primary monitor on Wayland.
+        None
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct MonitorHandle {
     pub(crate) proxy: WlOutput,
@@ -31,9 +45,23 @@ impl MonitorHandle {
     }
 
     #[inline]
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
+    pub fn size(&self) -> PhysicalSize<u32> {
         let output_data = self.proxy.data::<OutputData>().unwrap();
-        Some(output_data.with_output_info(|info| {
+        let dimensions = output_data.with_output_info(|info| {
+            info.modes.iter().find_map(|mode| mode.current.then_some(mode.dimensions))
+        });
+
+        match dimensions {
+            Some((width, height)) => (width as u32, height as u32),
+            _ => (0, 0),
+        }
+        .into()
+    }
+
+    #[inline]
+    pub fn position(&self) -> PhysicalPosition<i32> {
+        let output_data = self.proxy.data::<OutputData>().unwrap();
+        output_data.with_output_info(|info| {
             info.logical_position.map_or_else(
                 || {
                     LogicalPosition::<i32>::from(info.location)
@@ -44,7 +72,15 @@ impl MonitorHandle {
                         .to_physical(info.scale_factor as f64)
                 },
             )
-        }))
+        })
+    }
+
+    #[inline]
+    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
+        let output_data = self.proxy.data::<OutputData>().unwrap();
+        output_data.with_output_info(|info| {
+            info.modes.iter().find_map(|mode| mode.current.then_some(mode.refresh_rate as u32))
+        })
     }
 
     #[inline]
@@ -53,18 +89,6 @@ impl MonitorHandle {
         output_data.scale_factor()
     }
 
-    #[inline]
-    pub fn current_video_mode(&self) -> Option<PlatformVideoModeHandle> {
-        let output_data = self.proxy.data::<OutputData>().unwrap();
-        output_data.with_output_info(|info| {
-            let mode = info.modes.iter().find(|mode| mode.current).cloned();
-
-            mode.map(|mode| {
-                PlatformVideoModeHandle::Wayland(VideoModeHandle::new(self.clone(), mode))
-            })
-        })
-    }
-
     #[inline]
     pub fn video_modes(&self) -> impl Iterator<Item = PlatformVideoModeHandle> {
         let output_data = self.proxy.data::<OutputData>().unwrap();
@@ -73,7 +97,12 @@ impl MonitorHandle {
         let monitor = self.clone();
 
         modes.into_iter().map(move |mode| {
-            PlatformVideoModeHandle::Wayland(VideoModeHandle::new(monitor.clone(), mode))
+            PlatformVideoModeHandle::Wayland(VideoModeHandle {
+                size: (mode.dimensions.0 as u32, mode.dimensions.1 as u32).into(),
+                refresh_rate_millihertz: mode.refresh_rate as u32,
+                bit_depth: 32,
+                monitor: monitor.clone(),
+            })
         })
     }
 }
@@ -107,31 +136,24 @@ impl std::hash::Hash for MonitorHandle {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct VideoModeHandle {
     pub(crate) size: PhysicalSize<u32>,
-    pub(crate) refresh_rate_millihertz: Option<NonZeroU32>,
+    pub(crate) bit_depth: u16,
+    pub(crate) refresh_rate_millihertz: u32,
     pub(crate) monitor: MonitorHandle,
 }
 
 impl VideoModeHandle {
-    fn new(monitor: MonitorHandle, mode: Mode) -> Self {
-        VideoModeHandle {
-            size: (mode.dimensions.0 as u32, mode.dimensions.1 as u32).into(),
-            refresh_rate_millihertz: NonZeroU32::new(mode.refresh_rate as u32),
-            monitor: monitor.clone(),
-        }
-    }
-
     #[inline]
     pub fn size(&self) -> PhysicalSize<u32> {
         self.size
     }
 
     #[inline]
-    pub fn bit_depth(&self) -> Option<NonZeroU16> {
-        None
+    pub fn bit_depth(&self) -> u16 {
+        self.bit_depth
     }
 
     #[inline]
-    pub fn refresh_rate_millihertz(&self) -> Option<NonZeroU32> {
+    pub fn refresh_rate_millihertz(&self) -> u32 {
         self.refresh_rate_millihertz
     }
 

src/platform_impl/linux/wayland/seat/keyboard/mod.rs

@@ -5,17 +5,20 @@ use std::time::Duration;
 
 use calloop::timer::{TimeoutAction, Timer};
 use calloop::{LoopHandle, RegistrationToken};
+use tracing::warn;
+
 use sctk::reexports::client::protocol::wl_keyboard::{
     Event as WlKeyboardEvent, KeyState as WlKeyState, KeymapFormat as WlKeymapFormat, WlKeyboard,
 };
 use sctk::reexports::client::protocol::wl_seat::WlSeat;
 use sctk::reexports::client::{Connection, Dispatch, Proxy, QueueHandle, WEnum};
-use tracing::warn;
 
 use crate::event::{ElementState, WindowEvent};
 use crate::keyboard::ModifiersState;
+
 use crate::platform_impl::common::xkb::Context;
 use crate::platform_impl::wayland::event_loop::sink::EventSink;
+use crate::platform_impl::wayland::seat::WinitSeatState;
 use crate::platform_impl::wayland::state::WinitState;
 use crate::platform_impl::wayland::{self, DeviceId, WindowId};
 
@@ -30,17 +33,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
     ) {
         let seat_state = match state.seats.get_mut(&data.seat.id()) {
             Some(seat_state) => seat_state,
-            None => {
-                warn!("Received keyboard event {event:?} without seat");
-                return;
-            },
-        };
-        let keyboard_state = match seat_state.keyboard_state.as_mut() {
-            Some(keyboard_state) => keyboard_state,
-            None => {
-                warn!("Received keyboard event {event:?} without keyboard");
-                return;
-            },
+            None => return,
         };
 
         match event {
@@ -50,7 +43,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                         warn!("non-xkb compatible keymap")
                     },
                     WlKeymapFormat::XkbV1 => {
-                        let context = &mut keyboard_state.xkb_context;
+                        let context = &mut seat_state.keyboard_state.as_mut().unwrap().xkb_context;
                         context.set_keymap_from_fd(fd, size as usize);
                     },
                     _ => unreachable!(),
@@ -74,6 +67,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                 };
 
                 // Drop the repeat, if there were any.
+                let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
                 keyboard_state.current_repeat = None;
                 if let Some(token) = keyboard_state.repeat_token.take() {
                     keyboard_state.loop_handle.remove(token);
@@ -99,6 +93,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
 
                 // NOTE: we should drop the repeat regardless whethere it was for the present
                 // window of for the window which just went gone.
+                let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
                 keyboard_state.current_repeat = None;
                 if let Some(token) = keyboard_state.repeat_token.take() {
                     keyboard_state.loop_handle.remove(token);
@@ -133,7 +128,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                 let key = key + 8;
 
                 key_input(
-                    keyboard_state,
+                    seat_state,
                     &mut state.events_sink,
                     data,
                     key,
@@ -141,6 +136,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                     false,
                 );
 
+                let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
                 let delay = match keyboard_state.repeat_info {
                     RepeatInfo::Repeat { delay, .. } => delay,
                     RepeatInfo::Disable => return,
@@ -167,25 +163,18 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                         state.dispatched_events = true;
 
                         let data = wl_keyboard.data::<KeyboardData>().unwrap();
-                        let seat_state = match state.seats.get_mut(&data.seat.id()) {
-                            Some(seat_state) => seat_state,
-                            None => return TimeoutAction::Drop,
-                        };
+                        let seat_state = state.seats.get_mut(&data.seat.id()).unwrap();
 
-                        let keyboard_state = match seat_state.keyboard_state.as_mut() {
-                            Some(keyboard_state) => keyboard_state,
-                            None => return TimeoutAction::Drop,
-                        };
-
-                        // NOTE: The removed on event source is batched, but key change to `None`
-                        // is instant.
-                        let repeat_keycode = match keyboard_state.current_repeat {
-                            Some(repeat_keycode) => repeat_keycode,
-                            None => return TimeoutAction::Drop,
-                        };
+                        // NOTE: The removed on event source is batched, but key change to
+                        // `None` is instant.
+                        let repeat_keycode =
+                            match seat_state.keyboard_state.as_ref().unwrap().current_repeat {
+                                Some(repeat_keycode) => repeat_keycode,
+                                None => return TimeoutAction::Drop,
+                            };
 
                         key_input(
-                            keyboard_state,
+                            seat_state,
                             &mut state.events_sink,
                             data,
                             repeat_keycode,
@@ -194,7 +183,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                         );
 
                         // NOTE: the gap could change dynamically while repeat is going.
-                        match keyboard_state.repeat_info {
+                        match seat_state.keyboard_state.as_ref().unwrap().repeat_info {
                             RepeatInfo::Repeat { gap, .. } => TimeoutAction::ToDuration(gap),
                             RepeatInfo::Disable => TimeoutAction::Drop,
                         }
@@ -205,7 +194,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                 let key = key + 8;
 
                 key_input(
-                    keyboard_state,
+                    seat_state,
                     &mut state.events_sink,
                     data,
                     key,
@@ -213,6 +202,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                     false,
                 );
 
+                let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
                 if keyboard_state.repeat_info != RepeatInfo::Disable
                     && keyboard_state.xkb_context.keymap_mut().unwrap().key_repeats(key)
                     && Some(key) == keyboard_state.current_repeat
@@ -226,7 +216,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
             WlKeyboardEvent::Modifiers {
                 mods_depressed, mods_latched, mods_locked, group, ..
             } => {
-                let xkb_context = &mut keyboard_state.xkb_context;
+                let xkb_context = &mut seat_state.keyboard_state.as_mut().unwrap().xkb_context;
                 let xkb_state = match xkb_context.state_mut() {
                     Some(state) => state,
                     None => return,
@@ -250,6 +240,7 @@ impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
                 );
             },
             WlKeyboardEvent::RepeatInfo { rate, delay } => {
+                let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
                 keyboard_state.repeat_info = if rate == 0 {
                     // Stop the repeat once we get a disable event.
                     keyboard_state.current_repeat = None;
@@ -357,7 +348,7 @@ impl KeyboardData {
 }
 
 fn key_input(
-    keyboard_state: &mut KeyboardState,
+    seat_state: &mut WinitSeatState,
     event_sink: &mut EventSink,
     data: &KeyboardData,
     keycode: u32,
@@ -369,6 +360,8 @@ fn key_input(
         None => return,
     };
 
+    let keyboard_state = seat_state.keyboard_state.as_mut().unwrap();
+
     let device_id = crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(DeviceId));
     if let Some(mut key_context) = keyboard_state.xkb_context.key_context() {
         let event = key_context.process_key_event(keycode, state, repeat);

src/platform_impl/linux/wayland/seat/mod.rs

@@ -3,15 +3,16 @@
 use std::sync::Arc;
 
 use ahash::AHashMap;
+
 use sctk::reexports::client::backend::ObjectId;
 use sctk::reexports::client::protocol::wl_seat::WlSeat;
 use sctk::reexports::client::protocol::wl_touch::WlTouch;
 use sctk::reexports::client::{Connection, Proxy, QueueHandle};
 use sctk::reexports::protocols::wp::relative_pointer::zv1::client::zwp_relative_pointer_v1::ZwpRelativePointerV1;
 use sctk::reexports::protocols::wp::text_input::zv3::client::zwp_text_input_v3::ZwpTextInputV3;
+
 use sctk::seat::pointer::{ThemeSpec, ThemedPointer};
 use sctk::seat::{Capability as SeatCapability, SeatHandler, SeatState};
-use tracing::warn;
 
 use crate::event::WindowEvent;
 use crate::keyboard::ModifiersState;
@@ -22,11 +23,12 @@ mod pointer;
 mod text_input;
 mod touch;
 
-use keyboard::{KeyboardData, KeyboardState};
 pub use pointer::relative_pointer::RelativePointerState;
 pub use pointer::{PointerConstraintsState, WinitPointerData, WinitPointerDataExt};
-use text_input::TextInputData;
 pub use text_input::{TextInputState, ZwpTextInputV3Ext};
+
+use keyboard::{KeyboardData, KeyboardState};
+use text_input::TextInputData;
 use touch::TouchPoint;
 
 #[derive(Debug, Default)]
@@ -74,13 +76,7 @@ impl SeatHandler for WinitState {
         seat: WlSeat,
         capability: SeatCapability,
     ) {
-        let seat_state = match self.seats.get_mut(&seat.id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_seat::new_capability for unknown seat");
-                return;
-            },
-        };
+        let seat_state = self.seats.get_mut(&seat.id()).unwrap();
 
         match capability {
             SeatCapability::Touch if seat_state.touch.is_none() => {
@@ -143,13 +139,7 @@ impl SeatHandler for WinitState {
         seat: WlSeat,
         capability: SeatCapability,
     ) {
-        let seat_state = match self.seats.get_mut(&seat.id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_seat::remove_capability for unknown seat");
-                return;
-            },
-        };
+        let seat_state = self.seats.get_mut(&seat.id()).unwrap();
 
         if let Some(text_input) = seat_state.text_input.take() {
             text_input.destroy();

src/platform_impl/linux/wayland/seat/pointer/mod.rs

@@ -4,8 +4,6 @@ use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use tracing::warn;
-
 use sctk::reexports::client::delegate_dispatch;
 use sctk::reexports::client::protocol::wl_pointer::WlPointer;
 use sctk::reexports::client::protocol::wl_seat::WlSeat;
@@ -43,21 +41,7 @@ impl PointerHandler for WinitState {
         events: &[PointerEvent],
     ) {
         let seat = pointer.winit_data().seat();
-        let seat_state = match self.seats.get(&seat.id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received pointer event without seat");
-                return;
-            },
-        };
-
-        let themed_pointer = match seat_state.pointer.as_ref() {
-            Some(pointer) => pointer,
-            None => {
-                warn!("Received pointer event without pointer");
-                return;
-            },
-        };
+        let seat_state = self.seats.get(&seat.id()).unwrap();
 
         let device_id = crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(DeviceId));
 
@@ -94,7 +78,9 @@ impl PointerHandler for WinitState {
                         event.position.0,
                         event.position.1,
                     ) {
-                        let _ = themed_pointer.set_cursor(connection, icon);
+                        if let Some(pointer) = seat_state.pointer.as_ref() {
+                            let _ = pointer.set_cursor(connection, icon);
+                        }
                     }
                 },
                 PointerEventKind::Leave { .. } if parent_surface != surface => {
@@ -127,7 +113,9 @@ impl PointerHandler for WinitState {
                     self.events_sink
                         .push_window_event(WindowEvent::CursorEntered { device_id }, window_id);
 
-                    window.pointer_entered(Arc::downgrade(themed_pointer));
+                    if let Some(pointer) = seat_state.pointer.as_ref().map(Arc::downgrade) {
+                        window.pointer_entered(pointer);
+                    }
 
                     // Set the currently focused surface.
                     pointer.winit_data().inner.lock().unwrap().surface = Some(window_id);
@@ -138,7 +126,9 @@ impl PointerHandler for WinitState {
                     );
                 },
                 PointerEventKind::Leave { .. } => {
-                    window.pointer_left(Arc::downgrade(themed_pointer));
+                    if let Some(pointer) = seat_state.pointer.as_ref().map(Arc::downgrade) {
+                        window.pointer_left(pointer);
+                    }
 
                     // Remove the active surface.
                     pointer.winit_data().inner.lock().unwrap().surface = None;
@@ -195,13 +185,13 @@ impl PointerHandler for WinitState {
                     // Mice events have both pixel and discrete delta's at the same time. So prefer
                     // the descrite values if they are present.
                     let delta = if has_discrete_scroll {
-                        // NOTE: Wayland sign convention is the inverse of winit.
+                        // XXX Wayland sign convention is the inverse of winit.
                         MouseScrollDelta::LineDelta(
                             (-horizontal.discrete) as f32,
                             (-vertical.discrete) as f32,
                         )
                     } else {
-                        // NOTE: Wayland sign convention is the inverse of winit.
+                        // XXX Wayland sign convention is the inverse of winit.
                         MouseScrollDelta::PixelDelta(
                             LogicalPosition::new(-horizontal.absolute, -vertical.absolute)
                                 .to_physical(scale_factor),

src/platform_impl/linux/wayland/seat/pointer/relative_pointer.rs

@@ -66,6 +66,12 @@ impl Dispatch<ZwpRelativePointerV1, GlobalData, WinitState> for RelativePointerS
             },
             _ => return,
         };
+        state
+            .events_sink
+            .push_device_event(DeviceEvent::Motion { axis: 0, value: dx_unaccel }, super::DeviceId);
+        state
+            .events_sink
+            .push_device_event(DeviceEvent::Motion { axis: 1, value: dy_unaccel }, super::DeviceId);
         state.events_sink.push_device_event(
             DeviceEvent::MouseMotion { delta: (dx_unaccel, dy_unaccel) },
             super::DeviceId,

src/platform_impl/linux/wayland/seat/text_input/mod.rs

@@ -1,9 +1,11 @@
 use std::ops::Deref;
 
 use sctk::globals::GlobalData;
+use sctk::reexports::client::{Connection, Proxy, QueueHandle};
+
 use sctk::reexports::client::globals::{BindError, GlobalList};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
-use sctk::reexports::client::{delegate_dispatch, Connection, Dispatch, Proxy, QueueHandle};
+use sctk::reexports::client::{delegate_dispatch, Dispatch};
 use sctk::reexports::protocols::wp::text_input::zv3::client::zwp_text_input_manager_v3::ZwpTextInputManagerV3;
 use sctk::reexports::protocols::wp::text_input::zv3::client::zwp_text_input_v3::{
     ContentHint, ContentPurpose, Event as TextInputEvent, ZwpTextInputV3,

src/platform_impl/linux/wayland/seat/touch/mod.rs

@@ -4,13 +4,14 @@ use sctk::reexports::client::protocol::wl_seat::WlSeat;
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::protocol::wl_touch::WlTouch;
 use sctk::reexports::client::{Connection, Proxy, QueueHandle};
+
 use sctk::seat::touch::{TouchData, TouchHandler};
-use tracing::warn;
 
 use crate::dpi::LogicalPosition;
 use crate::event::{Touch, TouchPhase, WindowEvent};
+
 use crate::platform_impl::wayland::state::WinitState;
-use crate::platform_impl::wayland::{self, DeviceId, FingerId};
+use crate::platform_impl::wayland::{self, DeviceId};
 
 impl TouchHandler for WinitState {
     fn down(
@@ -30,16 +31,11 @@ impl TouchHandler for WinitState {
             None => return,
         };
 
-        let seat_state = match self.seats.get_mut(&touch.seat().id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_touch::down without seat");
-                return;
-            },
-        };
+        let location = LogicalPosition::<f64>::from(position);
+
+        let seat_state = self.seats.get_mut(&touch.seat().id()).unwrap();
 
         // Update the state of the point.
-        let location = LogicalPosition::<f64>::from(position);
         seat_state.touch_map.insert(id, TouchPoint { surface, location });
 
         self.events_sink.push_window_event(
@@ -50,9 +46,7 @@ impl TouchHandler for WinitState {
                 phase: TouchPhase::Started,
                 location: location.to_physical(scale_factor),
                 force: None,
-                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
-                    FingerId(id),
-                )),
+                id: id as u64,
             }),
             window_id,
         );
@@ -67,13 +61,7 @@ impl TouchHandler for WinitState {
         _: u32,
         id: i32,
     ) {
-        let seat_state = match self.seats.get_mut(&touch.seat().id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_touch::up without seat");
-                return;
-            },
-        };
+        let seat_state = self.seats.get_mut(&touch.seat().id()).unwrap();
 
         // Remove the touch point.
         let touch_point = match seat_state.touch_map.remove(&id) {
@@ -95,9 +83,7 @@ impl TouchHandler for WinitState {
                 phase: TouchPhase::Ended,
                 location: touch_point.location.to_physical(scale_factor),
                 force: None,
-                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
-                    FingerId(id),
-                )),
+                id: id as u64,
             }),
             window_id,
         );
@@ -112,13 +98,7 @@ impl TouchHandler for WinitState {
         id: i32,
         position: (f64, f64),
     ) {
-        let seat_state = match self.seats.get_mut(&touch.seat().id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_touch::motion without seat");
-                return;
-            },
-        };
+        let seat_state = self.seats.get_mut(&touch.seat().id()).unwrap();
 
         // Remove the touch point.
         let touch_point = match seat_state.touch_map.get_mut(&id) {
@@ -142,22 +122,14 @@ impl TouchHandler for WinitState {
                 phase: TouchPhase::Moved,
                 location: touch_point.location.to_physical(scale_factor),
                 force: None,
-                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
-                    FingerId(id),
-                )),
+                id: id as u64,
             }),
             window_id,
         );
     }
 
     fn cancel(&mut self, _: &Connection, _: &QueueHandle<Self>, touch: &WlTouch) {
-        let seat_state = match self.seats.get_mut(&touch.seat().id()) {
-            Some(seat_state) => seat_state,
-            None => {
-                warn!("Received wl_touch::cancel without seat");
-                return;
-            },
-        };
+        let seat_state = self.seats.get_mut(&touch.seat().id()).unwrap();
 
         for (id, touch_point) in seat_state.touch_map.drain() {
             let window_id = wayland::make_wid(&touch_point.surface);
@@ -176,9 +148,7 @@ impl TouchHandler for WinitState {
                     phase: TouchPhase::Cancelled,
                     location,
                     force: None,
-                    finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
-                        FingerId(id),
-                    )),
+                    id: id as u64,
                 }),
                 window_id,
             );

src/platform_impl/linux/wayland/state.rs

@@ -3,14 +3,16 @@ use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex};
 
 use ahash::AHashMap;
-use sctk::compositor::{CompositorHandler, CompositorState};
-use sctk::output::{OutputHandler, OutputState};
+
 use sctk::reexports::calloop::LoopHandle;
 use sctk::reexports::client::backend::ObjectId;
 use sctk::reexports::client::globals::GlobalList;
 use sctk::reexports::client::protocol::wl_output::WlOutput;
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{Connection, Proxy, QueueHandle};
+
+use sctk::compositor::{CompositorHandler, CompositorState};
+use sctk::output::{OutputHandler, OutputState};
 use sctk::registry::{ProvidesRegistryState, RegistryState};
 use sctk::seat::pointer::ThemedPointer;
 use sctk::seat::SeatState;
@@ -113,9 +115,6 @@ pub struct WinitState {
     /// Whether we have dispatched events to the user thus we want to
     /// send `AboutToWait` and normally wakeup the user.
     pub dispatched_events: bool,
-
-    /// Whether the user initiated a wake up.
-    pub proxy_wake_up: bool,
 }
 
 impl WinitState {
@@ -193,7 +192,6 @@ impl WinitState {
             loop_handle,
             // Make it true by default.
             dispatched_events: true,
-            proxy_wake_up: false,
         })
     }
 
@@ -341,30 +339,12 @@ impl CompositorHandler for WinitState {
         &mut self,
         _: &Connection,
         _: &QueueHandle<Self>,
-        _: &WlSurface,
+        _: &wayland_client::protocol::wl_surface::WlSurface,
         _: wayland_client::protocol::wl_output::Transform,
     ) {
         // TODO(kchibisov) we need to expose it somehow in winit.
     }
 
-    fn surface_enter(
-        &mut self,
-        _: &Connection,
-        _: &QueueHandle<Self>,
-        _: &WlSurface,
-        _: &WlOutput,
-    ) {
-    }
-
-    fn surface_leave(
-        &mut self,
-        _: &Connection,
-        _: &QueueHandle<Self>,
-        _: &WlSurface,
-        _: &WlOutput,
-    ) {
-    }
-
     fn scale_factor_changed(
         &mut self,
         _: &Connection,

src/platform_impl/linux/wayland/types/cursor.rs

@@ -1,4 +1,5 @@
 use cursor_icon::CursorIcon;
+
 use sctk::reexports::client::protocol::wl_shm::Format;
 use sctk::shm::slot::{Buffer, SlotPool};
 

src/platform_impl/linux/wayland/types/kwin_blur.rs

@@ -1,12 +1,13 @@
 //! Handling of KDE-compatible blur.
 
-use sctk::globals::GlobalData;
 use sctk::reexports::client::globals::{BindError, GlobalList};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{delegate_dispatch, Connection, Dispatch, Proxy, QueueHandle};
 use wayland_protocols_plasma::blur::client::org_kde_kwin_blur::OrgKdeKwinBlur;
 use wayland_protocols_plasma::blur::client::org_kde_kwin_blur_manager::OrgKdeKwinBlurManager;
 
+use sctk::globals::GlobalData;
+
 use crate::platform_impl::wayland::state::WinitState;
 
 /// KWin blur manager.

src/platform_impl/linux/wayland/types/wp_fractional_scaling.rs

@@ -1,6 +1,5 @@
 //! Handling of the fractional scaling.
 
-use sctk::globals::GlobalData;
 use sctk::reexports::client::globals::{BindError, GlobalList};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{delegate_dispatch, Connection, Dispatch, Proxy, QueueHandle};
@@ -9,6 +8,8 @@ use sctk::reexports::protocols::wp::fractional_scale::v1::client::wp_fractional_
     Event as FractionalScalingEvent, WpFractionalScaleV1,
 };
 
+use sctk::globals::GlobalData;
+
 use crate::platform_impl::wayland::state::WinitState;
 
 /// The scaling factor denominator.

src/platform_impl/linux/wayland/types/wp_viewporter.rs

@@ -1,12 +1,13 @@
 //! Handling of the wp-viewporter.
 
-use sctk::globals::GlobalData;
 use sctk::reexports::client::globals::{BindError, GlobalList};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{delegate_dispatch, Connection, Dispatch, Proxy, QueueHandle};
 use sctk::reexports::protocols::wp::viewporter::client::wp_viewport::WpViewport;
 use sctk::reexports::protocols::wp::viewporter::client::wp_viewporter::WpViewporter;
 
+use sctk::globals::GlobalData;
+
 use crate::platform_impl::wayland::state::WinitState;
 
 /// Viewporter.

src/platform_impl/linux/wayland/types/xdg_activation.rs

@@ -3,7 +3,6 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Weak;
 
-use sctk::globals::GlobalData;
 use sctk::reexports::client::globals::{BindError, GlobalList};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{delegate_dispatch, Connection, Dispatch, Proxy, QueueHandle};
@@ -12,6 +11,8 @@ use sctk::reexports::protocols::xdg::activation::v1::client::xdg_activation_toke
 };
 use sctk::reexports::protocols::xdg::activation::v1::client::xdg_activation_v1::XdgActivationV1;
 
+use sctk::globals::GlobalData;
+
 use crate::event_loop::AsyncRequestSerial;
 use crate::platform_impl::wayland::state::WinitState;
 use crate::platform_impl::WindowId;

src/platform_impl/linux/wayland/window/mod.rs

@@ -3,20 +3,17 @@
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 
-use sctk::compositor::{CompositorState, Region, SurfaceData};
 use sctk::reexports::client::protocol::wl_display::WlDisplay;
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::{Proxy, QueueHandle};
+
+use sctk::compositor::{CompositorState, Region, SurfaceData};
 use sctk::reexports::protocols::xdg::activation::v1::client::xdg_activation_v1::XdgActivationV1;
 use sctk::shell::xdg::window::{Window as SctkWindow, WindowDecorations};
 use sctk::shell::WaylandSurface;
+
 use tracing::warn;
 
-use super::event_loop::sink::EventSink;
-use super::output::MonitorHandle;
-use super::state::WinitState;
-use super::types::xdg_activation::XdgActivationTokenData;
-use super::{ActiveEventLoop, WaylandError, WindowId};
 use crate::dpi::{LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{ExternalError, NotSupportedError, OsError as RootOsError};
 use crate::event::{Ime, WindowEvent};
@@ -29,6 +26,12 @@ use crate::window::{
     WindowAttributes, WindowButtons, WindowLevel,
 };
 
+use super::event_loop::sink::EventSink;
+use super::output::MonitorHandle;
+use super::state::WinitState;
+use super::types::xdg_activation::XdgActivationTokenData;
+use super::{ActiveEventLoop, WaylandError, WindowId};
+
 pub(crate) mod state;
 
 pub use state::WindowState;
@@ -628,6 +631,31 @@ impl Window {
         None
     }
 
+    #[cfg(feature = "rwh_04")]
+    #[inline]
+    pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
+        let mut window_handle = rwh_04::WaylandHandle::empty();
+        window_handle.surface = self.window.wl_surface().id().as_ptr() as *mut _;
+        window_handle.display = self.display.id().as_ptr() as *mut _;
+        rwh_04::RawWindowHandle::Wayland(window_handle)
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
+        let mut window_handle = rwh_05::WaylandWindowHandle::empty();
+        window_handle.surface = self.window.wl_surface().id().as_ptr() as *mut _;
+        rwh_05::RawWindowHandle::Wayland(window_handle)
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        let mut display_handle = rwh_05::WaylandDisplayHandle::empty();
+        display_handle.display = self.display.id().as_ptr() as *mut _;
+        rwh_05::RawDisplayHandle::Wayland(display_handle)
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {

src/platform_impl/linux/wayland/window/state.rs

@@ -5,7 +5,8 @@ use std::sync::{Arc, Mutex, Weak};
 use std::time::Duration;
 
 use ahash::HashSet;
-use sctk::compositor::{CompositorState, Region, SurfaceData, SurfaceDataExt};
+use tracing::{info, warn};
+
 use sctk::reexports::client::backend::ObjectId;
 use sctk::reexports::client::protocol::wl_seat::WlSeat;
 use sctk::reexports::client::protocol::wl_shm::WlShm;
@@ -18,6 +19,8 @@ use sctk::reexports::protocols::wp::fractional_scale::v1::client::wp_fractional_
 use sctk::reexports::protocols::wp::text_input::zv3::client::zwp_text_input_v3::ZwpTextInputV3;
 use sctk::reexports::protocols::wp::viewporter::client::wp_viewport::WpViewport;
 use sctk::reexports::protocols::xdg::shell::client::xdg_toplevel::ResizeEdge as XdgResizeEdge;
+
+use sctk::compositor::{CompositorState, Region, SurfaceData, SurfaceDataExt};
 use sctk::seat::pointer::{PointerDataExt, ThemedPointer};
 use sctk::shell::xdg::window::{DecorationMode, Window, WindowConfigure};
 use sctk::shell::xdg::XdgSurface;
@@ -25,22 +28,22 @@ use sctk::shell::WaylandSurface;
 use sctk::shm::slot::SlotPool;
 use sctk::shm::Shm;
 use sctk::subcompositor::SubcompositorState;
-use tracing::{info, warn};
 use wayland_protocols_plasma::blur::client::org_kde_kwin_blur::OrgKdeKwinBlur;
 
 use crate::cursor::CustomCursor as RootCustomCursor;
 use crate::dpi::{LogicalPosition, LogicalSize, PhysicalSize, Size};
 use crate::error::{ExternalError, NotSupportedError};
 use crate::platform_impl::wayland::logical_to_physical_rounded;
-use crate::platform_impl::wayland::seat::{
-    PointerConstraintsState, WinitPointerData, WinitPointerDataExt, ZwpTextInputV3Ext,
-};
-use crate::platform_impl::wayland::state::{WindowCompositorUpdate, WinitState};
 use crate::platform_impl::wayland::types::cursor::{CustomCursor, SelectedCursor};
 use crate::platform_impl::wayland::types::kwin_blur::KWinBlurManager;
 use crate::platform_impl::{PlatformCustomCursor, WindowId};
 use crate::window::{CursorGrabMode, CursorIcon, ImePurpose, ResizeDirection, Theme};
 
+use crate::platform_impl::wayland::seat::{
+    PointerConstraintsState, WinitPointerData, WinitPointerDataExt, ZwpTextInputV3Ext,
+};
+use crate::platform_impl::wayland::state::{WindowCompositorUpdate, WinitState};
+
 #[cfg(feature = "sctk-adwaita")]
 pub type WinitFrame = sctk_adwaita::AdwaitaFrame<WinitState>;
 #[cfg(not(feature = "sctk-adwaita"))]

src/platform_impl/linux/x11/activation.rs

@@ -5,14 +5,14 @@
 //! X11 has a "startup notification" specification similar to Wayland's, see this URL:
 //! <https://specifications.freedesktop.org/startup-notification-spec/startup-notification-latest.txt>
 
+use super::atoms::*;
+use super::{VoidCookie, X11Error, XConnection};
+
 use std::ffi::CString;
 use std::fmt::Write;
 
 use x11rb::protocol::xproto::{self, ConnectionExt as _};
 
-use super::atoms::*;
-use super::{VoidCookie, X11Error, XConnection};
-
 impl XConnection {
     /// "Request" a new activation token from the server.
     pub(crate) fn request_activation_token(&self, window_title: &str) -> Result<String, X11Error> {

src/platform_impl/linux/x11/atoms.rs

@@ -48,8 +48,6 @@ atom_manager! {
     _NET_WM_NAME,
     _NET_WM_PID,
     _NET_WM_PING,
-    _NET_WM_SYNC_REQUEST,
-    _NET_WM_SYNC_REQUEST_COUNTER,
     _NET_WM_STATE,
     _NET_WM_STATE_ABOVE,
     _NET_WM_STATE_BELOW,
@@ -114,7 +112,6 @@ impl Index<AtomName> for Atoms {
     }
 }
 
+pub(crate) use AtomName::*;
 // Make sure `None` is still defined.
 pub(crate) use core::option::Option::None;
-
-pub(crate) use AtomName::*;

src/platform_impl/linux/x11/event_processor.rs

@@ -13,7 +13,6 @@ use x11_dl::xlib::{
     XDestroyWindowEvent, XEvent, XExposeEvent, XKeyEvent, XMapEvent, XPropertyEvent,
     XReparentEvent, XSelectionEvent, XVisibilityEvent, XkbAnyEvent, XkbStateRec,
 };
-use x11rb::protocol::sync::{ConnectionExt, Int64};
 use x11rb::protocol::xinput;
 use x11rb::protocol::xkb::ID as XkbId;
 use x11rb::protocol::xproto::{self, ConnectionExt as _, ModMask};
@@ -25,16 +24,18 @@ use crate::event::{
     DeviceEvent, ElementState, Event, Ime, InnerSizeWriter, MouseButton, MouseScrollDelta,
     RawKeyEvent, Touch, TouchPhase, WindowEvent,
 };
+use crate::event_loop::ActiveEventLoop as RootAEL;
 use crate::keyboard::ModifiersState;
 use crate::platform_impl::common::xkb::{self, XkbState};
 use crate::platform_impl::platform::common::xkb::Context;
 use crate::platform_impl::platform::x11::ime::{ImeEvent, ImeEventReceiver, ImeRequest};
 use crate::platform_impl::platform::x11::ActiveEventLoop;
+use crate::platform_impl::platform::ActiveEventLoop as PlatformActiveEventLoop;
 use crate::platform_impl::x11::atoms::*;
 use crate::platform_impl::x11::util::cookie::GenericEventCookie;
 use crate::platform_impl::x11::{
-    mkdid, mkfid, mkwid, util, CookieResultExt, Device, DeviceId, DeviceInfo, Dnd, DndState,
-    ImeReceiver, ScrollOrientation, UnownedWindow, WindowId,
+    mkdid, mkwid, util, CookieResultExt, Device, DeviceId, DeviceInfo, Dnd, DndState, ImeReceiver,
+    ScrollOrientation, UnownedWindow, WindowId,
 };
 
 /// The maximum amount of X modifiers to replay.
@@ -51,7 +52,7 @@ pub struct EventProcessor {
     pub devices: RefCell<HashMap<DeviceId, Device>>,
     pub xi2ext: ExtensionInformation,
     pub xkbext: ExtensionInformation,
-    pub target: ActiveEventLoop,
+    pub target: RootAEL,
     pub xkb_context: Context,
     // Number of touch events currently in progress
     pub num_touch: u32,
@@ -60,7 +61,7 @@ pub struct EventProcessor {
     //
     // Used to detect key repeats.
     pub held_key_press: Option<u32>,
-    pub first_touch: Option<u32>,
+    pub first_touch: Option<u64>,
     // Currently focused window belonging to this process
     pub active_window: Option<xproto::Window>,
     /// Latest modifiers we've sent for the user to trigger change in event.
@@ -71,19 +72,20 @@ pub struct EventProcessor {
 }
 
 impl EventProcessor {
-    pub(crate) fn process_event<F>(&mut self, xev: &mut XEvent, mut callback: F)
+    pub fn process_event<T: 'static, F>(&mut self, xev: &mut XEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         self.process_xevent(xev, &mut callback);
 
+        let window_target = Self::window_target_mut(&mut self.target);
+
         // Handle IME requests.
         while let Ok(request) = self.ime_receiver.try_recv() {
-            let ime = match self.target.ime.as_mut() {
+            let ime = match window_target.ime.as_mut() {
                 Some(ime) => ime,
                 None => continue,
             };
-
             let ime = ime.get_mut();
             match request {
                 ImeRequest::Position(window_id, x, y) => {
@@ -128,17 +130,18 @@ impl EventProcessor {
     /// along with an extra copy of the KeyRelease events. This also prevents backspace and
     /// arrow keys from being detected twice.
     fn filter_event(&mut self, xev: &mut XEvent) -> bool {
+        let wt = Self::window_target(&self.target);
         unsafe {
-            (self.target.xconn.xlib.XFilterEvent)(xev, {
+            (wt.xconn.xlib.XFilterEvent)(xev, {
                 let xev: &XAnyEvent = xev.as_ref();
                 xev.window
             }) == xlib::True
         }
     }
 
-    fn process_xevent<F>(&mut self, xev: &mut XEvent, mut callback: F)
+    fn process_xevent<T: 'static, F>(&mut self, xev: &mut XEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let event_type = xev.get_type();
 
@@ -180,8 +183,9 @@ impl EventProcessor {
                 self.xinput_key_input(xev.as_mut(), state, &mut callback);
             },
             xlib::GenericEvent => {
+                let wt = Self::window_target(&self.target);
                 let xev: GenericEventCookie =
-                    match GenericEventCookie::from_event(self.target.xconn.clone(), *xev) {
+                    match GenericEventCookie::from_event(wt.xconn.clone(), *xev) {
                         Some(xev) if xev.extension() == self.xi2ext.major_opcode => xev,
                         _ => return,
                     };
@@ -275,7 +279,7 @@ impl EventProcessor {
 
                     xinput2::XI_HierarchyChanged => {
                         let xev: &XIHierarchyEvent = unsafe { xev.as_event() };
-                        self.xinput2_hierarchy_changed(xev);
+                        self.xinput2_hierarchy_changed(xev, &mut callback);
                     },
                     _ => {},
                 }
@@ -293,10 +297,14 @@ impl EventProcessor {
     }
 
     pub fn poll(&self) -> bool {
-        unsafe { (self.target.xconn.xlib.XPending)(self.target.xconn.display) != 0 }
+        let window_target = Self::window_target(&self.target);
+        let result = unsafe { (window_target.xconn.xlib.XPending)(window_target.xconn.display) };
+
+        result != 0
     }
 
     pub unsafe fn poll_one_event(&mut self, event_ptr: *mut XEvent) -> bool {
+        let window_target = Self::window_target(&self.target);
         // This function is used to poll and remove a single event
         // from the Xlib event queue in a non-blocking, atomic way.
         // XCheckIfEvent is non-blocking and removes events from queue.
@@ -312,19 +320,22 @@ impl EventProcessor {
             1
         }
 
-        unsafe {
-            (self.target.xconn.xlib.XCheckIfEvent)(
-                self.target.xconn.display,
+        let result = unsafe {
+            (window_target.xconn.xlib.XCheckIfEvent)(
+                window_target.xconn.display,
                 event_ptr,
                 Some(predicate),
                 std::ptr::null_mut(),
-            ) != 0
-        }
+            )
+        };
+
+        result != 0
     }
 
     pub fn init_device(&self, device: xinput::DeviceId) {
+        let window_target = Self::window_target(&self.target);
         let mut devices = self.devices.borrow_mut();
-        if let Some(info) = DeviceInfo::get(&self.target.xconn, device as _) {
+        if let Some(info) = DeviceInfo::get(&window_target.xconn, device as _) {
             for info in info.iter() {
                 devices.insert(DeviceId(info.deviceid as _), Device::new(info));
             }
@@ -337,8 +348,8 @@ impl EventProcessor {
     {
         let mut deleted = false;
         let window_id = WindowId(window_id as _);
-        let result = self
-            .target
+        let window_target = Self::window_target(&self.target);
+        let result = window_target
             .windows
             .borrow()
             .get(&window_id)
@@ -351,33 +362,53 @@ impl EventProcessor {
 
         if deleted {
             // Garbage collection
-            self.target.windows.borrow_mut().remove(&window_id);
+            window_target.windows.borrow_mut().remove(&window_id);
         }
 
         result
     }
 
-    fn client_message<F>(&mut self, xev: &XClientMessageEvent, mut callback: F)
+    // NOTE: we avoid `self` to not borrow the entire `self` as not mut.
+    /// Get the platform window target.
+    pub fn window_target(window_target: &RootAEL) -> &ActiveEventLoop {
+        match &window_target.p {
+            PlatformActiveEventLoop::X(target) => target,
+            #[cfg(wayland_platform)]
+            _ => unreachable!(),
+        }
+    }
+
+    /// Get the platform window target.
+    pub fn window_target_mut(window_target: &mut RootAEL) -> &mut ActiveEventLoop {
+        match &mut window_target.p {
+            PlatformActiveEventLoop::X(target) => target,
+            #[cfg(wayland_platform)]
+            _ => unreachable!(),
+        }
+    }
+
+    fn client_message<T: 'static, F>(&mut self, xev: &XClientMessageEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
-        let atoms = self.target.xconn.atoms();
+        let wt = Self::window_target(&self.target);
+        let atoms = wt.xconn.atoms();
 
         let window = xev.window as xproto::Window;
         let window_id = mkwid(window);
 
-        if xev.data.get_long(0) as xproto::Atom == self.target.wm_delete_window {
+        if xev.data.get_long(0) as xproto::Atom == wt.wm_delete_window {
             let event = Event::WindowEvent { window_id, event: WindowEvent::CloseRequested };
             callback(&self.target, event);
             return;
         }
 
-        if xev.data.get_long(0) as xproto::Atom == self.target.net_wm_ping {
+        if xev.data.get_long(0) as xproto::Atom == wt.net_wm_ping {
             let client_msg = xproto::ClientMessageEvent {
                 response_type: xproto::CLIENT_MESSAGE_EVENT,
                 format: xev.format as _,
                 sequence: xev.serial as _,
-                window: self.target.root,
+                window: wt.root,
                 type_: xev.message_type as _,
                 data: xproto::ClientMessageData::from({
                     let [a, b, c, d, e]: [c_long; 5] = xev.data.as_longs().try_into().unwrap();
@@ -385,12 +416,11 @@ impl EventProcessor {
                 }),
             };
 
-            self.target
-                .xconn
+            wt.xconn
                 .xcb_connection()
                 .send_event(
                     false,
-                    self.target.root,
+                    wt.root,
                     xproto::EventMask::SUBSTRUCTURE_NOTIFY
                         | xproto::EventMask::SUBSTRUCTURE_REDIRECT,
                     client_msg.serialize(),
@@ -399,39 +429,12 @@ impl EventProcessor {
             return;
         }
 
-        if xev.data.get_long(0) as xproto::Atom == self.target.net_wm_sync_request {
-            let sync_counter_id = match self
-                .with_window(xev.window as xproto::Window, |window| window.sync_counter_id())
-            {
-                Some(Some(sync_counter_id)) => sync_counter_id.get(),
-                _ => return,
-            };
-
-            #[cfg(target_pointer_width = "32")]
-            let (lo, hi) =
-                (bytemuck::cast::<c_long, u32>(xev.data.get_long(2)), xev.data.get_long(3));
-
-            #[cfg(not(target_pointer_width = "32"))]
-            let (lo, hi) = (
-                (xev.data.get_long(2) & 0xffffffff) as u32,
-                bytemuck::cast::<u32, i32>((xev.data.get_long(3) & 0xffffffff) as u32),
-            );
-
-            self.target
-                .xconn
-                .xcb_connection()
-                .sync_set_counter(sync_counter_id, Int64 { lo, hi })
-                .expect_then_ignore_error("Failed to set XSync counter.");
-
-            return;
-        }
-
         if xev.message_type == atoms[XdndEnter] as c_ulong {
             let source_window = xev.data.get_long(0) as xproto::Window;
             let flags = xev.data.get_long(1);
             let version = flags >> 24;
             self.dnd.version = Some(version);
-            let has_more_types = flags - (flags & (c_long::MAX - 1)) == 1;
+            let has_more_types = flags - (flags & (c_long::max_value() - 1)) == 1;
             if !has_more_types {
                 let type_list = vec![
                     xev.data.get_long(2) as xproto::Atom,
@@ -497,7 +500,7 @@ impl EventProcessor {
                 };
 
                 // Log this timestamp.
-                self.target.xconn.set_timestamp(time);
+                wt.xconn.set_timestamp(time);
 
                 // This results in the `SelectionNotify` event below
                 unsafe {
@@ -549,17 +552,18 @@ impl EventProcessor {
         }
     }
 
-    fn selection_notify<F>(&mut self, xev: &XSelectionEvent, mut callback: F)
+    fn selection_notify<T: 'static, F>(&mut self, xev: &XSelectionEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
-        let atoms = self.target.xconn.atoms();
+        let wt = Self::window_target(&self.target);
+        let atoms = wt.xconn.atoms();
 
         let window = xev.requestor as xproto::Window;
         let window_id = mkwid(window);
 
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         if xev.property != atoms[XdndSelection] as c_ulong {
             return;
@@ -582,10 +586,12 @@ impl EventProcessor {
         }
     }
 
-    fn configure_notify<F>(&self, xev: &XConfigureEvent, mut callback: F)
+    fn configure_notify<T: 'static, F>(&self, xev: &XConfigureEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         let xwindow = xev.window as xproto::Window;
         let window_id = mkwid(xwindow);
 
@@ -640,8 +646,7 @@ impl EventProcessor {
             // We need to convert client area position to window position.
             let frame_extents =
                 shared_state_lock.frame_extents.as_ref().cloned().unwrap_or_else(|| {
-                    let frame_extents =
-                        self.target.xconn.get_frame_extents_heuristic(xwindow, self.target.root);
+                    let frame_extents = wt.xconn.get_frame_extents_heuristic(xwindow, wt.root);
                     shared_state_lock.frame_extents = Some(frame_extents.clone());
                     frame_extents
                 });
@@ -672,8 +677,7 @@ impl EventProcessor {
             let last_scale_factor = shared_state_lock.last_monitor.scale_factor;
             let new_scale_factor = {
                 let window_rect = util::AaRect::new(new_outer_position, new_inner_size);
-                let monitor = self
-                    .target
+                let monitor = wt
                     .xconn
                     .get_monitor_for_window(Some(window_rect))
                     .expect("Failed to find monitor for window");
@@ -768,16 +772,18 @@ impl EventProcessor {
     /// really have much impact, since on the WMs affected (xmonad, dwm, etc.) the only
     /// effect is that we waste some time trying to query unsupported properties.
     fn reparent_notify(&self, xev: &XReparentEvent) {
-        self.target.xconn.update_cached_wm_info(self.target.root);
+        let wt = Self::window_target(&self.target);
+
+        wt.xconn.update_cached_wm_info(wt.root);
 
         self.with_window(xev.window as xproto::Window, |window| {
             window.invalidate_cached_frame_extents();
         });
     }
 
-    fn map_notify<F>(&self, xev: &XMapEvent, mut callback: F)
+    fn map_notify<T: 'static, F>(&self, xev: &XMapEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let window = xev.window as xproto::Window;
         let window_id = mkwid(window);
@@ -793,20 +799,22 @@ impl EventProcessor {
         callback(&self.target, event);
     }
 
-    fn destroy_notify<F>(&self, xev: &XDestroyWindowEvent, mut callback: F)
+    fn destroy_notify<T: 'static, F>(&self, xev: &XDestroyWindowEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         let window = xev.window as xproto::Window;
         let window_id = mkwid(window);
 
         // In the event that the window's been destroyed without being dropped first, we
         // cleanup again here.
-        self.target.windows.borrow_mut().remove(&WindowId(window as _));
+        wt.windows.borrow_mut().remove(&WindowId(window as _));
 
         // Since all XIM stuff needs to happen from the same thread, we destroy the input
         // context here instead of when dropping the window.
-        if let Some(ime) = self.target.ime.as_ref() {
+        if let Some(ime) = wt.ime.as_ref() {
             ime.borrow_mut()
                 .remove_context(window as XWindow)
                 .expect("Failed to destroy input context");
@@ -815,11 +823,12 @@ impl EventProcessor {
         callback(&self.target, Event::WindowEvent { window_id, event: WindowEvent::Destroyed });
     }
 
-    fn property_notify<F>(&mut self, xev: &XPropertyEvent, mut callback: F)
+    fn property_notify<T: 'static, F>(&mut self, xev: &XPropertyEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
-        let atoms = self.target.x_connection().atoms();
+        let wt = Self::window_target(&self.target);
+        let atoms = wt.x_connection().atoms();
         let atom = xev.atom as xproto::Atom;
 
         if atom == xproto::Atom::from(xproto::AtomEnum::RESOURCE_MANAGER)
@@ -829,9 +838,9 @@ impl EventProcessor {
         }
     }
 
-    fn visibility_notify<F>(&self, xev: &XVisibilityEvent, mut callback: F)
+    fn visibility_notify<T: 'static, F>(&self, xev: &XVisibilityEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let xwindow = xev.window as xproto::Window;
 
@@ -846,9 +855,9 @@ impl EventProcessor {
         });
     }
 
-    fn expose<F>(&self, xev: &XExposeEvent, mut callback: F)
+    fn expose<T: 'static, F>(&self, xev: &XExposeEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         // Multiple Expose events may be received for subareas of a window.
         // We issue `RedrawRequested` only for the last event of such a series.
@@ -862,12 +871,18 @@ impl EventProcessor {
         }
     }
 
-    fn xinput_key_input<F>(&mut self, xev: &mut XKeyEvent, state: ElementState, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn xinput_key_input<T: 'static, F>(
+        &mut self,
+        xev: &mut XKeyEvent,
+        state: ElementState,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         let window = match self.active_window {
             Some(window) => window,
@@ -952,10 +967,12 @@ impl EventProcessor {
             return;
         }
 
+        let wt = Self::window_target(&self.target);
+
         if let Some(ic) =
-            self.target.ime.as_ref().and_then(|ime| ime.borrow().get_context(window as XWindow))
+            wt.ime.as_ref().and_then(|ime| ime.borrow().get_context(window as XWindow))
         {
-            let written = self.target.xconn.lookup_utf8(ic, xev);
+            let written = wt.xconn.lookup_utf8(ic, xev);
             if !written.is_empty() {
                 let event = Event::WindowEvent {
                     window_id,
@@ -972,20 +989,21 @@ impl EventProcessor {
         }
     }
 
-    fn send_synthic_modifier_from_core<F>(
+    fn send_synthic_modifier_from_core<T: 'static, F>(
         &mut self,
         window_id: crate::window::WindowId,
         state: u16,
         mut callback: F,
     ) where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let keymap = match self.xkb_context.keymap_mut() {
             Some(keymap) => keymap,
             None => return,
         };
 
-        let xcb = self.target.xconn.xcb_connection().get_raw_xcb_connection();
+        let wt = Self::window_target(&self.target);
+        let xcb = wt.xconn.xcb_connection().get_raw_xcb_connection();
 
         // Use synthetic state since we're replaying the modifier. The user modifier state
         // will be restored later.
@@ -1004,15 +1022,20 @@ impl EventProcessor {
         callback(&self.target, event);
     }
 
-    fn xinput2_button_input<F>(&self, event: &XIDeviceEvent, state: ElementState, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn xinput2_button_input<T: 'static, F>(
+        &self,
+        event: &XIDeviceEvent,
+        state: ElementState,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
         let window_id = mkwid(event.event as xproto::Window);
         let device_id = mkdid(event.deviceid as xinput::DeviceId);
 
         // Set the timestamp.
-        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(event.time as xproto::Timestamp);
 
         // Deliver multi-touch events instead of emulated mouse events.
         if (event.flags & xinput2::XIPointerEmulated) != 0 {
@@ -1056,12 +1079,14 @@ impl EventProcessor {
         callback(&self.target, event);
     }
 
-    fn xinput2_mouse_motion<F>(&self, event: &XIDeviceEvent, mut callback: F)
+    fn xinput2_mouse_motion<T: 'static, F>(&self, event: &XIDeviceEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(event.time as xproto::Timestamp);
 
         let device_id = mkdid(event.deviceid as xinput::DeviceId);
         let window = event.event as xproto::Window;
@@ -1104,7 +1129,7 @@ impl EventProcessor {
 
             let x = unsafe { *value };
 
-            if let Some(&mut (_, ref mut info)) =
+            let event = if let Some(&mut (_, ref mut info)) =
                 physical_device.scroll_axes.iter_mut().find(|&&mut (axis, _)| axis == i as _)
             {
                 let delta = (x - info.position) / info.increment;
@@ -1117,9 +1142,12 @@ impl EventProcessor {
                     ScrollOrientation::Vertical => MouseScrollDelta::LineDelta(0.0, -delta as f32),
                 };
 
-                let event = WindowEvent::MouseWheel { device_id, delta, phase: TouchPhase::Moved };
-                events.push(Event::WindowEvent { window_id, event });
-            }
+                WindowEvent::MouseWheel { device_id, delta, phase: TouchPhase::Moved }
+            } else {
+                WindowEvent::AxisMotion { device_id, axis: i as u32, value: unsafe { *value } }
+            };
+
+            events.push(Event::WindowEvent { window_id, event });
 
             value = unsafe { value.offset(1) };
         }
@@ -1129,18 +1157,20 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_mouse_enter<F>(&self, event: &XIEnterEvent, mut callback: F)
+    fn xinput2_mouse_enter<T: 'static, F>(&self, event: &XIEnterEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(event.time as xproto::Timestamp);
 
         let window = event.event as xproto::Window;
         let window_id = mkwid(window);
         let device_id = mkdid(event.deviceid as xinput::DeviceId);
 
-        if let Some(all_info) = DeviceInfo::get(&self.target.xconn, super::ALL_DEVICES.into()) {
+        if let Some(all_info) = DeviceInfo::get(&wt.xconn, super::ALL_DEVICES.into()) {
             let mut devices = self.devices.borrow_mut();
             for device_info in all_info.iter() {
                 // The second expression is need for resetting to work correctly on i3, and
@@ -1172,14 +1202,15 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_mouse_left<F>(&self, event: &XILeaveEvent, mut callback: F)
+    fn xinput2_mouse_left<T: 'static, F>(&self, event: &XILeaveEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
         let window = event.event as xproto::Window;
 
         // Set the timestamp.
-        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(event.time as xproto::Timestamp);
 
         // Leave, FocusIn, and FocusOut can be received by a window that's already
         // been destroyed, which the user presumably doesn't want to deal with.
@@ -1194,16 +1225,17 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_focused<F>(&mut self, xev: &XIFocusInEvent, mut callback: F)
+    fn xinput2_focused<T: 'static, F>(&mut self, xev: &XIFocusInEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
         let window = xev.event as xproto::Window;
 
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
-        if let Some(ime) = self.target.ime.as_ref() {
+        if let Some(ime) = wt.ime.as_ref() {
             ime.borrow_mut().focus(xev.event).expect("Failed to focus input context");
         }
 
@@ -1213,7 +1245,7 @@ impl EventProcessor {
 
         self.active_window = Some(window);
 
-        self.target.update_listen_device_events(true);
+        wt.update_listen_device_events(true);
 
         let window_id = mkwid(window);
         let position = PhysicalPosition::new(xev.event_x, xev.event_y);
@@ -1252,27 +1284,28 @@ impl EventProcessor {
         callback(&self.target, event);
     }
 
-    fn xinput2_unfocused<F>(&mut self, xev: &XIFocusOutEvent, mut callback: F)
+    fn xinput2_unfocused<T: 'static, F>(&mut self, xev: &XIFocusOutEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
         let window = xev.event as xproto::Window;
 
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         if !self.window_exists(window) {
             return;
         }
 
-        if let Some(ime) = self.target.ime.as_ref() {
+        if let Some(ime) = wt.ime.as_ref() {
             ime.borrow_mut().unfocus(xev.event).expect("Failed to unfocus input context");
         }
 
         if self.active_window.take() == Some(window) {
             let window_id = mkwid(window);
 
-            self.target.update_listen_device_events(false);
+            wt.update_listen_device_events(false);
 
             // Clear the modifiers when unfocusing the window.
             if let Some(xkb_state) = self.xkb_context.state_mut() {
@@ -1303,17 +1336,23 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_touch<F>(&mut self, xev: &XIDeviceEvent, phase: TouchPhase, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn xinput2_touch<T: 'static, F>(
+        &mut self,
+        xev: &XIDeviceEvent,
+        phase: TouchPhase,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         let window = xev.event as xproto::Window;
         if self.window_exists(window) {
             let window_id = mkwid(window);
-            let id = xev.detail as u32;
+            let id = xev.detail as u64;
             let location = PhysicalPosition::new(xev.event_x, xev.event_y);
 
             // Mouse cursor position changes when touch events are received.
@@ -1336,19 +1375,25 @@ impl EventProcessor {
                     phase,
                     location,
                     force: None, // TODO
-                    finger_id: mkfid(id),
+                    id,
                 }),
             };
             callback(&self.target, event)
         }
     }
 
-    fn xinput2_raw_button_input<F>(&self, xev: &XIRawEvent, state: ElementState, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn xinput2_raw_button_input<T: 'static, F>(
+        &self,
+        xev: &XIRawEvent,
+        state: ElementState,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         if xev.flags & xinput2::XIPointerEmulated == 0 {
             let event = Event::DeviceEvent {
@@ -1359,12 +1404,14 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_raw_mouse_motion<F>(&self, xev: &XIRawEvent, mut callback: F)
+    fn xinput2_raw_mouse_motion<T: 'static, F>(&self, xev: &XIRawEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         let did = mkdid(xev.deviceid as xinput::DeviceId);
 
@@ -1389,6 +1436,12 @@ impl EventProcessor {
                 _ => {},
             }
 
+            let event = Event::DeviceEvent {
+                device_id: did,
+                event: DeviceEvent::Motion { axis: i as u32, value: x },
+            };
+            callback(&self.target, event);
+
             value = unsafe { value.offset(1) };
         }
 
@@ -1411,12 +1464,18 @@ impl EventProcessor {
         }
     }
 
-    fn xinput2_raw_key_input<F>(&mut self, xev: &XIRawEvent, state: ElementState, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn xinput2_raw_key_input<T: 'static, F>(
+        &mut self,
+        xev: &XIRawEvent,
+        state: ElementState,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
         let device_id = mkdid(xev.sourceid as xinput::DeviceId);
         let keycode = xev.detail as u32;
@@ -1431,30 +1490,44 @@ impl EventProcessor {
         });
     }
 
-    fn xinput2_hierarchy_changed(&mut self, xev: &XIHierarchyEvent) {
+    fn xinput2_hierarchy_changed<T: 'static, F>(&mut self, xev: &XIHierarchyEvent, mut callback: F)
+    where
+        F: FnMut(&RootAEL, Event<T>),
+    {
+        let wt = Self::window_target(&self.target);
+
         // Set the timestamp.
-        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+        wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
         let infos = unsafe { slice::from_raw_parts(xev.info, xev.num_info as usize) };
         for info in infos {
             if 0 != info.flags & (xinput2::XISlaveAdded | xinput2::XIMasterAdded) {
                 self.init_device(info.deviceid as xinput::DeviceId);
+                callback(&self.target, Event::DeviceEvent {
+                    device_id: mkdid(info.deviceid as xinput::DeviceId),
+                    event: DeviceEvent::Added,
+                });
             } else if 0 != info.flags & (xinput2::XISlaveRemoved | xinput2::XIMasterRemoved) {
+                callback(&self.target, Event::DeviceEvent {
+                    device_id: mkdid(info.deviceid as xinput::DeviceId),
+                    event: DeviceEvent::Removed,
+                });
                 let mut devices = self.devices.borrow_mut();
                 devices.remove(&DeviceId(info.deviceid as xinput::DeviceId));
             }
         }
     }
 
-    fn xkb_event<F>(&mut self, xev: &XkbAnyEvent, mut callback: F)
+    fn xkb_event<T: 'static, F>(&mut self, xev: &XkbAnyEvent, mut callback: F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
         match xev.xkb_type {
             xlib::XkbNewKeyboardNotify => {
                 let xev = unsafe { &*(xev as *const _ as *const xlib::XkbNewKeyboardNotifyEvent) };
 
                 // Set the timestamp.
-                self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+                wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
                 let keycodes_changed_flag = 0x1;
                 let geometry_changed_flag = 0x1 << 1;
@@ -1465,9 +1538,9 @@ impl EventProcessor {
                 if xev.device == self.xkb_context.core_keyboard_id
                     && (keycodes_changed || geometry_changed)
                 {
-                    let xcb = self.target.xconn.xcb_connection().get_raw_xcb_connection();
+                    let xcb = wt.xconn.xcb_connection().get_raw_xcb_connection();
                     self.xkb_context.set_keymap_from_x11(xcb);
-                    self.xmodmap.reload_from_x_connection(&self.target.xconn);
+                    self.xmodmap.reload_from_x_connection(&wt.xconn);
 
                     let window_id = match self.active_window.map(super::mkwid) {
                         Some(window_id) => window_id,
@@ -1481,9 +1554,9 @@ impl EventProcessor {
                 }
             },
             xlib::XkbMapNotify => {
-                let xcb = self.target.xconn.xcb_connection().get_raw_xcb_connection();
+                let xcb = wt.xconn.xcb_connection().get_raw_xcb_connection();
                 self.xkb_context.set_keymap_from_x11(xcb);
-                self.xmodmap.reload_from_x_connection(&self.target.xconn);
+                self.xmodmap.reload_from_x_connection(&wt.xconn);
                 let window_id = match self.active_window.map(super::mkwid) {
                     Some(window_id) => window_id,
                     None => return,
@@ -1498,7 +1571,7 @@ impl EventProcessor {
                 let xev = unsafe { &*(xev as *const _ as *const xlib::XkbStateNotifyEvent) };
 
                 // Set the timestamp.
-                self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);
+                wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
 
                 if let Some(state) = self.xkb_context.state_mut() {
                     state.update_modifiers(
@@ -1523,14 +1596,14 @@ impl EventProcessor {
         }
     }
 
-    pub(crate) fn update_mods_from_xinput2_event<F>(
+    pub fn update_mods_from_xinput2_event<T: 'static, F>(
         &mut self,
         mods: &XIModifierState,
         group: &XIModifierState,
         force: bool,
         mut callback: F,
     ) where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         if let Some(state) = self.xkb_context.state_mut() {
             state.update_modifiers(
@@ -1554,10 +1627,15 @@ impl EventProcessor {
         }
     }
 
-    fn update_mods_from_query<F>(&mut self, window_id: crate::window::WindowId, mut callback: F)
-    where
-        F: FnMut(&ActiveEventLoop, Event),
+    fn update_mods_from_query<T: 'static, F>(
+        &mut self,
+        window_id: crate::window::WindowId,
+        mut callback: F,
+    ) where
+        F: FnMut(&RootAEL, Event<T>),
     {
+        let wt = Self::window_target(&self.target);
+
         let xkb_state = match self.xkb_context.state_mut() {
             Some(xkb_state) => xkb_state,
             None => return,
@@ -1565,11 +1643,8 @@ impl EventProcessor {
 
         unsafe {
             let mut state: XkbStateRec = std::mem::zeroed();
-            if (self.target.xconn.xlib.XkbGetState)(
-                self.target.xconn.display,
-                XkbId::USE_CORE_KBD.into(),
-                &mut state,
-            ) == xlib::True
+            if (wt.xconn.xlib.XkbGetState)(wt.xconn.display, XkbId::USE_CORE_KBD.into(), &mut state)
+                == xlib::True
             {
                 xkb_state.update_modifiers(
                     state.base_mods as u32,
@@ -1586,13 +1661,13 @@ impl EventProcessor {
         self.send_modifiers(window_id, mods.into(), true, &mut callback)
     }
 
-    pub(crate) fn update_mods_from_core_event<F>(
+    pub fn update_mods_from_core_event<T: 'static, F>(
         &mut self,
         window_id: crate::window::WindowId,
         state: u16,
         mut callback: F,
     ) where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let xkb_mask = self.xkb_mod_mask_from_core(state);
         let xkb_state = match self.xkb_context.state_mut() {
@@ -1665,7 +1740,7 @@ impl EventProcessor {
     ///
     /// The event won't be sent when the `modifiers` match the previously `sent` modifiers value,
     /// unless `force` is passed. The `force` should be passed when the active window changes.
-    fn send_modifiers<F: FnMut(&ActiveEventLoop, Event)>(
+    fn send_modifiers<T: 'static, F: FnMut(&RootAEL, Event<T>)>(
         &self,
         window_id: crate::window::WindowId,
         modifiers: ModifiersState,
@@ -1683,19 +1758,20 @@ impl EventProcessor {
         }
     }
 
-    fn handle_pressed_keys<F>(
-        target: &ActiveEventLoop,
+    fn handle_pressed_keys<T: 'static, F>(
+        target: &RootAEL,
         window_id: crate::window::WindowId,
         state: ElementState,
         xkb_context: &mut Context,
         callback: &mut F,
     ) where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
         let device_id = mkdid(util::VIRTUAL_CORE_KEYBOARD);
 
         // Update modifiers state and emit key events based on which keys are currently pressed.
-        let xcb = target.xconn.xcb_connection().get_raw_xcb_connection();
+        let window_target = Self::window_target(target);
+        let xcb = window_target.xconn.xcb_connection().get_raw_xcb_connection();
 
         let keymap = match xkb_context.keymap_mut() {
             Some(keymap) => keymap,
@@ -1712,7 +1788,9 @@ impl EventProcessor {
             None => return,
         };
 
-        for keycode in target.xconn.query_keymap().into_iter().filter(|k| *k >= KEYCODE_OFFSET) {
+        for keycode in
+            window_target.xconn.query_keymap().into_iter().filter(|k| *k >= KEYCODE_OFFSET)
+        {
             let event = key_processor.process_key_event(keycode as u32, state, false);
             let event = Event::WindowEvent {
                 window_id,
@@ -1722,22 +1800,23 @@ impl EventProcessor {
         }
     }
 
-    fn process_dpi_change<F>(&self, callback: &mut F)
+    fn process_dpi_change<T: 'static, F>(&self, callback: &mut F)
     where
-        F: FnMut(&ActiveEventLoop, Event),
+        F: FnMut(&RootAEL, Event<T>),
     {
-        self.target.xconn.reload_database().expect("failed to reload Xft database");
+        let wt = Self::window_target(&self.target);
+        wt.xconn.reload_database().expect("failed to reload Xft database");
 
         // In the future, it would be quite easy to emit monitor hotplug events.
         let prev_list = {
-            let prev_list = self.target.xconn.invalidate_cached_monitor_list();
+            let prev_list = wt.xconn.invalidate_cached_monitor_list();
             match prev_list {
                 Some(prev_list) => prev_list,
                 None => return,
             }
         };
 
-        let new_list = self.target.xconn.available_monitors().expect("Failed to get monitor list");
+        let new_list = wt.xconn.available_monitors().expect("Failed to get monitor list");
         for new_monitor in new_list {
             // Previous list may be empty, in case of disconnecting and
             // reconnecting the only one monitor. We still need to emit events in
@@ -1747,7 +1826,7 @@ impl EventProcessor {
                 .find(|prev_monitor| prev_monitor.name == new_monitor.name)
                 .map(|prev_monitor| prev_monitor.scale_factor);
             if Some(new_monitor.scale_factor) != maybe_prev_scale_factor {
-                for window in self.target.windows.borrow().iter().filter_map(|(_, w)| w.upgrade()) {
+                for window in wt.windows.borrow().iter().filter_map(|(_, w)| w.upgrade()) {
                     window.refresh_dpi_for_monitor(&new_monitor, maybe_prev_scale_factor, |event| {
                         callback(&self.target, event);
                     })
@@ -1761,7 +1840,7 @@ impl EventProcessor {
     }
 }
 
-fn is_first_touch(first: &mut Option<u32>, num: &mut u32, id: u32, phase: TouchPhase) -> bool {
+fn is_first_touch(first: &mut Option<u64>, num: &mut u32, id: u64, phase: TouchPhase) -> bool {
     match phase {
         TouchPhase::Started => {
             if *num == 0 {

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

@@ -3,10 +3,11 @@ use std::os::raw::c_char;
 use std::ptr;
 use std::sync::Arc;
 
+use super::{ffi, XConnection, XError};
+
 use super::context::{ImeContext, ImeContextCreationError};
 use super::inner::{close_im, ImeInner};
 use super::input_method::PotentialInputMethods;
-use super::{ffi, XConnection, XError};
 
 pub(crate) unsafe fn xim_set_callback(
     xconn: &Arc<XConnection>,

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

@@ -5,10 +5,11 @@ use std::{mem, ptr};
 
 use x11_dl::xlib::{XIMCallback, XIMPreeditCaretCallbackStruct, XIMPreeditDrawCallbackStruct};
 
-use super::{ffi, util, XConnection, XError};
 use crate::platform_impl::platform::x11::ime::input_method::{Style, XIMStyle};
 use crate::platform_impl::platform::x11::ime::{ImeEvent, ImeEventSender};
 
+use super::{ffi, util, XConnection, XError};
+
 /// IME creation error.
 #[derive(Debug)]
 pub enum ImeContextCreationError {
@@ -157,9 +158,7 @@ struct PreeditCallbacks {
 impl PreeditCallbacks {
     pub fn new(client_data: ffi::XPointer) -> PreeditCallbacks {
         let start_callback = create_xim_callback(client_data, unsafe {
-            mem::transmute::<usize, unsafe extern "C" fn(ffi::XIM, ffi::XPointer, ffi::XPointer)>(
-                preedit_start_callback as usize,
-            )
+            mem::transmute(preedit_start_callback as usize)
         });
         let done_callback = create_xim_callback(client_data, preedit_done_callback);
         let caret_callback = create_xim_callback(client_data, preedit_caret_callback);

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

@@ -2,9 +2,10 @@ use std::collections::HashMap;
 use std::mem;
 use std::sync::Arc;
 
+use super::{ffi, XConnection, XError};
+
 use super::context::ImeContext;
 use super::input_method::{InputMethod, PotentialInputMethods};
-use super::{ffi, XConnection, XError};
 use crate::platform_impl::platform::x11::ime::ImeEventSender;
 
 pub(crate) unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {

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

@@ -3,10 +3,9 @@ use std::os::raw::{c_char, c_ulong, c_ushort};
 use std::sync::{Arc, Mutex};
 use std::{env, fmt, ptr};
 
-use x11rb::protocol::xproto;
-
 use super::super::atoms::*;
 use super::{ffi, util, XConnection, XError};
+use x11rb::protocol::xproto;
 
 static GLOBAL_LOCK: Mutex<()> = Mutex::new(());
 

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

@@ -12,12 +12,13 @@ use std::sync::Arc;
 use serde::{Deserialize, Serialize};
 use tracing::debug;
 
+use super::{ffi, util, XConnection, XError};
+
 use self::callbacks::*;
 use self::context::ImeContext;
 pub use self::context::ImeContextCreationError;
 use self::inner::{close_im, ImeInner};
 use self::input_method::{PotentialInputMethods, Style};
-use super::{ffi, util, XConnection, XError};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]

src/platform_impl/linux/x11/mod.rs

@@ -1,7 +1,9 @@
-use std::any::Any;
+#![cfg(x11_platform)]
+
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::ffi::CStr;
+use std::marker::PhantomData;
 use std::mem::MaybeUninit;
 use std::ops::Deref;
 use std::os::raw::*;
@@ -9,13 +11,14 @@ use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 use std::sync::mpsc::{self, Receiver, Sender, TryRecvError};
 use std::sync::{Arc, Weak};
 use std::time::{Duration, Instant};
-use std::{fmt, mem, ptr, slice, str};
+use std::{fmt, ptr, slice, str};
 
 use calloop::generic::Generic;
 use calloop::ping::Ping;
 use calloop::{EventLoop as Loop, Readiness};
 use libc::{setlocale, LC_CTYPE};
 use tracing::warn;
+
 use x11rb::connection::RequestConnection;
 use x11rb::errors::{ConnectError, ConnectionError, IdsExhausted, ReplyError};
 use x11rb::protocol::xinput::{self, ConnectionExt as _};
@@ -24,20 +27,16 @@ use x11rb::protocol::xproto::{self, ConnectionExt as _};
 use x11rb::x11_utils::X11Error as LogicalError;
 use x11rb::xcb_ffi::ReplyOrIdError;
 
-use crate::application::ApplicationHandler;
-use crate::error::{EventLoopError, ExternalError, OsError as RootOsError};
+use crate::error::{EventLoopError, OsError as RootOsError};
 use crate::event::{Event, StartCause, WindowEvent};
-use crate::event_loop::{
-    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    OwnedDisplayHandle as RootOwnedDisplayHandle,
-};
+use crate::event_loop::{ActiveEventLoop as RootAEL, ControlFlow, DeviceEvents, EventLoopClosed};
 use crate::platform::pump_events::PumpStatus;
 use crate::platform_impl::common::xkb::Context;
 use crate::platform_impl::platform::{min_timeout, WindowId};
-use crate::platform_impl::{OsError, OwnedDisplayHandle, PlatformCustomCursor};
-use crate::window::{
-    CustomCursor as RootCustomCursor, CustomCursorSource, Theme, WindowAttributes,
+use crate::platform_impl::{
+    ActiveEventLoop as PlatformActiveEventLoop, OsError, PlatformCustomCursor,
 };
+use crate::window::{CustomCursor as RootCustomCursor, CustomCursorSource, WindowAttributes};
 
 mod activation;
 mod atoms;
@@ -51,12 +50,13 @@ mod window;
 mod xdisplay;
 mod xsettings;
 
+pub use util::CustomCursor;
+
 use atoms::*;
 use dnd::{Dnd, DndState};
 use event_processor::{EventProcessor, MAX_MOD_REPLAY_LEN};
 use ime::{Ime, ImeCreationError, ImeReceiver, ImeRequest, ImeSender};
 pub(crate) use monitor::{MonitorHandle, VideoModeHandle};
-pub use util::CustomCursor;
 use window::UnownedWindow;
 pub(crate) use xdisplay::{XConnection, XError, XNotSupported};
 
@@ -82,11 +82,12 @@ impl<T> Clone for WakeSender<T> {
 }
 
 impl<T> WakeSender<T> {
-    pub fn send(&self, t: T) {
-        let res = self.sender.send(t);
+    pub fn send(&self, t: T) -> Result<(), EventLoopClosed<T>> {
+        let res = self.sender.send(t).map_err(|e| EventLoopClosed(e.0));
         if res.is_ok() {
             self.waker.ping();
         }
+        res
     }
 }
 
@@ -130,7 +131,6 @@ pub struct ActiveEventLoop {
     xconn: Arc<XConnection>,
     wm_delete_window: xproto::Atom,
     net_wm_ping: xproto::Atom,
-    net_wm_sync_request: xproto::Atom,
     ime_sender: ImeSender,
     control_flow: Cell<ControlFlow>,
     exit: Cell<Option<i32>>,
@@ -139,16 +139,18 @@ pub struct ActiveEventLoop {
     windows: RefCell<HashMap<WindowId, Weak<UnownedWindow>>>,
     redraw_sender: WakeSender<WindowId>,
     activation_sender: WakeSender<ActivationToken>,
-    event_loop_proxy: EventLoopProxy,
     device_events: Cell<DeviceEvents>,
 }
 
-pub struct EventLoop {
+pub struct EventLoop<T: 'static> {
     loop_running: bool,
     event_loop: Loop<'static, EventLoopState>,
+    waker: calloop::ping::Ping,
     event_processor: EventProcessor,
     redraw_receiver: PeekableReceiver<WindowId>,
+    user_receiver: PeekableReceiver<T>,
     activation_receiver: PeekableReceiver<ActivationToken>,
+    user_sender: Sender<T>,
 
     /// The current state of the event loop.
     state: EventLoopState,
@@ -159,19 +161,25 @@ type ActivationToken = (WindowId, crate::event_loop::AsyncRequestSerial);
 struct EventLoopState {
     /// The latest readiness state for the x11 file descriptor
     x11_readiness: Readiness,
-
-    /// User requested a wake up.
-    proxy_wake_up: bool,
 }
 
-impl EventLoop {
-    pub(crate) fn new(xconn: Arc<XConnection>) -> EventLoop {
+pub struct EventLoopProxy<T: 'static> {
+    user_sender: WakeSender<T>,
+}
+
+impl<T: 'static> Clone for EventLoopProxy<T> {
+    fn clone(&self) -> Self {
+        EventLoopProxy { user_sender: self.user_sender.clone() }
+    }
+}
+
+impl<T: 'static> EventLoop<T> {
+    pub(crate) fn new(xconn: Arc<XConnection>) -> EventLoop<T> {
         let root = xconn.default_root().root;
         let atoms = xconn.atoms();
 
         let wm_delete_window = atoms[WM_DELETE_WINDOW];
         let net_wm_ping = atoms[_NET_WM_PING];
-        let net_wm_sync_request = atoms[_NET_WM_SYNC_REQUEST];
 
         let dnd = Dnd::new(Arc::clone(&xconn))
             .expect("Failed to call XInternAtoms when initializing drag and drop");
@@ -270,16 +278,7 @@ impl EventLoop {
         let (activation_token_sender, activation_token_channel) = mpsc::channel();
 
         // Create a channel for sending user events.
-        let (user_waker, user_waker_source) =
-            calloop::ping::make_ping().expect("Failed to create user event loop waker.");
-        event_loop
-            .handle()
-            .insert_source(user_waker_source, move |_, _, state| {
-                // No extra handling is required, we just need to wake-up.
-                state.proxy_wake_up = true;
-            })
-            .expect("Failed to register the event loop waker source");
-        let event_loop_proxy = EventLoopProxy::new(user_waker);
+        let (user_sender, user_channel) = mpsc::channel();
 
         let xkb_context =
             Context::from_x11_xkb(xconn.xcb_connection().get_raw_xcb_connection()).unwrap();
@@ -297,7 +296,6 @@ impl EventLoop {
             xconn,
             wm_delete_window,
             net_wm_ping,
-            net_wm_sync_request,
             redraw_sender: WakeSender {
                 sender: redraw_sender, // not used again so no clone
                 waker: waker.clone(),
@@ -306,15 +304,17 @@ impl EventLoop {
                 sender: activation_token_sender, // not used again so no clone
                 waker: waker.clone(),
             },
-            event_loop_proxy,
             device_events: Default::default(),
         };
 
         // Set initial device event filter.
         window_target.update_listen_device_events(true);
 
+        let root_window_target =
+            RootAEL { p: PlatformActiveEventLoop::X(window_target), _marker: PhantomData };
+
         let event_processor = EventProcessor {
-            target: window_target,
+            target: root_window_target,
             dnd,
             devices: Default::default(),
             randr_event_offset,
@@ -335,9 +335,9 @@ impl EventLoop {
 
         // Register for device hotplug events
         // (The request buffer is flushed during `init_device`)
-        event_processor
-            .target
-            .xconn
+        let xconn = &EventProcessor::window_target(&event_processor.target).xconn;
+
+        xconn
             .select_xinput_events(
                 root,
                 ALL_DEVICES,
@@ -345,9 +345,7 @@ impl EventLoop {
             )
             .expect_then_ignore_error("Failed to register for XInput2 device hotplug events");
 
-        event_processor
-            .target
-            .xconn
+        xconn
             .select_xkb_events(
                 0x100, // Use the "core keyboard device"
                 xkb::EventType::NEW_KEYBOARD_NOTIFY
@@ -361,28 +359,32 @@ impl EventLoop {
         EventLoop {
             loop_running: false,
             event_loop,
+            waker,
             event_processor,
             redraw_receiver: PeekableReceiver::from_recv(redraw_channel),
             activation_receiver: PeekableReceiver::from_recv(activation_token_channel),
-            state: EventLoopState { x11_readiness: Readiness::EMPTY, proxy_wake_up: false },
+            user_receiver: PeekableReceiver::from_recv(user_channel),
+            user_sender,
+            state: EventLoopState { x11_readiness: Readiness::EMPTY },
         }
     }
 
-    pub(crate) fn window_target(&self) -> &dyn RootActiveEventLoop {
+    pub fn create_proxy(&self) -> EventLoopProxy<T> {
+        EventLoopProxy {
+            user_sender: WakeSender { sender: self.user_sender.clone(), waker: self.waker.clone() },
+        }
+    }
+
+    pub(crate) fn window_target(&self) -> &RootAEL {
         &self.event_processor.target
     }
 
-    pub fn run_app<A: ApplicationHandler>(mut self, app: A) -> Result<(), EventLoopError> {
-        self.run_app_on_demand(app)
-    }
-
-    pub fn run_app_on_demand<A: ApplicationHandler>(
-        &mut self,
-        mut app: A,
-    ) -> Result<(), EventLoopError> {
-        self.event_processor.target.clear_exit();
+    pub fn run_on_demand<F>(&mut self, mut event_handler: F) -> Result<(), EventLoopError>
+    where
+        F: FnMut(Event<T>, &RootAEL),
+    {
         let exit = loop {
-            match self.pump_app_events(None, &mut app) {
+            match self.pump_events(None, &mut event_handler) {
                 PumpStatus::Exit(0) => {
                     break Ok(());
                 },
@@ -399,34 +401,34 @@ impl EventLoop {
         // `run_on_demand` calls but if they have only just dropped their
         // windows we need to make sure those last requests are sent to the
         // X Server.
-        self.event_processor.target.x_connection().sync_with_server().map_err(|x_err| {
+        let wt = EventProcessor::window_target(&self.event_processor.target);
+        wt.x_connection().sync_with_server().map_err(|x_err| {
             EventLoopError::Os(os_error!(OsError::XError(Arc::new(X11Error::Xlib(x_err)))))
         })?;
 
         exit
     }
 
-    pub fn pump_app_events<A: ApplicationHandler>(
-        &mut self,
-        timeout: Option<Duration>,
-        mut app: A,
-    ) -> PumpStatus {
+    pub fn pump_events<F>(&mut self, timeout: Option<Duration>, mut callback: F) -> PumpStatus
+    where
+        F: FnMut(Event<T>, &RootAEL),
+    {
         if !self.loop_running {
             self.loop_running = true;
 
             // run the initial loop iteration
-            self.single_iteration(&mut app, StartCause::Init);
+            self.single_iteration(&mut callback, StartCause::Init);
         }
 
         // Consider the possibility that the `StartCause::Init` iteration could
         // request to Exit.
         if !self.exiting() {
-            self.poll_events_with_timeout(timeout, &mut app);
+            self.poll_events_with_timeout(timeout, &mut callback);
         }
         if let Some(code) = self.exit_code() {
             self.loop_running = false;
 
-            app.exiting(self.window_target());
+            callback(Event::LoopExiting, self.window_target());
 
             PumpStatus::Exit(code)
         } else {
@@ -436,15 +438,14 @@ impl EventLoop {
 
     fn has_pending(&mut self) -> bool {
         self.event_processor.poll()
-            || self.state.proxy_wake_up
+            || self.user_receiver.has_incoming()
             || self.redraw_receiver.has_incoming()
     }
 
-    fn poll_events_with_timeout<A: ApplicationHandler>(
-        &mut self,
-        mut timeout: Option<Duration>,
-        app: &mut A,
-    ) {
+    pub fn poll_events_with_timeout<F>(&mut self, mut timeout: Option<Duration>, mut callback: F)
+    where
+        F: FnMut(Event<T>, &RootAEL),
+    {
         let start = Instant::now();
 
         let has_pending = self.has_pending();
@@ -502,20 +503,23 @@ impl EventLoop {
             return;
         }
 
-        self.single_iteration(app, cause);
+        self.single_iteration(&mut callback, cause);
     }
 
-    fn single_iteration<A: ApplicationHandler>(&mut self, app: &mut A, cause: StartCause) {
-        app.new_events(&self.event_processor.target, cause);
+    fn single_iteration<F>(&mut self, callback: &mut F, cause: StartCause)
+    where
+        F: FnMut(Event<T>, &RootAEL),
+    {
+        callback(Event::NewEvents(cause), &self.event_processor.target);
 
-        // NB: For consistency all platforms must call `can_create_surfaces` even though X11
-        // applications don't themselves have a formal surface destroy/create lifecycle.
+        // NB: For consistency all platforms must emit a 'resumed' event even though X11
+        // applications don't themselves have a formal suspend/resume lifecycle.
         if cause == StartCause::Init {
-            app.can_create_surfaces(&self.event_processor.target)
+            callback(Event::Resumed, &self.event_processor.target);
         }
 
         // Process all pending events
-        self.drain_events(app);
+        self.drain_events(callback);
 
         // Empty activation tokens.
         while let Ok((window_id, serial)) = self.activation_receiver.try_recv() {
@@ -525,12 +529,14 @@ impl EventLoop {
 
             match token {
                 Some(Ok(token)) => {
-                    let window_id = crate::window::WindowId(window_id);
-                    let event = WindowEvent::ActivationTokenDone {
-                        serial,
-                        token: crate::window::ActivationToken::_new(token),
+                    let event = Event::WindowEvent {
+                        window_id: crate::window::WindowId(window_id),
+                        event: WindowEvent::ActivationTokenDone {
+                            serial,
+                            token: crate::window::ActivationToken::_new(token),
+                        },
                     };
-                    app.window_event(&self.event_processor.target, window_id, event);
+                    callback(event, &self.event_processor.target)
                 },
                 Some(Err(e)) => {
                     tracing::error!("Failed to get activation token: {}", e);
@@ -540,8 +546,10 @@ impl EventLoop {
         }
 
         // Empty the user event buffer
-        if mem::take(&mut self.state.proxy_wake_up) {
-            app.proxy_wake_up(&self.event_processor.target);
+        {
+            while let Ok(event) = self.user_receiver.try_recv() {
+                callback(Event::UserEvent(event), &self.event_processor.target);
+            }
         }
 
         // Empty the redraw requests
@@ -554,69 +562,70 @@ impl EventLoop {
 
             for window_id in windows {
                 let window_id = crate::window::WindowId(window_id);
-                app.window_event(
+                callback(
+                    Event::WindowEvent { window_id, event: WindowEvent::RedrawRequested },
                     &self.event_processor.target,
-                    window_id,
-                    WindowEvent::RedrawRequested,
                 );
             }
         }
 
         // This is always the last event we dispatch before poll again
-        app.about_to_wait(&self.event_processor.target);
+        {
+            callback(Event::AboutToWait, &self.event_processor.target);
+        }
     }
 
-    fn drain_events<A: ApplicationHandler>(&mut self, app: &mut A) {
+    fn drain_events<F>(&mut self, callback: &mut F)
+    where
+        F: FnMut(Event<T>, &RootAEL),
+    {
         let mut xev = MaybeUninit::uninit();
 
         while unsafe { self.event_processor.poll_one_event(xev.as_mut_ptr()) } {
             let mut xev = unsafe { xev.assume_init() };
-            self.event_processor.process_event(&mut xev, |window_target, event: Event| {
+            self.event_processor.process_event(&mut xev, |window_target, event| {
                 if let Event::WindowEvent {
                     window_id: crate::window::WindowId(wid),
                     event: WindowEvent::RedrawRequested,
                 } = event
                 {
-                    window_target.redraw_sender.send(wid);
+                    let window_target = EventProcessor::window_target(window_target);
+                    window_target.redraw_sender.send(wid).unwrap();
                 } else {
-                    match event {
-                        Event::WindowEvent { window_id, event } => {
-                            app.window_event(window_target, window_id, event)
-                        },
-                        Event::DeviceEvent { device_id, event } => {
-                            app.device_event(window_target, device_id, event)
-                        },
-                        _ => unreachable!("event which is neither device nor window event."),
-                    }
+                    callback(event, window_target);
                 }
             });
         }
     }
 
     fn control_flow(&self) -> ControlFlow {
-        self.event_processor.target.control_flow()
+        let window_target = EventProcessor::window_target(&self.event_processor.target);
+        window_target.control_flow()
     }
 
     fn exiting(&self) -> bool {
-        self.event_processor.target.exiting()
+        let window_target = EventProcessor::window_target(&self.event_processor.target);
+        window_target.exiting()
     }
 
     fn set_exit_code(&self, code: i32) {
-        self.event_processor.target.set_exit_code(code);
+        let window_target = EventProcessor::window_target(&self.event_processor.target);
+        window_target.set_exit_code(code);
     }
 
     fn exit_code(&self) -> Option<i32> {
-        self.event_processor.target.exit_code()
+        let window_target = EventProcessor::window_target(&self.event_processor.target);
+        window_target.exit_code()
     }
 }
 
-impl AsFd for EventLoop {
+impl<T> AsFd for EventLoop<T> {
     fn as_fd(&self) -> BorrowedFd<'_> {
         self.event_loop.as_fd()
     }
 }
 
-impl AsRawFd for EventLoop {
+impl<T> AsRawFd for EventLoop<T> {
     fn as_raw_fd(&self) -> RawFd {
         self.event_loop.as_raw_fd()
     }
@@ -629,6 +638,22 @@ impl ActiveEventLoop {
         &self.xconn
     }
 
+    pub fn available_monitors(&self) -> impl Iterator<Item = MonitorHandle> {
+        self.xconn.available_monitors().into_iter().flatten()
+    }
+
+    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
+        self.xconn.primary_monitor().ok()
+    }
+
+    pub(crate) fn create_custom_cursor(&self, cursor: CustomCursorSource) -> RootCustomCursor {
+        RootCustomCursor { inner: PlatformCustomCursor::X(CustomCursor::new(self, cursor.inner)) }
+    }
+
+    pub fn listen_device_events(&self, allowed: DeviceEvents) {
+        self.device_events.set(allowed);
+    }
+
     /// Update the device event based on window focus.
     pub fn update_listen_device_events(&self, focus: bool) {
         let device_events = self.device_events.get() == DeviceEvents::Always
@@ -648,6 +673,14 @@ impl ActiveEventLoop {
             .expect_then_ignore_error("Failed to update device event filter");
     }
 
+    #[cfg(feature = "rwh_05")]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        let mut display_handle = rwh_05::XlibDisplayHandle::empty();
+        display_handle.display = self.xconn.display as *mut _;
+        display_handle.screen = self.xconn.default_screen_index() as c_int;
+        display_handle.into()
+    }
+
     #[cfg(feature = "rwh_06")]
     pub fn raw_display_handle_rwh_06(
         &self,
@@ -663,10 +696,26 @@ impl ActiveEventLoop {
         Ok(display_handle.into())
     }
 
+    pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
+        self.control_flow.set(control_flow)
+    }
+
+    pub(crate) fn control_flow(&self) -> ControlFlow {
+        self.control_flow.get()
+    }
+
+    pub(crate) fn exit(&self) {
+        self.exit.set(Some(0))
+    }
+
     pub(crate) fn clear_exit(&self) {
         self.exit.set(None)
     }
 
+    pub(crate) fn exiting(&self) -> bool {
+        self.exit.get().is_some()
+    }
+
     pub(crate) fn set_exit_code(&self, code: i32) {
         self.exit.set(Some(code))
     }
@@ -676,102 +725,9 @@ impl ActiveEventLoop {
     }
 }
 
-impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
-        crate::event_loop::EventLoopProxy {
-            event_loop_proxy: crate::platform_impl::EventLoopProxy::X(
-                self.event_loop_proxy.clone(),
-            ),
-        }
-    }
-
-    fn create_window(
-        &self,
-        window_attributes: WindowAttributes,
-    ) -> Result<crate::window::Window, RootOsError> {
-        let window = crate::platform_impl::x11::Window::new(self, window_attributes)?;
-        let window = crate::platform_impl::Window::X(window);
-        Ok(crate::window::Window { window })
-    }
-
-    fn create_custom_cursor(
-        &self,
-        custom_cursor: CustomCursorSource,
-    ) -> Result<RootCustomCursor, ExternalError> {
-        Ok(RootCustomCursor {
-            inner: PlatformCustomCursor::X(CustomCursor::new(self, custom_cursor.inner)?),
-        })
-    }
-
-    fn available_monitors(&self) -> Box<dyn Iterator<Item = crate::monitor::MonitorHandle>> {
-        Box::new(
-            self.xconn
-                .available_monitors()
-                .into_iter()
-                .flatten()
-                .map(crate::platform_impl::MonitorHandle::X)
-                .map(|inner| crate::monitor::MonitorHandle { inner }),
-        )
-    }
-
-    fn primary_monitor(&self) -> Option<crate::monitor::MonitorHandle> {
-        self.xconn
-            .primary_monitor()
-            .ok()
-            .map(crate::platform_impl::MonitorHandle::X)
-            .map(|inner| crate::monitor::MonitorHandle { inner })
-    }
-
-    fn system_theme(&self) -> Option<Theme> {
-        None
-    }
-
-    fn listen_device_events(&self, allowed: DeviceEvents) {
-        self.device_events.set(allowed);
-    }
-
-    fn set_control_flow(&self, control_flow: ControlFlow) {
-        self.control_flow.set(control_flow)
-    }
-
-    fn control_flow(&self) -> ControlFlow {
-        self.control_flow.get()
-    }
-
-    fn exit(&self) {
-        self.exit.set(Some(0))
-    }
-
-    fn exiting(&self) -> bool {
-        self.exit.get().is_some()
-    }
-
-    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
-        let handle = OwnedDisplayHandle::X(self.x_connection().clone());
-        RootOwnedDisplayHandle { platform: handle }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    #[cfg(feature = "rwh_06")]
-    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
-        self
-    }
-}
-
-#[cfg(feature = "rwh_06")]
-impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = self.raw_display_handle_rwh_06()?;
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
-    }
-}
-
-impl EventLoopProxy {
-    pub fn wake_up(&self) {
-        self.ping.ping();
+impl<T: 'static> EventLoopProxy<T> {
+    pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
+        self.user_sender.send(event).map_err(|e| EventLoopClosed(e.0))
     }
 }
 
@@ -817,21 +773,11 @@ pub struct DeviceId(xinput::DeviceId);
 
 impl DeviceId {
     #[allow(unused)]
-    pub const fn dummy() -> Self {
+    pub const unsafe fn dummy() -> Self {
         DeviceId(0)
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FingerId(u32);
-
-impl FingerId {
-    #[allow(unused)]
-    pub const fn dummy() -> Self {
-        FingerId(0)
-    }
-}
-
 pub(crate) struct Window(Arc<UnownedWindow>);
 
 impl Deref for Window {
@@ -865,17 +811,6 @@ impl Drop for Window {
     }
 }
 
-#[derive(Clone)]
-pub struct EventLoopProxy {
-    ping: Ping,
-}
-
-impl EventLoopProxy {
-    fn new(ping: Ping) -> Self {
-        Self { ping }
-    }
-}
-
 /// Generic sum error type for X11 errors.
 #[derive(Debug)]
 pub enum X11Error {
@@ -1037,10 +972,6 @@ fn mkdid(w: xinput::DeviceId) -> crate::event::DeviceId {
     crate::event::DeviceId(crate::platform_impl::DeviceId::X(DeviceId(w)))
 }
 
-fn mkfid(w: u32) -> crate::event::FingerId {
-    crate::event::FingerId(crate::platform_impl::FingerId::X(FingerId(w)))
-}
-
 #[derive(Debug)]
 pub struct Device {
     _name: String,

src/platform_impl/linux/x11/monitor.rs

@@ -1,12 +1,9 @@
-use std::num::{NonZeroU16, NonZeroU32};
-
-use x11rb::connection::RequestConnection;
-use x11rb::protocol::randr::{self, ConnectionExt as _};
-use x11rb::protocol::xproto;
-
 use super::{util, X11Error, XConnection};
 use crate::dpi::{PhysicalPosition, PhysicalSize};
 use crate::platform_impl::VideoModeHandle as PlatformVideoModeHandle;
+use x11rb::connection::RequestConnection;
+use x11rb::protocol::randr::{self, ConnectionExt as _};
+use x11rb::protocol::xproto;
 
 // Used for testing. This should always be committed as false.
 const DISABLE_MONITOR_LIST_CACHING: bool = false;
@@ -20,10 +17,9 @@ impl XConnection {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct VideoModeHandle {
-    pub(crate) current: bool,
     pub(crate) size: (u32, u32),
-    pub(crate) bit_depth: Option<NonZeroU16>,
-    pub(crate) refresh_rate_millihertz: Option<NonZeroU32>,
+    pub(crate) bit_depth: u16,
+    pub(crate) refresh_rate_millihertz: u32,
     pub(crate) native_mode: randr::Mode,
     pub(crate) monitor: Option<MonitorHandle>,
 }
@@ -35,12 +31,12 @@ impl VideoModeHandle {
     }
 
     #[inline]
-    pub fn bit_depth(&self) -> Option<NonZeroU16> {
+    pub fn bit_depth(&self) -> u16 {
         self.bit_depth
     }
 
     #[inline]
-    pub fn refresh_rate_millihertz(&self) -> Option<NonZeroU32> {
+    pub fn refresh_rate_millihertz(&self) -> u32 {
         self.refresh_rate_millihertz
     }
 
@@ -56,10 +52,14 @@ pub struct MonitorHandle {
     pub(crate) id: randr::Crtc,
     /// The name of the monitor
     pub(crate) name: String,
+    /// The size of the monitor
+    dimensions: (u32, u32),
     /// The position of the monitor in the X screen
-    pub(crate) position: (i32, i32),
+    position: (i32, i32),
     /// If the monitor is the primary one
     primary: bool,
+    /// The refresh rate used by monitor.
+    refresh_rate_millihertz: Option<u32>,
     /// The DPI scale factor
     pub(crate) scale_factor: f64,
     /// Used to determine which windows are on this monitor
@@ -95,12 +95,10 @@ impl std::hash::Hash for MonitorHandle {
 }
 
 #[inline]
-pub fn mode_refresh_rate_millihertz(mode: &randr::ModeInfo) -> Option<NonZeroU32> {
+pub fn mode_refresh_rate_millihertz(mode: &randr::ModeInfo) -> Option<u32> {
     if mode.dot_clock > 0 && mode.htotal > 0 && mode.vtotal > 0 {
         #[allow(clippy::unnecessary_cast)]
-        NonZeroU32::new(
-            (mode.dot_clock as u64 * 1000 / (mode.htotal as u64 * mode.vtotal as u64)) as u32,
-        )
+        Some((mode.dot_clock as u64 * 1000 / (mode.htotal as u64 * mode.vtotal as u64)) as u32)
     } else {
         None
     }
@@ -118,9 +116,27 @@ impl MonitorHandle {
         let dimensions = (crtc.width as u32, crtc.height as u32);
         let position = (crtc.x as i32, crtc.y as i32);
 
+        // Get the refresh rate of the current video mode.
+        let current_mode = crtc.mode;
+        let screen_modes = resources.modes();
+        let refresh_rate_millihertz = screen_modes
+            .iter()
+            .find(|mode| mode.id == current_mode)
+            .and_then(mode_refresh_rate_millihertz);
+
         let rect = util::AaRect::new(position, dimensions);
 
-        Some(MonitorHandle { id, name, scale_factor, position, primary, rect, video_modes })
+        Some(MonitorHandle {
+            id,
+            name,
+            refresh_rate_millihertz,
+            scale_factor,
+            dimensions,
+            position,
+            primary,
+            rect,
+            video_modes,
+        })
     }
 
     pub fn dummy() -> Self {
@@ -128,7 +144,9 @@ impl MonitorHandle {
             id: 0,
             name: "<dummy monitor>".into(),
             scale_factor: 1.0,
+            dimensions: (1, 1),
             position: (0, 0),
+            refresh_rate_millihertz: None,
             primary: true,
             rect: util::AaRect::new((0, 0), (1, 1)),
             video_modes: Vec::new(),
@@ -149,8 +167,16 @@ impl MonitorHandle {
         self.id as _
     }
 
-    pub fn position(&self) -> Option<PhysicalPosition<i32>> {
-        Some(self.position.into())
+    pub fn size(&self) -> PhysicalSize<u32> {
+        self.dimensions.into()
+    }
+
+    pub fn position(&self) -> PhysicalPosition<i32> {
+        self.position.into()
+    }
+
+    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
+        self.refresh_rate_millihertz
     }
 
     #[inline]
@@ -158,11 +184,6 @@ impl MonitorHandle {
         self.scale_factor
     }
 
-    #[inline]
-    pub fn current_video_mode(&self) -> Option<PlatformVideoModeHandle> {
-        self.video_modes.iter().find(|mode| mode.current).cloned().map(PlatformVideoModeHandle::X)
-    }
-
     #[inline]
     pub fn video_modes(&self) -> impl Iterator<Item = PlatformVideoModeHandle> {
         let monitor = self.clone();

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

@@ -1,6 +1,5 @@
-use x11rb::x11_utils::Serialize;
-
 use super::*;
+use x11rb::x11_utils::Serialize;
 
 impl XConnection {
     pub fn send_client_msg(

src/platform_impl/linux/x11/util/cursor.rs

@@ -5,11 +5,11 @@ use std::{iter, slice};
 
 use x11rb::connection::Connection;
 
+use crate::platform_impl::PlatformCustomCursorSource;
+use crate::window::CursorIcon;
+
 use super::super::ActiveEventLoop;
 use super::*;
-use crate::error::ExternalError;
-use crate::platform_impl::{OsError, PlatformCustomCursorSource};
-use crate::window::CursorIcon;
 
 impl XConnection {
     pub fn set_cursor_icon(&self, window: xproto::Window, cursor: Option<CursorIcon>) {
@@ -124,16 +124,14 @@ impl CustomCursor {
     pub(crate) fn new(
         event_loop: &ActiveEventLoop,
         cursor: PlatformCustomCursorSource,
-    ) -> Result<CustomCursor, ExternalError> {
+    ) -> CustomCursor {
         unsafe {
             let ximage = (event_loop.xconn.xcursor.XcursorImageCreate)(
                 cursor.0.width as i32,
                 cursor.0.height as i32,
             );
             if ximage.is_null() {
-                return Err(ExternalError::Os(os_error!(OsError::Misc(
-                    "`XcursorImageCreate` failed"
-                ))));
+                panic!("failed to allocate cursor image");
             }
             (*ximage).xhot = cursor.0.hotspot_x as u32;
             (*ximage).yhot = cursor.0.hotspot_y as u32;
@@ -150,9 +148,7 @@ impl CustomCursor {
             let cursor =
                 (event_loop.xconn.xcursor.XcursorImageLoadCursor)(event_loop.xconn.display, ximage);
             (event_loop.xconn.xcursor.XcursorImageDestroy)(ximage);
-            Ok(Self {
-                inner: Arc::new(CustomCursorInner { xconn: event_loop.xconn.clone(), cursor }),
-            })
+            Self { inner: Arc::new(CustomCursorInner { xconn: event_loop.xconn.clone(), cursor }) }
         }
     }
 }

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

@@ -1,7 +1,7 @@
+use crate::platform::x11::WindowType;
 use std::sync::Arc;
 
 use super::*;
-use crate::platform::x11::WindowType;
 
 #[derive(Debug)]
 #[allow(dead_code)]

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

@@ -1,5 +1,4 @@
 use std::{slice, str};
-
 use x11rb::protocol::xinput::{self, ConnectionExt as _};
 use x11rb::protocol::xkb;
 

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

@@ -20,8 +20,6 @@ mod window_property;
 mod wm;
 mod xmodmap;
 
-use x11rb::protocol::xproto::{self, ConnectionExt as _};
-
 pub use self::cursor::*;
 pub use self::geometry::*;
 pub use self::hint::*;
@@ -30,8 +28,10 @@ pub use self::mouse::*;
 pub use self::window_property::*;
 pub use self::wm::*;
 pub use self::xmodmap::ModifierKeymap;
+
 use super::atoms::*;
 use super::{ffi, VoidCookie, X11Error, XConnection, XError};
+use x11rb::protocol::xproto::{self, ConnectionExt as _};
 
 pub fn maybe_change<T: PartialEq>(field: &mut Option<T>, value: T) -> bool {
     let wrapped = Some(value);

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

@@ -1,14 +1,13 @@
-use std::num::NonZeroU16;
 use std::str::FromStr;
 use std::{env, str};
 
-use tracing::warn;
-use x11rb::protocol::randr::{self, ConnectionExt as _};
-
 use super::*;
 use crate::dpi::validate_scale_factor;
 use crate::platform_impl::platform::x11::{monitor, VideoModeHandle};
 
+use tracing::warn;
+use x11rb::protocol::randr::{self, ConnectionExt as _};
+
 /// Represents values of `WINIT_HIDPI_FACTOR`.
 pub enum EnvVarDPI {
     Randr,
@@ -75,7 +74,6 @@ impl XConnection {
         let bit_depth = self.default_root().root_depth;
         let output_modes = &output_info.modes;
         let resource_modes = resources.modes();
-        let current_mode = crtc.mode;
 
         let modes = resource_modes
             .iter()
@@ -84,10 +82,10 @@ impl XConnection {
             .filter(|x| output_modes.iter().any(|id| x.id == *id))
             .map(|mode| {
                 VideoModeHandle {
-                    current: mode.id == current_mode,
                     size: (mode.width.into(), mode.height.into()),
-                    refresh_rate_millihertz: monitor::mode_refresh_rate_millihertz(mode),
-                    bit_depth: NonZeroU16::new(bit_depth as u16),
+                    refresh_rate_millihertz: monitor::mode_refresh_rate_millihertz(mode)
+                        .unwrap_or(0),
+                    bit_depth: bit_depth as u16,
                     native_mode: mode.id,
                     // This is populated in `MonitorHandle::video_modes` as the
                     // video mode is returned to the user

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

@@ -3,6 +3,7 @@ use std::fmt;
 use std::sync::Arc;
 
 use bytemuck::{NoUninit, Pod};
+
 use x11rb::connection::Connection;
 use x11rb::errors::ReplyError;
 

src/platform_impl/linux/x11/window.rs

@@ -1,24 +1,18 @@
 use std::ffi::CString;
 use std::mem::replace;
-use std::num::NonZeroU32;
 use std::os::raw::*;
 use std::path::Path;
 use std::sync::{Arc, Mutex, MutexGuard};
 use std::{cmp, env};
 
 use tracing::{debug, info, warn};
-use x11rb::connection::{Connection, RequestConnection};
+use x11rb::connection::Connection;
 use x11rb::properties::{WmHints, WmSizeHints, WmSizeHintsSpecification};
 use x11rb::protocol::shape::SK;
-use x11rb::protocol::sync::{ConnectionExt as _, Int64};
 use x11rb::protocol::xfixes::{ConnectionExt, RegionWrapper};
 use x11rb::protocol::xproto::{self, ConnectionExt as _, Rectangle};
 use x11rb::protocol::{randr, xinput};
 
-use super::util::{self, SelectedCursor};
-use super::{
-    ffi, ActiveEventLoop, CookieResultExt, ImeRequest, ImeSender, VoidCookie, WindowId, XConnection,
-};
 use crate::cursor::{Cursor, CustomCursor as RootCustomCursor};
 use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{ExternalError, NotSupportedError, OsError as RootOsError};
@@ -38,6 +32,11 @@ use crate::window::{
     WindowButtons, WindowLevel,
 };
 
+use super::util::{self, SelectedCursor};
+use super::{
+    ffi, ActiveEventLoop, CookieResultExt, ImeRequest, ImeSender, VoidCookie, WindowId, XConnection,
+};
+
 #[derive(Debug)]
 pub struct SharedState {
     pub cursor_pos: Option<(f64, f64)>,
@@ -118,7 +117,6 @@ pub struct UnownedWindow {
     root: xproto::Window,               // never changes
     #[allow(dead_code)]
     screen_id: i32, // never changes
-    sync_counter_id: Option<NonZeroU32>, // never changes
     selected_cursor: Mutex<SelectedCursor>,
     cursor_grabbed_mode: Mutex<CursorGrabMode>,
     #[allow(clippy::mutex_atomic)]
@@ -341,7 +339,6 @@ impl UnownedWindow {
             visual,
             root,
             screen_id,
-            sync_counter_id: None,
             selected_cursor: Default::default(),
             cursor_grabbed_mode: Mutex::new(CursorGrabMode::None),
             cursor_visible: Mutex::new(true),
@@ -472,44 +469,21 @@ impl UnownedWindow {
                 leap!(window.set_icon_inner(icon.inner)).ignore_error();
             }
 
-            // Opt into handling window close and resize synchronization
+            // Opt into handling window close
             let result = xconn.xcb_connection().change_property(
                 xproto::PropMode::REPLACE,
                 window.xwindow,
                 atoms[WM_PROTOCOLS],
                 xproto::AtomEnum::ATOM,
                 32,
-                3,
+                2,
                 bytemuck::cast_slice::<xproto::Atom, u8>(&[
                     atoms[WM_DELETE_WINDOW],
                     atoms[_NET_WM_PING],
-                    atoms[_NET_WM_SYNC_REQUEST],
                 ]),
             );
             leap!(result).ignore_error();
 
-            // Create a sync request counter
-            if leap!(xconn.xcb_connection().extension_information("SYNC")).is_some() {
-                let sync_counter_id = leap!(xconn.xcb_connection().generate_id());
-                window.sync_counter_id = NonZeroU32::new(sync_counter_id);
-
-                leap!(xconn
-                    .xcb_connection()
-                    .sync_create_counter(sync_counter_id, Int64::default()))
-                .ignore_error();
-
-                let result = xconn.xcb_connection().change_property(
-                    xproto::PropMode::REPLACE,
-                    window.xwindow,
-                    atoms[_NET_WM_SYNC_REQUEST_COUNTER],
-                    xproto::AtomEnum::CARDINAL,
-                    32,
-                    1,
-                    bytemuck::cast_slice::<u32, u8>(&[sync_counter_id]),
-                );
-                leap!(result).ignore_error();
-            }
-
             // Set visibility (map window)
             if window_attrs.visible {
                 leap!(xconn.xcb_connection().map_window(window.xwindow)).ignore_error();
@@ -822,7 +796,7 @@ impl UnownedWindow {
 
                 let window_position = self.outer_position_physical();
                 self.shared_state_lock().restore_position = Some(window_position);
-                let monitor_origin: (i32, i32) = monitor.position;
+                let monitor_origin: (i32, i32) = monitor.position().into();
                 self.set_position_inner(monitor_origin.0, monitor_origin.1)
                     .expect_then_ignore_error("Failed to set window position");
                 self.set_fullscreen_hint(true).map(Some)
@@ -902,11 +876,11 @@ impl UnownedWindow {
 
     /// Refresh the API for the given monitor.
     #[inline]
-    pub(super) fn refresh_dpi_for_monitor(
+    pub(super) fn refresh_dpi_for_monitor<T: 'static>(
         &self,
         new_monitor: &X11MonitorHandle,
         maybe_prev_scale_factor: Option<f64>,
-        mut callback: impl FnMut(Event),
+        mut callback: impl FnMut(Event<T>),
     ) {
         // Check if the self is on this monitor
         let monitor = self.shared_state_lock().last_monitor.clone();
@@ -1831,7 +1805,9 @@ impl UnownedWindow {
     #[inline]
     pub fn request_activation_token(&self) -> Result<AsyncRequestSerial, NotSupportedError> {
         let serial = AsyncRequestSerial::get();
-        self.activation_sender.send((self.id(), serial));
+        self.activation_sender
+            .send((self.id(), serial))
+            .expect("activation token channel should never be closed");
         Ok(serial)
     }
 
@@ -1840,13 +1816,9 @@ impl UnownedWindow {
         WindowId(self.xwindow as _)
     }
 
-    pub(super) fn sync_counter_id(&self) -> Option<NonZeroU32> {
-        self.sync_counter_id
-    }
-
     #[inline]
     pub fn request_redraw(&self) {
-        self.redraw_sender.send(WindowId(self.xwindow as _));
+        self.redraw_sender.send(WindowId(self.xwindow as _)).unwrap();
     }
 
     #[inline]
@@ -1854,6 +1826,34 @@ impl UnownedWindow {
         // TODO timer
     }
 
+    #[cfg(feature = "rwh_04")]
+    #[inline]
+    pub fn raw_window_handle_rwh_04(&self) -> rwh_04::RawWindowHandle {
+        let mut window_handle = rwh_04::XlibHandle::empty();
+        window_handle.display = self.xlib_display();
+        window_handle.window = self.xlib_window();
+        window_handle.visual_id = self.visual as c_ulong;
+        rwh_04::RawWindowHandle::Xlib(window_handle)
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_window_handle_rwh_05(&self) -> rwh_05::RawWindowHandle {
+        let mut window_handle = rwh_05::XlibWindowHandle::empty();
+        window_handle.window = self.xlib_window();
+        window_handle.visual_id = self.visual as c_ulong;
+        window_handle.into()
+    }
+
+    #[cfg(feature = "rwh_05")]
+    #[inline]
+    pub fn raw_display_handle_rwh_05(&self) -> rwh_05::RawDisplayHandle {
+        let mut display_handle = rwh_05::XlibDisplayHandle::empty();
+        display_handle.display = self.xlib_display();
+        display_handle.screen = self.screen_id;
+        display_handle.into()
+    }
+
     #[cfg(feature = "rwh_06")]
     #[inline]
     pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {

src/platform_impl/linux/x11/xdisplay.rs

@@ -4,17 +4,17 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{Arc, Mutex, RwLock, RwLockReadGuard};
 use std::{fmt, ptr};
 
+use crate::window::CursorIcon;
+
+use super::atoms::Atoms;
+use super::ffi;
+use super::monitor::MonitorHandle;
 use x11rb::connection::Connection;
 use x11rb::protocol::randr::ConnectionExt as _;
 use x11rb::protocol::xproto::{self, ConnectionExt};
 use x11rb::resource_manager;
 use x11rb::xcb_ffi::XCBConnection;
 
-use super::atoms::Atoms;
-use super::ffi;
-use super::monitor::MonitorHandle;
-use crate::window::CursorIcon;
-
 /// A connection to an X server.
 pub struct XConnection {
     pub xlib: ffi::Xlib,

src/platform_impl/macos/app.rs

@@ -5,7 +5,6 @@ use objc2_app_kit::{NSApplication, NSEvent, NSEventModifierFlags, NSEventType, N
 use objc2_foundation::{MainThreadMarker, NSObject};
 
 use super::app_state::ApplicationDelegate;
-use super::DEVICE_ID;
 use crate::event::{DeviceEvent, ElementState};
 
 declare_class!(
@@ -57,30 +56,30 @@ fn maybe_dispatch_device_event(delegate: &ApplicationDelegate, event: &NSEvent)
             let delta_x = unsafe { event.deltaX() } as f64;
             let delta_y = unsafe { event.deltaY() } as f64;
 
+            if delta_x != 0.0 {
+                delegate.maybe_queue_device_event(DeviceEvent::Motion { axis: 0, value: delta_x });
+            }
+
+            if delta_y != 0.0 {
+                delegate.maybe_queue_device_event(DeviceEvent::Motion { axis: 1, value: delta_y })
+            }
+
             if delta_x != 0.0 || delta_y != 0.0 {
-                delegate.maybe_queue_with_handler(move |app, event_loop| {
-                    app.device_event(event_loop, DEVICE_ID, DeviceEvent::MouseMotion {
-                        delta: (delta_x, delta_y),
-                    });
+                delegate.maybe_queue_device_event(DeviceEvent::MouseMotion {
+                    delta: (delta_x, delta_y),
                 });
             }
         },
         NSEventType::LeftMouseDown | NSEventType::RightMouseDown | NSEventType::OtherMouseDown => {
-            let button = unsafe { event.buttonNumber() } as u32;
-            delegate.maybe_queue_with_handler(move |app, event_loop| {
-                app.device_event(event_loop, DEVICE_ID, DeviceEvent::Button {
-                    button,
-                    state: ElementState::Pressed,
-                });
+            delegate.maybe_queue_device_event(DeviceEvent::Button {
+                button: unsafe { event.buttonNumber() } as u32,
+                state: ElementState::Pressed,
             });
         },
         NSEventType::LeftMouseUp | NSEventType::RightMouseUp | NSEventType::OtherMouseUp => {
-            let button = unsafe { event.buttonNumber() } as u32;
-            delegate.maybe_queue_with_handler(move |app, event_loop| {
-                app.device_event(event_loop, DEVICE_ID, DeviceEvent::Button {
-                    button,
-                    state: ElementState::Released,
-                });
+            delegate.maybe_queue_device_event(DeviceEvent::Button {
+                button: unsafe { event.buttonNumber() } as u32,
+                state: ElementState::Released,
             });
         },
         _ => (),