chore: Rebase on latest master

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

.github/CODEOWNERS

@@ -1,12 +1,6 @@
-# Core maintainers:
-# - @msiglreith
-# - @kchibisov
-# - @madsmtm
-# - @maroider
-
 # Android
-/src/platform/android.rs            @msiglreith
+/src/platform/android.rs            @msiglreith @MarijnS95
-/src/platform_impl/android          @msiglreith
+/src/platform_impl/android          @msiglreith @MarijnS95
 
 # iOS
 /src/platform/ios.rs                @madsmtm
@@ -20,16 +14,16 @@
 /src/platform_impl/linux/wayland    @kchibisov
 
 # X11
-/src/platform/x11.rs                @kchibisov
+/src/platform/x11.rs                @kchibisov @notgull
-/src/platform_impl/linux/x11        @kchibisov
+/src/platform_impl/linux/x11        @kchibisov @notgull
 
 # macOS
 /src/platform/macos.rs              @madsmtm
 /src/platform_impl/macos            @madsmtm
 
-# Web (no maintainer)
+# Web
-/src/platform/web.rs
+/src/platform/web.rs                @daxpedda
-/src/platform_impl/web
+/src/platform_impl/web              @daxpedda
 
 # Windows
 /src/platform/windows.rs            @msiglreith

.github/workflows/ci.yml

@@ -6,116 +6,198 @@ on:
     branches: [master]
 
 jobs:
-  Check_Formatting:
+  fmt:
+    name: Check formatting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    - uses: hecrj/setup-rust-action@v1
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        rust-version: stable
         components: rustfmt
     - name: Check Formatting
-      run: cargo +stable fmt --all -- --check
+      run: cargo fmt -- --check
 
   tests:
-    name: Tests
+    name: Test ${{ matrix.toolchain }} ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
+
     strategy:
       fail-fast: false
       matrix:
-        rust_version: ['1.60.0', stable, nightly]
+        toolchain: [stable, nightly, '1.70.0']
         platform:
           # Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml!
-          - { target: x86_64-pc-windows-msvc,   os: windows-latest,  }
+          - { name: 'Windows 64bit MSVC', target: x86_64-pc-windows-msvc,   os: windows-latest,  }
-          - { target: i686-pc-windows-msvc,     os: windows-latest,  }
+          - { name: 'Windows 32bit MSVC', target: i686-pc-windows-msvc,     os: windows-latest,  }
-          - { target: x86_64-pc-windows-gnu,    os: windows-latest, host: -x86_64-pc-windows-gnu }
+          - { name: 'Windows 64bit GNU',  target: x86_64-pc-windows-gnu,    os: windows-latest, host: -x86_64-pc-windows-gnu }
-          - { target: i686-pc-windows-gnu,      os: windows-latest, host: -i686-pc-windows-gnu }
+          - { name: 'Windows 32bit GNU',  target: i686-pc-windows-gnu,      os: windows-latest, host: -i686-pc-windows-gnu }
-          - { target: i686-unknown-linux-gnu,   os: ubuntu-latest,   }
+          - { name: 'Linux 32bit',        target: i686-unknown-linux-gnu,   os: ubuntu-latest,   }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest,   }
+          - { name: 'Linux 64bit',        target: x86_64-unknown-linux-gnu, os: ubuntu-latest,   }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: x11 }
+          - { name: 'X11',                target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=x11' }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "wayland,wayland-dlopen" }
+          - { name: 'Wayland',            target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' }
-          - { target: aarch64-linux-android,    os: ubuntu-latest, options: -p winit, cmd: 'apk --', features: "android-native-activity" }
+          - { name: 'Android',            target: aarch64-linux-android,    os: ubuntu-latest, options: '--features=android-native-activity', cmd: 'apk --' }
-          - { target: x86_64-unknown-redox,     os: ubuntu-latest,   }
+          - { name: 'Redox OS',           target: x86_64-unknown-redox,     os: ubuntu-latest,   }
-          - { target: x86_64-apple-darwin,      os: macos-latest,    }
+          - { name: 'macOS',              target: x86_64-apple-darwin,      os: macos-latest,    }
-          - { target: x86_64-apple-ios,         os: macos-latest,    }
+          - { name: 'iOS x86_64',         target: x86_64-apple-ios,         os: macos-latest,    }
-          - { target: aarch64-apple-ios,        os: macos-latest,    }
+          - { name: 'iOS Aarch64',        target: aarch64-apple-ios,        os: macos-latest,    }
-          # We're using Windows rather than Ubuntu to run the wasm tests because caching cargo-web
+          - { name: 'web',                target: wasm32-unknown-unknown,   os: ubuntu-latest,   }
-          # doesn't currently work on Linux.
+        exclude:
-          - { target: wasm32-unknown-unknown,   os: windows-latest,  }
+          # Android is tested on stable-3
+          - toolchain: '1.70.0'
+            platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
+        include:
+          - toolchain: '1.70.0'
+            platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
+          - toolchain: 'nightly'
+            platform: {
+              name:       'web Atomic',
+              target:     wasm32-unknown-unknown,
+              os:         ubuntu-latest,
+              options:    '-Zbuild-std=panic_abort,std',
+              rustflags:  '-Ctarget-feature=+atomics,+bulk-memory',
+              components: rust-src,
+            }
 
     env:
+      # Set more verbose terminal output
+      CARGO_TERM_VERBOSE: true
       RUST_BACKTRACE: 1
-      CARGO_INCREMENTAL: 0
+
-      RUSTFLAGS: "-C debuginfo=0 --deny warnings"
+      # Faster compilation and error on warnings
-      OPTIONS: ${{ matrix.platform.options }}
+      RUSTFLAGS: '--codegen=debuginfo=0 --deny=warnings ${{ matrix.platform.rustflags }}'
-      FEATURES: ${{ format(',{0}', matrix.platform.features ) }}
+
+      OPTIONS: --target=${{ matrix.platform.target }} ${{ matrix.platform.options }}
       CMD: ${{ matrix.platform.cmd }}
-      RUSTDOCFLAGS: -Dwarnings
 
-    runs-on: ${{ matrix.platform.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
-    # Used to cache cargo-web
-    - name: Cache cargo folder
-      uses: actions/cache@v1
-      with:
-        path: ~/.cargo
-        key: ${{ matrix.platform.target }}-cargo-${{ matrix.rust_version }}
 
-    - uses: hecrj/setup-rust-action@v1
+    - name: Restore cache of cargo folder
+      # We use `restore` and later `save`, so that we can create the key after
+      # the cache has been downloaded.
+      #
+      # This could be avoided if we added Cargo.lock to the repository.
+      uses: actions/cache/restore@v3
       with:
-        rust-version: ${{ matrix.rust_version }}${{ matrix.platform.host }}
+        # https://doc.rust-lang.org/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci
-        targets: ${{ matrix.platform.target }}
+        path: |
-        components: clippy
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+        key: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}-never-intended-to-be-found
+        restore-keys: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}
+
+    - name: Generate lockfile
+      # Also updates the crates.io index
+      run: cargo generate-lockfile
 
     - name: Install GCC Multilib
       if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
       run: sudo apt-get update && sudo apt-get install gcc-multilib
-    - name: Install cargo-apk
+
+    - name: Cache cargo-apk
       if: contains(matrix.platform.target, 'android')
-      run: cargo install cargo-apk
+      id: cargo-apk-cache
+      uses: actions/cache@v3
+      with:
+        path: ~/.cargo/bin/cargo-apk
+        # Change this key if we update the required cargo-apk version
+        key: cargo-apk-v0-9-7
+
+    - uses: dtolnay/rust-toolchain@master
+      if: contains(matrix.platform.target, 'android') && (steps.cargo-apk-cache.outputs.cache-hit != 'true')
+      with:
+        toolchain: stable
+
+    - name: Install cargo-apk
+      if: contains(matrix.platform.target, 'android') && (steps.cargo-apk-cache.outputs.cache-hit != 'true')
+      run: cargo install cargo-apk --version=^0.9.7 --locked
+
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.toolchain }}${{ matrix.platform.host }}
+        targets: ${{ matrix.platform.target }}
+        components: clippy, ${{ matrix.platform.components }}
 
     - name: Check documentation
-      shell: bash
+      run: cargo doc --no-deps $OPTIONS --document-private-items
-      run: cargo doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES --document-private-items
+      env:
+        RUSTDOCFLAGS: '--deny=warnings ${{ matrix.platform.rustflags }}'
 
     - name: Build crate
-      shell: bash
+      run: cargo $CMD build -p winit $OPTIONS
-      run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
 
     - name: Build tests
-      shell: bash
       if: >
         !contains(matrix.platform.target, 'redox') &&
-        matrix.rust_version != '1.60.0'
+        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
+      run: cargo $CMD test -p winit --no-run $OPTIONS
 
     - name: Run tests
-      shell: bash
       if: >
         !contains(matrix.platform.target, 'android') &&
         !contains(matrix.platform.target, 'ios') &&
         !contains(matrix.platform.target, 'wasm32') &&
         !contains(matrix.platform.target, 'redox') &&
-        matrix.rust_version != '1.60.0'
+        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
+      run: cargo $CMD test $OPTIONS
 
     - name: Lint with clippy
-      shell: bash
+      if: (matrix.toolchain == 'stable') && !contains(matrix.platform.options, '--no-default-features')
-      if: (matrix.rust_version == 'stable') && !contains(matrix.platform.options, '--no-default-features')
+      run: cargo clippy --all-targets $OPTIONS -- -Dwarnings
-      run: cargo clippy --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings
 
     - name: Build tests with serde enabled
-      shell: bash
       if: >
         !contains(matrix.platform.target, 'redox') &&
-        matrix.rust_version != '1.60.0'
+        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
+      run: cargo $CMD test --no-run $OPTIONS -p winit --features serde
+
     - name: Run tests with serde enabled
-      shell: bash
       if: >
         !contains(matrix.platform.target, 'android') &&
         !contains(matrix.platform.target, 'ios') &&
         !contains(matrix.platform.target, 'wasm32') &&
         !contains(matrix.platform.target, 'redox') &&
-        matrix.rust_version != '1.60.0'
+        matrix.toolchain != '1.70.0'
-      run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
+      run: cargo $CMD test $OPTIONS --features serde
+
+    - name: Check docs.rs documentation
+      if: matrix.toolchain == 'nightly'
+      run: cargo doc --no-deps $OPTIONS --features=rwh_04,rwh_05,rwh_06,serde,mint,android-native-activity
+      env:
+        RUSTDOCFLAGS: '--deny=warnings ${{ matrix.platform.rustflags }} --cfg=docsrs'
+
+    # See restore step above
+    - name: Save cache of cargo folder
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+        key: cargo-${{ matrix.toolchain }}-${{ matrix.platform.name }}-${{ hashFiles('Cargo.lock') }}
+
+  cargo-deny:
+    name: Run cargo-deny on ${{ matrix.platform.name }}
+    runs-on: ubuntu-latest
+
+    # TODO: remove this matrix when https://github.com/EmbarkStudios/cargo-deny/issues/324 is resolved
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - { name: 'Android', target: aarch64-linux-android }
+          - { name: 'iOS', target: aarch64-apple-ios }
+          - { name: 'Linux', target: x86_64-unknown-linux-gnu }
+          - { name: 'macOS', target: x86_64-apple-darwin }
+          - { name: 'Redox OS', target: x86_64-unknown-redox }
+          - { name: 'web', target: wasm32-unknown-unknown }
+          - { name: 'Windows', target: x86_64-pc-windows-gnu }
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@v1
+      with:
+        command: check
+        log-level: error
+        arguments: --all-features --target ${{ matrix.platform.target }}

.github/workflows/docs.yml

@@ -0,0 +1,50 @@
+name: Docs
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  docs:
+    name: Documentation
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}winit
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+
+      - name: Run Rustdoc
+        env:
+          RUSTDOCFLAGS: --crate-version master --cfg=docsrs
+        run: |
+          cargo doc --no-deps -Z rustdoc-map -Z rustdoc-scrape-examples --features=rwh_04,rwh_05,rwh_06,serde,mint,android-native-activity
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Fix permissions
+        run: |
+          chmod -c -R +rX "target/doc" | while read line; do
+            echo "::warning title=Invalid file permissions automatically fixed::$line"
+          done
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: target/doc
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitmodules

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

CHANGELOG.md

@@ -2,12 +2,338 @@
 
 All notable changes to this project will be documented in this file.
 
-Please keep one empty line before and after all headers. (This is required for `git` to produce a conflict when a release is made while a PR is open and the PR's changelog entry would go into the wrong section).
+Please keep one empty line before and after all headers. (This is required for
+`git` to produce a conflict when a release is made while a PR is open and the
+PR's changelog entry would go into the wrong section).
 
-And please only add new entries to the top of this list, right below the `# Unreleased` header.
+And please only add new entries to the top of this list, right below the `#
+Unreleased` header.
 
 # Unreleased
 
+- On X11, fix swapped instance and general class names.
+- **Breaking:** Removed unnecessary generic parameter `T` from `EventLoopWindowTarget`.
+- On Windows, macOS, X11, Wayland and Web, implement setting images as cursors. See the `custom_cursors.rs` example.
+  - **Breaking:** Remove `Window::set_cursor_icon`
+  - Add `WindowBuilder::with_cursor` and `Window::set_cursor` which takes a `CursorIcon` or `CustomCursor`
+  - Add `CustomCursor`
+  - Add `CustomCursor::from_rgba` to allow creating cursor images from RGBA data.
+  - Add `CustomCursorExtWebSys::from_url` to allow loading cursor images from URLs.
+  - Add `CustomCursorExtWebSys::from_animation` to allow creating animated cursors from other `CustomCursor`s.
+- On macOS, add services menu.
+- **Breaking:** On Web, remove queuing fullscreen request in absence of transient activation.
+- On Web, fix setting cursor icon overriding cursor visibility.
+- **Breaking:** On Web, return `RawWindowHandle::WebCanvas` instead of `RawWindowHandle::Web`.
+- **Breaking:** On Web, macOS and iOS, return `HandleError::Unavailable` when a window handle is not available.
+- **Breaking:** Bump MSRV from `1.65` to `1.70`.
+- On Web, add the ability to toggle calling `Event.preventDefault()` on `Window`.
+- **Breaking:** Remove `WindowAttributes::fullscreen()` and expose as field directly.
+- **Breaking:** Rename `VideoMode` to `VideoModeHandle` to represent that it doesn't hold static data.
+- **Breaking:** No longer export `platform::x11::XNotSupported`.
+- **Breaking:** Renamed `platform::x11::XWindowType` to `platform::x11::WindowType`.
+- Add the `OwnedDisplayHandle` type for allowing safe display handle usage outside of trivial cases.
+- **Breaking:** Rename `TouchpadMagnify` to `PinchGesture`, `SmartMagnify` to `DoubleTapGesture` and `TouchpadRotate` to `RotationGesture` to represent the action rather than the intent.
+- on iOS, add detection support for `PinchGesture`, `DoubleTapGesture` and `RotationGesture`.
+- on Windows: add `with_system_backdrop`, `with_border_color`, `with_title_background_color`, `with_title_text_color` and `with_corner_preference`
+- On Windows, Remove `WS_CAPTION`, `WS_BORDER` and `WS_EX_WINDOWEDGE` styles for child windows without decorations.
+- On Windows, fixed a race condition when sending an event through the loop proxy.
+- **Breaking:** Removed `EventLoopError::AlreadyRunning`, which can't happen as it is already prevented by the type system.
+- On Wayland, disable `Occluded` event handling.
+- Added `EventLoop::builder`, which is intended to replace the (now deprecated) `EventLoopBuilder::new`.
+- **Breaking:** Changed the signature of `EventLoop::with_user_event` to return a builder.
+- **Breaking:** Removed `EventLoopBuilder::with_user_event`, the functionality is now available in `EventLoop::with_user_event`.
+- Add `Window::builder`, which is intended to replace the (now deprecated) `WindowBuilder::new`.
+- On X11, reload dpi on `_XSETTINGS_SETTINGS` update.
+- On X11, fix deadlock when adjusting DPI and resizing at the same time.
+- On Wayland, fix `Focused(false)` being send when other seats still have window focused.
+- On Wayland, fix `Window::set_{min,max}_inner_size` not always applied.
+- On Windows, fix inconsistent resizing behavior with multi-monitor setups when repositioning outside the event loop.
+- On Wayland, fix `WAYLAND_SOCKET` not used when detecting platform.
+- **Breaking:** Move some types to the `winit-core` crate. Most types are
+  re-exported verbatim; however:
+  - `Event`, `WindowEvent` and `KeyEvent` now take a generic that `winit`
+    implements.
+  - `ActivationToken` and `InnerSizeWriter` expose new methods to make them
+    useful.
+  - `InnerSizeWriter::request_inner_size` returns an `InnerSizeIgnored` error
+    instead of an `ExternalError`.
+
+# 0.29.10
+
+- On Web, account for canvas being focused already before event loop starts.
+- On Web, increase cursor position accuracy.
+
+# 0.29.9
+
+- On X11, fix `NotSupported` error not propagated when creating event loop.
+- On Wayland, fix resize not issued when scale changes
+- On X11 and Wayland, fix arrow up on keypad reported as `ArrowLeft`.
+- On macOS, report correct logical key when Ctrl or Cmd is pressed.
+
+# 0.29.8
+
+- On X11, fix IME input lagging behind.
+- On X11, fix `ModifiersChanged` not sent from xdotool-like input
+- On X11, fix keymap not updated from xmodmap.
+- On X11, reduce the amount of time spent fetching screen resources.
+- On Wayland, fix `Window::request_inner_size` being overwritten by resize.
+- On Wayland, fix `Window::inner_size` not using the correct rounding.
+
+# 0.29.7
+
+- On X11, fix `Xft.dpi` reload during runtime.
+- On X11, fix window minimize.
+
+# 0.29.6
+
+- On Web, fix context menu not being disabled by `with_prevent_default(true)`.
+- On Wayland, fix `WindowEvent::Destroyed` not being delivered after destroying window.
+- Fix `EventLoopExtRunOnDemand::run_on_demand` not working for consequent invocation
+
+# 0.29.5
+
+- On macOS, remove spurious error logging when handling `Fn`.
+- On X11, fix an issue where floating point data from the server is
+  misinterpreted during a drag and drop operation.
+- On X11, fix a bug where focusing the window would panic.
+- On macOS, fix `refresh_rate_millihertz`.
+- On Wayland, disable Client Side Decorations when `wl_subcompositor` is not supported.
+- On X11, fix `Xft.dpi` detection from Xresources.
+- On Windows, fix consecutive calls to `window.set_fullscreen(Some(Fullscreen::Borderless(None)))` resulting in losing previous window state when eventually exiting fullscreen using `window.set_fullscreen(None)`.
+- On Wayland, fix resize being sent on focus change.
+- On Windows, fix `set_ime_cursor_area`.
+
+# 0.29.4
+
+- Fix crash when running iOS app on macOS.
+- On X11, check common alternative cursor names when loading cursor.
+- On X11, reload the DPI after a property change event.
+- On Windows, fix so `drag_window` and `drag_resize_window` can be called from another thread.
+- On Windows, fix `set_control_flow` in `AboutToWait` not being taken in account.
+- On macOS, send a `Resized` event after each `ScaleFactorChanged` event.
+- On Wayland, fix `wl_surface` being destroyed before associated objects.
+- On macOS, fix assertion when pressing `Fn` key.
+- On Windows, add `WindowBuilderExtWindows::with_clip_children` to control `WS_CLIPCHILDREN` style.
+
+# 0.29.3
+
+- On Wayland, apply correct scale to `PhysicalSize` passed in `WindowBuilder::with_inner_size` when possible.
+- On Wayland, fix `RedrawRequsted` being always sent without decorations and `sctk-adwaita` feature.
+- On Wayland, ignore resize requests when the window is fully tiled.
+- On Wayland, use `configure_bounds` to constrain `with_inner_size` when compositor wants users to pick size.
+- On Windows, fix deadlock when accessing the state during `Cursor{Enter,Leave}`.
+- On Windows, add support for `Window::set_transparent`.
+- On macOS, fix deadlock when entering a nested event loop from an event handler.
+- On macOS, add support for `Window::set_blur`.
+
+# 0.29.2
+
+- **Breaking:** Bump MSRV from `1.60` to `1.65`.
+- **Breaking:** Add `Event::MemoryWarning`; implemented on iOS/Android.
+- **Breaking:** Bump `ndk` version to `0.8.0`, ndk-sys to `0.5.0`, `android-activity` to `0.5.0`.
+- **Breaking:** Change default `ControlFlow` from `Poll` to `Wait`.
+- **Breaking:** Move `Event::RedrawRequested` to `WindowEvent::RedrawRequested`.
+- **Breaking:** Moved `ControlFlow::Exit` to `EventLoopWindowTarget::exit()` and `EventLoopWindowTarget::exiting()` and removed `ControlFlow::ExitWithCode(_)` entirely.
+- **Breaking:** Moved `ControlFlow` to `EventLoopWindowTarget::set_control_flow()` and `EventLoopWindowTarget::control_flow()`.
+- **Breaking:** `EventLoop::new` and `EventLoopBuilder::build` now return `Result<Self, EventLoopError>`
+- **Breaking:** `WINIT_UNIX_BACKEND` was removed in favor of standard `WAYLAND_DISPLAY` and `DISPLAY` variables.
+- **Breaking:** on Wayland, dispatching user created Wayland queue won't wake up the loop unless winit has event to send back.
+- **Breaking:** remove `DeviceEvent::Text`.
+- **Breaking:** Remove lifetime parameter from `Event` and `WindowEvent`.
+- **Breaking:** Rename `Window::set_inner_size` to `Window::request_inner_size` and indicate if the size was applied immediately.
+- **Breaking:** `ActivationTokenDone` event which could be requested with the new `startup_notify` module, see its docs for more.
+- **Breaking:** `ScaleFactorChanged` now contains a writer instead of a reference to update inner size.
+- **Breaking** `run() -> !` has been replaced by `run() -> Result<(), EventLoopError>` for returning errors without calling `std::process::exit()` ([#2767](https://github.com/rust-windowing/winit/pull/2767))
+- **Breaking** Removed `EventLoopExtRunReturn` / `run_return` in favor of `EventLoopExtPumpEvents` / `pump_events` and `EventLoopExtRunOnDemand` / `run_on_demand` ([#2767](https://github.com/rust-windowing/winit/pull/2767))
+- `RedrawRequested` is no longer guaranteed to be emitted after `MainEventsCleared`, it is now platform-specific when the event is emitted after being requested via `redraw_request()`.
+  - On Windows, `RedrawRequested` is now driven by `WM_PAINT` messages which are requested via `redraw_request()`
+- **Breaking** `LoopDestroyed` renamed to `LoopExiting` ([#2900](https://github.com/rust-windowing/winit/issues/2900))
+- **Breaking** `RedrawEventsCleared` removed ([#2900](https://github.com/rust-windowing/winit/issues/2900))
+- **Breaking** `MainEventsCleared` removed ([#2900](https://github.com/rust-windowing/winit/issues/2900))
+- **Breaking:** Remove all deprecated `modifiers` fields.
+- **Breaking:** Rename `DeviceEventFilter` to `DeviceEvents` reversing the behavior of variants.
+- **Breaking** Add `AboutToWait` event which is emitted when the event loop is about to block and wait for new events ([#2900](https://github.com/rust-windowing/winit/issues/2900))
+- **Breaking:** Rename `EventLoopWindowTarget::set_device_event_filter` to `listen_device_events`.
+- **Breaking:** Rename `Window::set_ime_position` to `Window::set_ime_cursor_area` adding a way to set exclusive zone.
+- **Breaking:** `with_x11_visual` now takes the visual ID instead of the bare pointer.
+- **Breaking** `MouseButton` now supports `Back` and `Forward` variants, emitted from mouse events on Wayland, X11, Windows, macOS and Web.
+- **Breaking:** On Web, `instant` is now replaced by `web_time`.
+- **Breaking:** On Web, dropped support for Safari versions below 13.1.
+- **Breaking:** On Web, the canvas output bitmap size is no longer adjusted.
+- **Breaking:** On Web, the canvas size is not controlled by Winit anymore and external changes to the canvas size will be reported through `WindowEvent::Resized`.
+- **Breaking:** Updated `bitflags` crate version to `2`, which changes the API on exposed types.
+- **Breaking:** `CursorIcon::Arrow` was removed.
+- **Breaking:** `CursorIcon::Hand` is now named `CursorIcon::Pointer`.
+- **Breaking:** `CursorIcon` is now used from the `cursor-icon` crate.
+- **Breaking:** `WindowExtWebSys::canvas()` now returns an `Option`.
+- **Breaking:** Overhaul keyboard input handling.
+  - Replace `KeyboardInput` with `KeyEvent` and `RawKeyEvent`.
+    - Change `WindowEvent::KeyboardInput` to contain a `KeyEvent`.
+    - Change `Event::Key` to contain a `RawKeyEvent`.
+  - Remove `Event::ReceivedCharacter`. In its place, you should use
+    `KeyEvent.text` in combination with `WindowEvent::Ime`.
+  - Replace `VirtualKeyCode` with the `Key` enum.
+  - Replace `ScanCode` with the `KeyCode` enum.
+  - Rename `ModifiersState::LOGO` to `SUPER` and `ModifiersState::CTRL` to `CONTROL`.
+  - Add `PhysicalKey` wrapping `KeyCode` and `NativeKeyCode`.
+  - Add `KeyCode` to refer to keys (roughly) by their physical location.
+  - Add `NativeKeyCode` to represent raw `KeyCode`s which Winit doesn't
+    understand.
+  - Add `Key` to represent the keys after they've been interpreted by the
+    active (software) keyboard layout.
+  - Add `NamedKey` to represent the categorized keys.
+  - Add `NativeKey` to represent raw `Key`s which Winit doesn't understand.
+  - Add `KeyLocation` to tell apart `Key`s which usually "mean" the same thing,
+    but can appear simultaneously in different spots on the same keyboard
+    layout.
+  - Add `Window::reset_dead_keys` to enable application-controlled cancellation
+    of dead key sequences.
+  - Add `KeyEventExtModifierSupplement` to expose additional (and less
+    portable) interpretations of a given key-press.
+  - Add `PhysicalKeyExtScancode`, which lets you convert between scancodes and
+    `PhysicalKey`.
+  - `ModifiersChanged` now uses dedicated `Modifiers` struct.
+- Removed platform-specific extensions that should be retrieved through `raw-window-handle` trait implementations instead:
+  - `platform::windows::HINSTANCE`.
+  - `WindowExtWindows::hinstance`.
+  - `WindowExtWindows::hwnd`.
+  - `WindowExtIOS::ui_window`.
+  - `WindowExtIOS::ui_view_controller`.
+  - `WindowExtIOS::ui_view`.
+  - `WindowExtMacOS::ns_window`.
+  - `WindowExtMacOS::ns_view`.
+  - `EventLoopWindowTargetExtWayland::wayland_display`.
+  - `WindowExtWayland::wayland_surface`.
+  - `WindowExtWayland::wayland_display`.
+  - `WindowExtX11::xlib_window`.
+  - `WindowExtX11::xlib_display`.
+  - `WindowExtX11::xlib_screen_id`.
+  - `WindowExtX11::xcb_connection`.
+- Reexport `raw-window-handle` in `window` module.
+- Add `ElementState::is_pressed`.
+- Add `Window::pre_present_notify` to notify winit before presenting to the windowing system.
+- Add `Window::set_blur` to request a blur behind the window; implemented on Wayland for now.
+- Add `Window::show_window_menu` to request a titlebar/system menu; implemented on Wayland/Windows for now.
+- Implement `AsFd`/`AsRawFd` for `EventLoop<T>` on X11 and Wayland.
+- Implement `PartialOrd` and `Ord` for `MouseButton`.
+- Implement `PartialOrd` and `Ord` on types in the `dpi` module.
+- Make `WindowBuilder` `Send + Sync`.
+- Make iOS `MonitorHandle` and `VideoMode` usable from other threads.
+- Make iOS windows usable from other threads.
+- On Android, add force data to touch events.
+- On Android, added `EventLoopBuilderExtAndroid::handle_volume_keys` to indicate that the application will handle the volume keys manually.
+- On Android, fix `DeviceId` to contain device id's.
+- On Orbital, fix `ModifiersChanged` not being sent.
+- On Wayland, `Window::outer_size` now accounts for **client side** decorations.
+- On Wayland, add `Window::drag_resize_window` method.
+- On Wayland, remove `WINIT_WAYLAND_CSD_THEME` variable.
+- On Wayland, fix `TouchPhase::Canceled` being sent for moved events.
+- On Wayland, fix forward compatibility issues.
+- On Wayland, fix initial window size not restored for maximized/fullscreened on startup window.
+- On Wayland, fix maximized startup not taking full size on GNOME.
+- On Wayland, fix maximized window creation and window geometry handling.
+- On Wayland, fix window not checking that it actually got initial configure event.
+- On Wayland, make double clicking and moving the CSD frame more reliable.
+- On Wayland, support `Occluded` event with xdg-shell v6
+- On Wayland, use frame callbacks to throttle `RedrawRequested` events so redraws will align with compositor.
+- On Web, `ControlFlow::WaitUntil` now uses the Prioritized Task Scheduling API. `setTimeout()`, with a trick to circumvent throttling to 4ms, is used as a fallback.
+- On Web, `EventLoopProxy` now implements `Send`.
+- On Web, `Window` now implements `Send` and `Sync`.
+- On Web, account for CSS `padding`, `border`, and `margin` when getting or setting the canvas position.
+- On Web, add Fullscreen API compatibility for Safari.
+- On Web, add `DeviceEvent::Motion`, `DeviceEvent::MouseWheel`, `DeviceEvent::Button` and `DeviceEvent::Key` support.
+- On Web, add `EventLoopWindowTargetExtWebSys` and `PollStrategy`, which allows to set different strategies for `ControlFlow::Poll`. By default the Prioritized Task Scheduling API is used, but an option to use `Window.requestIdleCallback` is available as well. Both use `setTimeout()`, with a trick to circumvent throttling to 4ms, as a fallback.
+- On Web, add `WindowBuilderExtWebSys::with_append()` to append the canvas element to the web page on creation.
+- On Web, allow event loops to be recreated with `spawn`.
+- On Web, enable event propagation.
+- On Web, fix `ControlFlow::WaitUntil` to never wake up **before** the given time.
+- On Web, fix `DeviceEvent::MouseMotion` only being emitted for each canvas instead of the whole window.
+- On Web, fix `Window:::set_fullscreen` doing nothing when called outside the event loop but during transient activation.
+- On Web, fix pen treated as mouse input.
+- On Web, fix pointer button events not being processed when a buttons is already pressed.
+- On Web, fix scale factor resize suggestion always overwriting the canvas size.
+- On Web, fix some `WindowBuilder` methods doing nothing.
+- On Web, fix some `Window` methods using incorrect HTML attributes instead of CSS properties.
+- On Web, fix the bfcache by not using the `beforeunload` event and map bfcache loading/unloading to `Suspended`/`Resumed` events.
+- On Web, fix touch input not gaining or loosing focus.
+- On Web, fix touch location to be as accurate as mouse position.
+- On Web, handle coalesced pointer events, which increases the resolution of pointer inputs.
+- On Web, implement `Window::focus_window()`.
+- On Web, implement `Window::set_(min|max)_inner_size()`.
+- On Web, implement `WindowEvent::Occluded`.
+- On Web, never return a `MonitorHandle`.
+- On Web, prevent clicks on the canvas to select text.
+- On Web, remove any fullscreen requests from the queue when an external fullscreen activation was detected.
+- On Web, remove unnecessary `Window::is_dark_mode()`, which was replaced with `Window::theme()`.
+- On Web, respect `EventLoopWindowTarget::listen_device_events()` settings.
+- On Web, scale factor and dark mode detection are now more robust.
+- On Web, send mouse position on button release as well.
+- On Web, take all transient activations on the canvas and window into account to queue a fullscreen request.
+- On Web, use `Window.requestAnimationFrame()` to throttle `RedrawRequested` events.
+- On Web, use the correct canvas size when calculating the new size during scale factor change, instead of using the output bitmap size.
+- On Web: fix `Window::request_redraw` not waking the event loop when called from outside the loop.
+- On Web: fix position of touch events to be relative to the canvas.
+- On Windows, add `drag_resize_window` method support.
+- On Windows, add horizontal MouseWheel `DeviceEvent`.
+- On Windows, added `WindowBuilderExtWindows::with_class_name` to customize the internal class name.
+- On Windows, fix IME APIs not working when from non event loop thread.
+- On Windows, fix `CursorEnter/Left` not being sent when grabbing the mouse.
+- On Windows, fix `RedrawRequested` not being delivered when calling `Window::request_redraw` from `RedrawRequested`.
+- On Windows, port to `windows-sys` version 0.48.0.
+- On X11, add a `with_embedded_parent_window` function to the window builder to allow embedding a window into another window.
+- On X11, fix event loop not waking up on `ControlFlow::Poll` and `ControlFlow::WaitUntil`.
+- On X11, fix false positive flagging of key repeats when pressing different keys with no release between presses.
+- On X11, set `visual_id` in returned `raw-window-handle`.
+- On iOS, add ability to change the status bar style.
+- On iOS, add force data to touch events when using the Apple Pencil.
+- On iOS, always wake the event loop when transitioning from `ControlFlow::Poll` to `ControlFlow::Poll`.
+- On iOS, send events `WindowEvent::Occluded(false)`, `WindowEvent::Occluded(true)` when application enters/leaves foreground.
+- On macOS, add tabbing APIs on `WindowExtMacOS` and `EventLoopWindowTargetExtMacOS`.
+- On macOS, fix assertion when pressing `Globe` key.
+- On macOS, fix crash in `window.set_minimized(false)`.
+- On macOS, fix crash when dropping `Window`.
+
+# 0.28.7
+
+- Fix window size sometimes being invalid when resizing on macOS 14 Sonoma.
+
+# 0.28.6
+
+- On macOS, fixed memory leak when getting monitor handle.
+- On macOS, fix `Backspace` being emitted when clearing preedit with it.
+
+# 0.28.5
+
+- On macOS, fix `key_up` being ignored when `Ime` is disabled.
+
+# 0.28.4
+
+- On macOS, fix empty marked text blocking regular input.
+- On macOS, fix potential panic when getting refresh rate.
+- On macOS, fix crash when calling `Window::set_ime_position` from another thread.
+
+# 0.28.3
+
+- Fix macOS memory leaks.
+
+# 0.28.2
+
+- Implement `HasRawDisplayHandle` for `EventLoop`.
+- On macOS, set resize increments only for live resizes.
+- On Wayland, fix rare crash on DPI change
+- Web: Added support for `Window::theme`.
+- On Wayland, fix rounding issues when doing resize.
+- On macOS, fix wrong focused state on startup.
+- On Windows, fix crash on setting taskbar when using Visual Studio debugger.
+- On macOS, resize simple fullscreen windows on windowDidChangeScreen events.
+
+# 0.28.1
+
+- On Wayland, fix crash when dropping a window in multi-window setup.
+
+# 0.28.0
+
+- On macOS, fixed `Ime::Commit` persisting for all input after interacting with `Ime`.
 - On macOS, added `WindowExtMacOS::option_as_alt` and `WindowExtMacOS::set_option_as_alt`.
 - On Windows, fix window size for maximized, undecorated windows.
 - On Windows and macOS, add `WindowBuilder::with_active`.
@@ -276,7 +602,7 @@ And please only add new entries to the top of this list, right below the `# Unre
 
 # 0.23.0 (2020-10-02)
 
-- On iOS, fixed support for the "Debug View Heirarchy" feature in Xcode.
+- On iOS, fixed support for the "Debug View Hierarchy" feature in Xcode.
 - On all platforms, `available_monitors` and `primary_monitor` are now on `EventLoopWindowTarget` rather than `EventLoop` to list monitors event in the event loop.
 - On Unix, X11 and Wayland are now optional features (enabled by default)
 - On X11, fix deadlock when calling `set_fullscreen_inner`.

CONTRIBUTING.md

@@ -11,7 +11,7 @@ may be worth creating a separate crate that extends Winit's API to add that func
 When reporting an issue, in order to help the maintainers understand what the problem is, please make
 your description of the issue as detailed as possible:
 
-- if it is a bug, please provide clear explanation of what happens, what should happen, and how to
+- if it is a bug, please provide a clear explanation of what happens, what should happen, and how to
   reproduce the issue, ideally by providing a minimal program exhibiting the problem
 - if it is a feature request, please provide a clear argumentation about why you believe this feature
   should be supported by winit
@@ -20,8 +20,8 @@ your description of the issue as detailed as possible:
 
 When making a code contribution to winit, before opening your pull request, please make sure that:
 
-- your patch builds with Winit's minimal supported rust version - Rust 1.60.
+- your patch builds with Winit's minimal supported rust version - Rust 1.70.
-- you tested your modifications on all the platforms impacted, or if not possible detail which platforms
+- you tested your modifications on all the platforms impacted, or if not possible, detail which platforms
   were not tested, and what should be tested, so that a maintainer or another contributor can test them
 - you updated any relevant documentation in winit
 - you left comments in your code explaining any part that is not straightforward, so that the
@@ -34,7 +34,7 @@ When making a code contribution to winit, before opening your pull request, plea
   relevant sections in [`FEATURES.md`](https://github.com/rust-windowing/winit/blob/master/FEATURES.md#features)
   should be updated.
 
-Once your PR is open, you can ask for review by a maintainer of your platform. Winit's merging policy
+Once your PR is open, you can ask for a review by a maintainer of your platform. Winit's merging policy
 is that a PR must be approved by at least two maintainers of winit before being merged, including
 at least a maintainer of the platform (a maintainer making a PR themselves counts as approving it).
 
@@ -46,27 +46,26 @@ Once your PR is deemed ready, the merging maintainer will take care of resolving
 
 The current maintainers are listed in the [CODEOWNERS](.github/CODEOWNERS) file.
 
-If you are interested in being pinged when testing is needed for a certain platform, please add yourself to the [Testers and Contributors](https://github.com/rust-windowing/winit/wiki/Testers-and-Contributors) table!
+If you are interested in being pinged when testing is needed for a specific platform, please add yourself to the [Testers and Contributors](https://github.com/rust-windowing/winit/wiki/Testers-and-Contributors) table!
 
 ## Release process
 
-Given that winit is a widely used library we should be able to make a patch
+Given that winit is a widely used library, we should be able to make a patch
 releases at any time we want without blocking the development of new features.
 
-To achieve these goals, a new branch is created for every new release. Releases
+To achieve these goals, a new branch is created for every new release. Releases and later patch releases are committed and tagged in this branch.
-and later patch releases are committed and tagged in this branch.
 
 The exact steps for an exemplary `0.2.0` release might look like this:
-  1. Initially the version on the latest master is `0.1.0`
+  1. Initially, the version on the latest master is `0.1.0`
   2. A new `v0.2.x` branch is created for the release
   3. In the branch, the version is bumped to `v0.2.0`
   4. The new commit in the branch is tagged `v0.2.0`
   5. The version is pushed to crates.io
   6. A GitHub release is created for the `v0.2.0` tag
-  7. On master, the version is bumped to `0.2.0` and the CHANGELOG is updated
+  7. On master, the version is bumped to `0.2.0`, and the CHANGELOG is updated
   
-When doing a patch release the process is similar:
+When doing a patch release, the process is similar:
-  1. Initially the version of the latest release is `0.2.0`
+  1. Initially, the version of the latest release is `0.2.0`
   2. Checkout the `v0.2.x` branch
   3. Cherry-pick the required non-breaking changes into the `v0.2.x`
   4. Follow steps 3-7 of the regular release example

Cargo.toml

@@ -1,161 +1,16 @@
-[package]
-name = "winit"
-version = "0.27.5"
-authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
-description = "Cross-platform window creation library."
-edition = "2021"
-keywords = ["windowing"]
-license = "Apache-2.0"
-readme = "README.md"
-repository = "https://github.com/rust-windowing/winit"
-documentation = "https://docs.rs/winit"
-categories = ["gui"]
-rust-version = "1.60.0"
-
-[package.metadata.docs.rs]
-features = ["serde"]
-default-target = "x86_64-unknown-linux-gnu"
-# These are all tested in CI
-targets = [
-    # Windows
-    "i686-pc-windows-msvc",
-    "x86_64-pc-windows-msvc",
-    # macOS
-    "x86_64-apple-darwin",
-    # Unix (X11 & Wayland)
-    "i686-unknown-linux-gnu",
-    "x86_64-unknown-linux-gnu",
-    # iOS
-    "x86_64-apple-ios",
-    # Android
-    "aarch64-linux-android",
-    # WebAssembly
-    "wasm32-unknown-unknown",
-]
-rustdoc-args = ["--cfg", "docsrs"]
-
-[features]
-default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
-x11 = ["x11-dl", "mio", "percent-encoding"]
-wayland = ["wayland-client", "wayland-protocols", "sctk", "wayland-commons"]
-wayland-dlopen = ["sctk/dlopen", "wayland-client/dlopen"]
-wayland-csd-adwaita = ["sctk-adwaita", "sctk-adwaita/ab_glyph"]
-wayland-csd-adwaita-crossfont = ["sctk-adwaita", "sctk-adwaita/crossfont"]
-wayland-csd-adwaita-notitle = ["sctk-adwaita"]
-android-native-activity = [ "android-activity/native-activity" ]
-android-game-activity = [ "android-activity/game-activity" ]
-
-[build-dependencies]
-cfg_aliases = "0.1.1"
-
-[dependencies]
-bitflags = "1"
-instant = { version = "0.1", features = ["wasm-bindgen"] }
-log = "0.4"
-mint = { version = "0.5.6", optional = true }
-once_cell = "1.12"
-raw_window_handle = { package = "raw-window-handle", version = "0.5" }
-serde = { version = "1", optional = true, features = ["serde_derive"] }
-
-[dev-dependencies]
-image = { version = "0.24.0", default-features = false, features = ["png"] }
-simple_logger = { version = "2.1.0", default_features = false }
-
-[target.'cfg(target_os = "android")'.dependencies]
-# Coordinate the next winit release with android-ndk-rs: https://github.com/rust-windowing/winit/issues/1995
-android-activity = "0.4.0"
-ndk = "0.7.0"
-
-[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
-core-foundation = "0.9.3"
-objc2 = "=0.3.0-beta.3"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.22.3"
-dispatch = "0.2.0"
-
-[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
-version = "0.45"
-features = [
-    "Win32_Devices_HumanInterfaceDevice",
-    "Win32_Foundation",
-    "Win32_Globalization",
-    "Win32_Graphics_Dwm",
-    "Win32_Graphics_Gdi",
-    "Win32_Media",
-    "Win32_System_Com_StructuredStorage",
-    "Win32_System_Com",
-    "Win32_System_LibraryLoader",
-    "Win32_System_Ole",
-    "Win32_System_SystemInformation",
-    "Win32_System_SystemServices",
-    "Win32_System_Threading",
-    "Win32_System_WindowsProgramming",
-    "Win32_UI_Accessibility",
-    "Win32_UI_Controls",
-    "Win32_UI_HiDpi",
-    "Win32_UI_Input_Ime",
-    "Win32_UI_Input_KeyboardAndMouse",
-    "Win32_UI_Input_Pointer",
-    "Win32_UI_Input_Touch",
-    "Win32_UI_Shell",
-    "Win32_UI_TextServices",
-    "Win32_UI_WindowsAndMessaging",
-]
-
-[target.'cfg(all(unix, not(any(target_os = "redox", target_arch = "wasm32", target_os = "android", target_os = "ios", target_os = "macos"))))'.dependencies]
-libc = "0.2.64"
-mio = { version = "0.8", features = ["os-ext"], optional = true }
-percent-encoding = { version = "2.0", optional = true }
-sctk = { package = "smithay-client-toolkit", version = "0.16.0", default_features = false, features = ["calloop"],  optional = true }
-sctk-adwaita = { version = "0.5.1", default_features = false, optional = true }
-wayland-client = { version = "0.29.5", default_features = false,  features = ["use_system_lib"], optional = true }
-wayland-protocols = { version = "0.29.5", features = [ "staging_protocols"], optional = true }
-wayland-commons = { version = "0.29.5", optional = true }
-x11-dl = { version = "2.18.5", optional = true }
-
-[target.'cfg(target_os = "redox")'.dependencies]
-orbclient = { version = "0.3.42", default-features = false }
-redox_syscall = "0.3"
-
-[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.build-dependencies]
-wayland-scanner = "0.29.5"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies.web_sys]
-package = "web-sys"
-version = "0.3.22"
-features = [
-    'console',
-    "AddEventListenerOptions",
-    'CssStyleDeclaration',
-    'BeforeUnloadEvent',
-    'Document',
-    'DomRect',
-    'Element',
-    'Event',
-    "EventListenerOptions",
-    'EventTarget',
-    'FocusEvent',
-    'HtmlCanvasElement',
-    'HtmlElement',
-    'KeyboardEvent',
-    'MediaQueryList',
-    'MediaQueryListEvent',
-    'MouseEvent',
-    'Node',
-    'PointerEvent',
-    'Window',
-    'WheelEvent'
-]
-
-[target.'cfg(target_arch = "wasm32")'.dependencies.wasm-bindgen]
-version = "0.2.45"
-
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-console_log = "0.2"
-web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
-
 [workspace]
 members = [
     "run-wasm",
+    "winit",
+    "winit-core"
 ]
+resolver = "2"
+
+[workspace.dependencies]
+bitflags = "2"
+cfg_aliases = "0.2.0"
+cursor-icon = "1.1.0"
+serde = { version = "1", features = ["serde_derive"] }
+smol_str = "0.2.0"
+web-time = "1"
+winit-core = { path = "./winit-core", default-features = false, features = ["std"] }

FEATURES.md

@@ -1,6 +1,6 @@
 # Winit Scope
 
-Winit aims to expose an interface that abstracts over window creation and input handling, and can
+Winit aims to expose an interface that abstracts over window creation and input handling and can
 be used to create both games and applications. It supports the following main graphical platforms:
 - Desktop
   - Windows 7+ (10+ is tested regularly)
@@ -13,7 +13,9 @@ be used to create both games and applications. It supports the following main gr
   - iOS
   - Android
 - Web
-  - via WASM
+  - Chrome
+  - Firefox
+  - Safari 13.1+
 
 Most platforms expose capabilities that cannot be meaningfully transposed onto others. Winit does not
 aim to support every single feature of every platform, but rather to abstract over the common features
@@ -43,10 +45,10 @@ be released and the library will enter maintenance mode. For the most part, new
 be added past this point. New platform features may be accepted and exposed through point releases.
 
 ### Tier upgrades
-Some platform features could in theory be exposed across multiple platforms, but have not gone
+Some platform features could, in theory, be exposed across multiple platforms, but have not gone
 through the implementation work necessary to function on all platforms. When one of these features
 gets implemented across all platforms, a PR can be opened to upgrade the feature to a core feature.
-If that gets accepted, the platform-specific functions gets deprecated and become permanently
+If that gets accepted, the platform-specific functions get deprecated and become permanently
 exposed through the core, cross-platform API.
 
 # Features
@@ -86,7 +88,7 @@ If your PR makes notable changes to Winit's features, please update this section
 - **Fullscreen toggle**: The windows created by winit can be switched to and from fullscreen after
   creation.
 - **Exclusive fullscreen**: Winit allows changing the video mode of the monitor
-  for fullscreen windows, and if applicable, captures the monitor for exclusive
+  for fullscreen windows and, if applicable, captures the monitor for exclusive
   use by this application.
 - **HiDPI support**: Winit assists developers in appropriately scaling HiDPI content.
 - **Popup / modal windows**: Windows can be created relative to the client area of other windows, and parent
@@ -103,7 +105,8 @@ If your PR makes notable changes to Winit's features, please update this section
 - **Mouse set location**: Forcibly changing the location of the pointer.
 - **Cursor locking**: Locking the cursor inside the window so it cannot move.
 - **Cursor confining**: Confining the cursor to the window bounds so it cannot leave them.
-- **Cursor icon**: Changing the cursor icon, or hiding the cursor.
+- **Cursor icon**: Changing the cursor icon or hiding the cursor.
+- **Cursor image**: Changing the cursor to your own image.
 - **Cursor hittest**: Handle or ignore mouse events for a window.
 - **Touch events**: Single-touch events.
 - **Touch pressure**: Touch events contain information about the amount of force being applied.
@@ -117,11 +120,17 @@ If your PR makes notable changes to Winit's features, please update this section
 
 ## Platform
 ### Windows
+* Setting the name of the internal window class
 * Setting the taskbar icon
 * Setting the parent window
 * Setting a menu bar
 * `WS_EX_NOREDIRECTIONBITMAP` support
 * Theme the title bar according to Windows 10 Dark Mode setting or set a preferred theme
+* Changing a system-drawn backdrop
+* Setting the window border color
+* Setting the title bar background color
+* Setting the title color
+* Setting the corner rounding preference
 
 ### macOS
 * Window activation policy
@@ -143,20 +152,17 @@ If your PR makes notable changes to Winit's features, please update this section
 
 ### iOS
 * `winit` has a minimum OS requirement of iOS 8
-* Get the `UIWindow` object pointer
-* Get the `UIViewController` object pointer
-* Get the `UIView` object pointer
 * Get the `UIScreen` object pointer
 * Setting the `UIView` hidpi factor
 * Valid orientations
 * Home indicator visibility
-* Status bar visibility
+* Status bar visibility and style
-* Deferrring system gestures
+* Deferring system gestures
 * Getting the device idiom
 * Getting the preferred video mode
 
 ### Web
-* Get if systems preferred color scheme is "dark"
+* Get if the systems preferred color scheme is "dark"
 
 ## Usability
 * `serde`: Enables serialization/deserialization of certain types with Serde. (Maintainer: @Osspial)
@@ -166,22 +172,23 @@ If your PR makes notable changes to Winit's features, please update this section
 Legend:
 
 - ✔️: Works as intended
-- ▢: Mostly works but some bugs are known
+- ▢: Mostly works, but some bugs are known
 - ❌: Missing feature or large bugs making it unusable
 - **N/A**: Not applicable for this platform
 - ❓: Unknown status
 
 ### Windowing
-|Feature                          |Windows|MacOS   |Linux x11   |Linux Wayland  |Android|iOS    |WASM      |Redox OS|
+|Feature                          |Windows|MacOS   |Linux x11   |Linux Wayland  |Android|iOS    |Web      |Redox OS|
 |-------------------------------- | ----- | ----   | -------    | -----------   | ----- | ----- | -------- | ------ |
 |Window initialization            |✔️     |✔️     |▢[#5]      |✔️             |▢[#33]|▢[#33] |✔️        |✔️      |
 |Providing pointer to init OpenGL |✔️     |✔️     |✔️         |✔️             |✔️     |✔️    |**N/A**|✔️      |
 |Providing pointer to init Vulkan |✔️     |✔️     |✔️         |✔️             |✔️     |❓     |**N/A**|**N/A** |
 |Window decorations               |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|✔️      |
 |Window decorations toggle        |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
-|Window resizing                  |✔️     |▢[#219]|✔️         |▢[#306]        |**N/A**|**N/A**|✔️        |✔️      |
+|Window resizing                  |✔️     |✔️     |✔️         |✔️        |**N/A**|**N/A**|✔️        |✔️      |
 |Window resize increments         |❌     |✔️     |✔️         |❌             |**N/A**|**N/A**|**N/A**|**N/A** |
 |Window transparency              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|N/A        |✔️      |
+|Window blur                      |❌    |❌    |❌        |✔️             |**N/A**|**N/A**|N/A        |❌     |
 |Window maximization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
 |Window maximization toggle       |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
 |Window minimization              |✔️     |✔️     |✔️         |✔️             |**N/A**|**N/A**|**N/A**|**N/A** |
@@ -192,42 +199,43 @@ Legend:
 |Popup windows                    |❌     |❌     |❌         |❌             |❌    |❌     |**N/A**|**N/A** |
 
 ### System information
-|Feature          |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS      |WASM      |Redox OS|
+|Feature          |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS      |Web      |Redox OS|
 |---------------- | ----- | ---- | ------- | ----------- | ----- | ------- | -------- | ------ |
 |Monitor list     |✔️    |✔️    |✔️       |✔️          |✔️     |✔️      |**N/A**|❌      |
 |Video mode query |✔️    |✔️    |✔️       |✔️          |✔️     |✔️      |**N/A**|❌      |
 
 ### Input handling
-|Feature                 |Windows   |MacOS   |Linux x11|Linux Wayland|Android|iOS    |WASM      |Redox OS|
+|Feature                 |Windows   |MacOS   |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
 |----------------------- | -----    | ----   | ------- | ----------- | ----- | ----- | -------- | ------ |
 |Mouse events            |✔️       |▢[#63]  |✔️       |✔️          |**N/A**|**N/A**|✔️        |✔️      |
 |Mouse set location      |✔️       |✔️      |✔️       |✔️(when locked)  |**N/A**|**N/A**|**N/A**|**N/A** |
 |Cursor locking          |❌       |✔️      |❌       |✔️          |**N/A**|**N/A**|✔️        |❌      |
 |Cursor confining        |✔️       |❌      |✔️       |✔️          |**N/A**|**N/A**|❌       |❌      |
 |Cursor icon             |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|✔️        |**N/A** |
-|Cursor hittest          |✔️       |✔️      |❌       |✔️          |**N/A**|**N/A**|❌        |❌      |
+|Cursor image            |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|✔️        |**N/A** |
+|Cursor hittest          |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|❌        |❌      |
 |Touch events            |✔️       |❌      |✔️       |✔️          |✔️    |✔️     |✔️        |**N/A** |
 |Touch pressure          |✔️       |❌      |❌       |❌          |❌    |✔️     |✔️        |**N/A** |
 |Multitouch              |✔️       |❌      |✔️       |✔️          |✔️    |✔️     |❌        |**N/A** |
 |Keyboard events         |✔️       |✔️      |✔️       |✔️          |✔️    |❌     |✔️        |✔️      |
-|Drag & Drop             |▢[#720]  |▢[#720] |▢[#720]  |❌[#306]    |**N/A**|**N/A**|❓        |**N/A** |
+|Drag & Drop             |▢[#720]  |▢[#720] |▢[#720]  |▢[#720]   |**N/A**|**N/A**|❓        |**N/A** |
 |Raw Device Events       |▢[#750]  |▢[#750] |▢[#750]  |❌          |❌    |❌     |❓        |**N/A** |
 |Gamepad/Joystick events |❌[#804] |❌      |❌       |❌          |❌    |❌     |❓        |**N/A** |
 |Device movement events  |❓        |❓       |❓       |❓           |❌    |❌     |❓        |**N/A** |
 |Drag window with cursor |✔️       |✔️      |✔️       |✔️          |**N/A**|**N/A**|**N/A**   |**N/A** |
-|Resize with cursor      |❌         |❌       |✔️       |❌       |**N/A**|**N/A**|**N/A**   |**N/A** |
+|Resize with cursor      |✔️       |❌       |✔️       |✔️       |**N/A**|**N/A**|**N/A**   |**N/A** |
 
 ### Pending API Reworks
 Changes in the API that have been agreed upon but aren't implemented across all platforms.
 
-|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |WASM      |Redox OS|
+|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
 |------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ |
-|New API for HiDPI ([#315] [#319])   |✔️    |✔️    |✔️       |✔️          |✔️     |✔️    |❓        |❓      |
+|New API for HiDPI ([#315] [#319])   |✔️      |✔️     |✔️        |✔️            |✔️      |✔️      |❓        |❓      |
-|Event Loop 2.0 ([#459])             |✔️    |✔️    |❌       |✔️          |✔️     |✔️    |❓        |❓      |
+|Event Loop 2.0 ([#459])             |✔️      |✔️     |✔️        |✔️            |✔️      |✔️      |❓        |✔️       |
-|Keyboard Input ([#812])             |❌    |❌    |❌       |❌          |❌     |❌    |❓        |❓      |
+|Keyboard Input 2.0 ([#753])         |✔️      |✔️     |✔️        |✔️            |✔️      |❌     |✔️         |✔️       |
 
 ### Completed API Reworks
-|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |WASM      |Redox OS|
+|Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Web      |Redox OS|
 |------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- | ------ |
 
 [#165]: https://github.com/rust-windowing/winit/issues/165
@@ -243,5 +251,5 @@ Changes in the API that have been agreed upon but aren't implemented across all
 [#720]: https://github.com/rust-windowing/winit/issues/720
 [#721]: https://github.com/rust-windowing/winit/issues/721
 [#750]: https://github.com/rust-windowing/winit/issues/750
+[#753]: https://github.com/rust-windowing/winit/issues/753
 [#804]: https://github.com/rust-windowing/winit/issues/804
-[#812]: https://github.com/rust-windowing/winit/issues/812

HALL_OF_CHAMPIONS.md

@@ -2,21 +2,20 @@
 
 The winit maintainers would like to recognize the following former winit
 contributors, without whom winit would not exist in its current form. We thank
-them deeply for their time and efforts, and wish them best of luck in their
+them deeply for their time and efforts and wish them the best of luck in their
 future endeavors:
 
 * [@tomaka]: For creating the winit project and guiding it through its early
   years of existence.
-* [@vberger]: For diligently creating the Wayland backend, and being its
+* [@vberger]: For diligently creating the Wayland backend and being its
   extremely helpful and benevolent maintainer for years.
 * [@francesca64]: For taking over the responsibility of maintaining almost every
-  winit backend, and standardizing HiDPI support across all of them.
+  winit backend and standardizing HiDPI support across all of them.
-* [@Osspial]: For heroically landing EventLoop 2.0, and valiantly ushering in a
+* [@Osspial]: For heroically landing EventLoop 2.0 and valiantly ushering in a
   vastly more sustainable era of winit.
-* [@goddessfreya]: For selflessly taking over maintainership of glutin, and her
+* [@goddessfreya]: For selflessly taking over maintainership of glutin and her
   stellar dedication to improving both winit and glutin.
-* [@ArturKovacs]: For consistently maintaining the macOS backend, and his
+* [@ArturKovacs]: For consistently maintaining the macOS backend and for his immense involvement in designing and implementing the new keyboard API.
-  immense involvement in designing and implementing the new keyboard API.
 
 [@tomaka]: https://github.com/tomaka
 [@vberger]: https://github.com/vberger

README.md

@@ -2,63 +2,37 @@
 
 [![Crates.io](https://img.shields.io/crates/v/winit.svg)](https://crates.io/crates/winit)
 [![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
+[![Master Docs](https://img.shields.io/github/actions/workflow/status/rust-windowing/winit/docs.yml?branch=master&label=master%20docs
+)](https://rust-windowing.github.io/winit/winit/index.html)
 [![CI Status](https://github.com/rust-windowing/winit/workflows/CI/badge.svg)](https://github.com/rust-windowing/winit/actions)
 
 ```toml
 [dependencies]
-winit = "0.27.5"
+winit = "0.29.10"
 ```
 
 ## [Documentation](https://docs.rs/winit)
 
 For features _within_ the scope of winit, see [FEATURES.md](FEATURES.md).
 
-For features _outside_ the scope of winit, see [Missing features provided by other crates](https://github.com/rust-windowing/winit/wiki/Missing-features-provided-by-other-crates) in the wiki.
+For features _outside_ the scope of winit, see [Are we GUI Yet?](https://areweguiyet.com/) and [Are we game yet?](https://arewegameyet.rs/), depending on what kind of project you're looking to do.
 
 ## Contact Us
 
-Join us in any of these:
+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).
 
-[![Matrix](https://img.shields.io/badge/Matrix-%23rust--windowing%3Amatrix.org-blueviolet.svg)](https://matrix.to/#/#rust-windowing:matrix.org)
+The maintainers have a meeting every friday at UTC 14. The meeting notes can be found [here](https://hackmd.io/@winit-meetings).
-[![Libera.Chat](https://img.shields.io/badge/libera.chat-%23winit-red.svg)](https://web.libera.chat/#winit)
 
 ## Usage
 
 Winit is a window creation and management library. It can create windows and lets you handle
 events (for example: the window being resized, a key being pressed, a mouse movement, etc.)
-produced by window.
+produced by the window.
 
 Winit is designed to be a low-level brick in a hierarchy of libraries. Consequently, in order to
 show something on the window you need to use the platform-specific getters provided by winit, or
 another library.
 
-```rust
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
-
-fn main() {
-    let event_loop = EventLoop::new();
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
-
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => *control_flow = ControlFlow::Exit,
-            _ => (),
-        }
-    });
-}
-```
-
-Winit is only officially supported on the latest stable version of the Rust compiler.
-
 ### Cargo Features
 
 Winit provides the following features, which can be enabled in your `Cargo.toml` file:
@@ -67,17 +41,41 @@ Winit provides the following features, which can be enabled in your `Cargo.toml`
 * `wayland` (enabled by default): On Unix platform, compiles with the Wayland backend
 * `mint`: Enables mint (math interoperability standard types) conversions.
 
+## MSRV Policy
+
+This crate's Minimum Supported Rust Version (MSRV) is **1.70**. Changes to
+the MSRV will be accompanied by a minor version bump.
+
+As a **tentative** policy, the upper bound of the MSRV is given by the following
+formula:
+
+```
+min(sid, stable - 3)
+```
+
+Where `sid` is the current version of `rustc` provided by [Debian Sid], and
+`stable` is the latest stable version of Rust. This bound may be broken in case of a major ecosystem shift or a security vulnerability.
+
+[Debian Sid]: https://packages.debian.org/sid/rustc
+
+The exception is for the Android platform, where a higher Rust version
+must be used for certain Android features. In this case, the MSRV will be
+capped at the latest stable version of Rust minus three. This inconsistency is
+not reflected in Cargo metadata, as it is not powerful enough to expose this
+restriction.
+
+All crates in the [`rust-windowing`] organizations have the
+same MSRV policy.
+
+[`rust-windowing`]: https://github.com/rust-windowing
+
 ### Platform-specific usage
 
 #### Wayland
 
 Note that windows don't appear on Wayland until you draw/present to them.
 
-`winit` doesn't do drawing, try the examples in [`glutin`] instead.
+#### Web
-
-[`glutin`]: https://github.com/rust-windowing/glutin
-
-#### WebAssembly
 
 To run the web example: `cargo run-wasm --example web`
 
@@ -88,7 +86,7 @@ either [provide Winit with a `<canvas>` element][web with_canvas], or [let Winit
 create a `<canvas>` element which you can then retrieve][web canvas getter] and
 insert it into the DOM yourself.
 
-For example code using Winit with WebAssembly, check out the [web example]. For
+For the example code using Winit on Web, check out the [web example]. For
 information on using Rust on WebAssembly, check out the [Rust and WebAssembly
 book].
 
@@ -99,7 +97,7 @@ book].
 
 #### Android
 
-The Android backend builds on (and exposes types from) the [`ndk`](https://docs.rs/ndk/0.7.0/ndk/) crate.
+The Android backend builds on (and exposes types from) the [`ndk`](https://docs.rs/ndk/latest/ndk/) crate.
 
 Native Android applications need some form of "glue" crate that is responsible
 for defining the main entry point for your Rust application as well as tracking
@@ -111,13 +109,14 @@ glue crate (prior to `0.28` it used
 
 The version of the glue crate that your application depends on _must_ match the
 version that Winit depends on because the glue crate is responsible for your
-application's main entrypoint. If Cargo resolves multiple versions they will
+application's main entry point. If Cargo resolves multiple versions, they will
 clash.
 
 `winit` glue compatibility table:
 
 | winit |       ndk-glue               |
 | :---: | :--------------------------: |
+| 0.29  | `android-activity = "0.5"`   |
 | 0.28  | `android-activity = "0.4"`   |
 | 0.27  | `ndk-glue = "0.7"`           |
 | 0.26  | `ndk-glue = "0.5"`           |
@@ -128,7 +127,7 @@ The recommended way to avoid a conflict with the glue version is to avoid explic
 depending on the `android-activity` crate, and instead consume the API that
 is re-exported by Winit under `winit::platform::android::activity::*`
 
-Running on an Android device needs a dynamic system library, add this to Cargo.toml:
+Running on an Android device needs a dynamic system library. Add this to Cargo.toml:
 
 ```toml
 [lib]
@@ -136,14 +135,14 @@ name = "main"
 crate-type = ["cdylib"]
 ```
 
-All Android applications are based on an `Activity` subclass and the
+All Android applications are based on an `Activity` subclass, and the
 `android-activity` crate is designed to support different choices for this base
 class. Your application _must_ specify the base class it needs via a feature flag:
 
 | Base Class       | Feature Flag      |  Notes  |
 | :--------------: | :---------------: | :-----: |
 | `NativeActivity` | `android-native-activity` | Built-in to Android - it is possible to use without compiling any Java or Kotlin code. Java or Kotlin code may be needed to subclass `NativeActivity` to access some platform features. It does not derive from the [`AndroidAppCompat`] base class.|
-| [`GameActivity`] | `android-game-activity`   | Derives from [`AndroidAppCompat`] which is a defacto standard `Activity` base class that helps support a wider range of Android versions. Requires a build system that can compile Java or Kotlin and fetch Android dependencies from a [Maven repository][agdk_jetpack] (or link with an embedded [release][agdk_releases] of [`GameActivity`]) |
+| [`GameActivity`] | `android-game-activity`   | Derives from [`AndroidAppCompat`], a defacto standard `Activity` base class that helps support a wider range of Android versions. Requires a build system that can compile Java or Kotlin and fetch Android dependencies from a [Maven repository][agdk_jetpack] (or link with an embedded [release][agdk_releases] of [`GameActivity`]) |
 
 [`GameActivity`]: https://developer.android.com/games/agdk/game-activity
 [`GameTextInput`]: https://developer.android.com/games/agdk/add-support-for-text-input
@@ -152,40 +151,13 @@ class. Your application _must_ specify the base class it needs via a feature fla
 [agdk_releases]: https://developer.android.com/games/agdk/download#agdk-libraries
 [Gradle]: https://developer.android.com/studio/build
 
-For example, add this to Cargo.toml:
+For more details, refer to these `android-activity` [example applications](https://github.com/rust-mobile/android-activity/tree/main/examples).
-```toml
-winit = { version = "0.28", features = [ "android-native-activity" ] }
-
-[target.'cfg(target_os = "android")'.dependencies]
-android_logger = "0.11.0"
-```
-
-And, for example, define an entry point for your library like this:
-```rust
-#[cfg(target_os = "android")]
-use winit::platform::android::activity::AndroidApp;
-
-#[cfg(target_os = "android")]
-#[no_mangle]
-fn android_main(app: AndroidApp) {
-    use winit::platform::android::EventLoopBuilderExtAndroid;
-
-    android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Trace));
-
-    let event_loop = EventLoopBuilder::with_user_event()
-        .with_android_app(app)
-        .build();
-    _main(event_loop);
-}
-```
-
-For more details, refer to these `android-activity` [example applications](https://github.com/rib/android-activity/tree/main/examples).
 
 ##### Converting from `ndk-glue` to `android-activity`
 
-If your application is currently based on `NativeActivity` via the `ndk-glue` crate and building with `cargo apk` then the minimal changes would be:
+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.28", features = [ "android-native-activity" ] }`
+2. Enable the `"android-native-activity"` feature for Winit: `winit = { version = "0.29.10", features = [ "android-native-activity" ] }`
 3. Add an `android_main` entrypoint (as above), instead of using the '`[ndk_glue::main]` proc macro from `ndk-macros` (optionally add a dependency on `android_logger` and initialize logging as above).
 4. Pass a clone of the `AndroidApp` that your application receives to Winit when building your event loop (as shown above).
 
@@ -196,13 +168,13 @@ doing anything; this includes creating windows, fetching monitors, drawing,
 and so on, see issues [#2238], [#2051] and [#2087].
 
 If you encounter problems, you should try doing your initialization inside
-`Event::NewEvents(StartCause::Init)`.
+`Event::Resumed`.
 
 #### iOS
 
 Similar to macOS, iOS's main `UIApplicationMain` does some init work that's required
-by all UI related code, see issue [#1705]. You should consider creating your windows
+by all UI-related code (see issue [#1705]). It would be best to consider creating your windows
-inside `Event::NewEvents(StartCause::Init)`.
+inside `Event::Resumed`.
 
 
 [#2238]: https://github.com/rust-windowing/winit/issues/2238
@@ -212,5 +184,5 @@ inside `Event::NewEvents(StartCause::Init)`.
 
 #### Redox OS
 
-Redox OS has some functionality not present yet, that will be implemented when
+Redox OS has some functionality not yet present that will be implemented when
 its orbital display server provides it.

build.rs

@@ -1,64 +0,0 @@
-use cfg_aliases::cfg_aliases;
-
-#[cfg(all(
-    any(
-        target_os = "linux",
-        target_os = "dragonfly",
-        target_os = "freebsd",
-        target_os = "openbsd",
-        target_os = "netbsd",
-    ),
-    feature = "wayland",
-))]
-mod wayland {
-    use std::env;
-    use std::path::PathBuf;
-    use wayland_scanner::Side;
-
-    pub fn main() {
-        let mut path = PathBuf::from(env::var("OUT_DIR").unwrap());
-        path.push("fractional_scale_v1.rs");
-        wayland_scanner::generate_code(
-            "wayland_protocols/fractional-scale-v1.xml",
-            &path,
-            Side::Client,
-        );
-    }
-}
-
-fn main() {
-    // The script doesn't depend on our code
-    println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-changed=wayland_protocols");
-
-    // Setup cfg aliases
-    cfg_aliases! {
-        // Systems.
-        android_platform: { target_os = "android" },
-        wasm_platform: { target_arch = "wasm32" },
-        macos_platform: { target_os = "macos" },
-        ios_platform: { target_os = "ios" },
-        windows_platform: { target_os = "windows" },
-        apple: { any(target_os = "ios", target_os = "macos") },
-        free_unix: { all(unix, not(apple), not(android_platform)) },
-        redox: { target_os = "redox" },
-
-        // Native displays.
-        x11_platform: { all(feature = "x11", free_unix, not(wasm), not(redox)) },
-        wayland_platform: { all(feature = "wayland", free_unix, not(wasm), not(redox)) },
-        orbital_platform: { redox },
-    }
-
-    // XXX aliases are not available for the build script itself.
-    #[cfg(all(
-        any(
-            target_os = "linux",
-            target_os = "dragonfly",
-            target_os = "freebsd",
-            target_os = "openbsd",
-            target_os = "netbsd",
-        ),
-        feature = "wayland",
-    ))]
-    wayland::main();
-}

clippy.toml

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

deny.toml

@@ -0,0 +1,65 @@
+# https://embarkstudios.github.io/cargo-deny/
+# cargo install cargo-deny
+# cargo update && cargo deny --all-features --log-level error --target aarch64-apple-ios check
+# Note: running just `cargo deny check` without a `--target` will result in
+# false positives due to https://github.com/EmbarkStudios/cargo-deny/issues/324
+targets = [
+    { triple = "aarch64-apple-ios" },
+    { triple = "aarch64-linux-android" },
+    { triple = "i686-pc-windows-gnu" },
+    { triple = "i686-pc-windows-msvc" },
+    { triple = "i686-unknown-linux-gnu" },
+    { triple = "wasm32-unknown-unknown" },
+    { triple = "x86_64-apple-darwin" },
+    { triple = "x86_64-apple-ios" },
+    { triple = "x86_64-pc-windows-gnu" },
+    { triple = "x86_64-pc-windows-msvc" },
+    { triple = "x86_64-unknown-linux-gnu" },
+    { triple = "x86_64-unknown-redox" },
+]
+
+
+[advisories]
+vulnerability = "deny"
+unmaintained = "warn"
+yanked = "deny"
+ignore = []
+
+
+[bans]
+multiple-versions = "deny"
+wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny/issues/241 is fixed
+deny = []
+skip = [
+    { name = "raw-window-handle" },    # we intentionally have multiple versions of this
+    { name = "bitflags" },             # the ecosystem is in the process of migrating.
+    { name = "libloading" },           # x11rb uses a different version until the next update
+]
+skip-tree = [
+    { name = "run-wasm", version = "0.1.0" }
+]
+
+
+[licenses]
+private = { ignore = true }
+unlicensed = "deny"
+allow-osi-fsf-free = "neither"
+confidence-threshold = 0.92 # We want really high confidence when inferring licenses from text
+copyleft = "deny"
+allow = [
+    "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html
+    "Apache-2.0",                     # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
+    "BSD-2-Clause",                   # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
+    "BSD-3-Clause",                   # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
+    "BSL-1.0",                        # https://tldrlegal.com/license/boost-software-license-1.0-explained
+    "CC0-1.0",                        # https://creativecommons.org/publicdomain/zero/1.0/
+    "ISC",                            # https://tldrlegal.com/license/-isc-license
+    "LicenseRef-UFL-1.0",             # https://tldrlegal.com/license/ubuntu-font-license,-1.0 - no official SPDX, see https://github.com/emilk/egui/issues/2321
+    "MIT-0",                          # https://choosealicense.com/licenses/mit-0/
+    "MIT",                            # https://tldrlegal.com/license/mit-license
+    "MPL-2.0",                        # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux.
+    "OFL-1.1",                        # https://spdx.org/licenses/OFL-1.1.html
+    "OpenSSL",                        # https://www.openssl.org/source/license.html - used on Linux
+    "Unicode-DFS-2016",               # https://spdx.org/licenses/Unicode-DFS-2016.html
+    "Zlib",                           # https://tldrlegal.com/license/zlib-libpng-license-(zlib)
+]

docs/res/ATTRIBUTION.md

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

examples/cursor.rs

@@ -1,90 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{ElementState, Event, KeyboardInput, WindowEvent},
-    event_loop::EventLoop,
-    window::{CursorIcon, WindowBuilder},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new().build(&event_loop).unwrap();
-    window.set_title("A fantastic window!");
-
-    let mut cursor_idx = 0;
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    },
-                ..
-            } => {
-                println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);
-                window.set_cursor_icon(CURSORS[cursor_idx]);
-                if cursor_idx < CURSORS.len() - 1 {
-                    cursor_idx += 1;
-                } else {
-                    cursor_idx = 0;
-                }
-            }
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => {
-                control_flow.set_exit();
-            }
-            _ => (),
-        }
-    });
-}
-
-const CURSORS: &[CursorIcon] = &[
-    CursorIcon::Default,
-    CursorIcon::Crosshair,
-    CursorIcon::Hand,
-    CursorIcon::Arrow,
-    CursorIcon::Move,
-    CursorIcon::Text,
-    CursorIcon::Wait,
-    CursorIcon::Help,
-    CursorIcon::Progress,
-    CursorIcon::NotAllowed,
-    CursorIcon::ContextMenu,
-    CursorIcon::Cell,
-    CursorIcon::VerticalText,
-    CursorIcon::Alias,
-    CursorIcon::Copy,
-    CursorIcon::NoDrop,
-    CursorIcon::Grab,
-    CursorIcon::Grabbing,
-    CursorIcon::AllScroll,
-    CursorIcon::ZoomIn,
-    CursorIcon::ZoomOut,
-    CursorIcon::EResize,
-    CursorIcon::NResize,
-    CursorIcon::NeResize,
-    CursorIcon::NwResize,
-    CursorIcon::SResize,
-    CursorIcon::SeResize,
-    CursorIcon::SwResize,
-    CursorIcon::WResize,
-    CursorIcon::EwResize,
-    CursorIcon::NsResize,
-    CursorIcon::NeswResize,
-    CursorIcon::NwseResize,
-    CursorIcon::ColResize,
-    CursorIcon::RowResize,
-];

examples/cursor_grab.rs

@@ -1,70 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, WindowEvent},
-    event_loop::EventLoop,
-    window::{CursorGrabMode, WindowBuilder},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("Super Cursor Grab'n'Hide Simulator 9000")
-        .build(&event_loop)
-        .unwrap();
-
-    let mut modifiers = ModifiersState::default();
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => control_flow.set_exit(),
-                WindowEvent::KeyboardInput {
-                    input:
-                        KeyboardInput {
-                            state: ElementState::Released,
-                            virtual_keycode: Some(key),
-                            ..
-                        },
-                    ..
-                } => {
-                    use winit::event::VirtualKeyCode::*;
-                    let result = match key {
-                        Escape => {
-                            control_flow.set_exit();
-                            Ok(())
-                        }
-                        G => window.set_cursor_grab(CursorGrabMode::Confined),
-                        L => window.set_cursor_grab(CursorGrabMode::Locked),
-                        A => window.set_cursor_grab(CursorGrabMode::None),
-                        H => {
-                            window.set_cursor_visible(modifiers.shift());
-                            Ok(())
-                        }
-                        _ => Ok(()),
-                    };
-
-                    if let Err(err) = result {
-                        println!("error: {err}");
-                    }
-                }
-                WindowEvent::ModifiersChanged(m) => modifiers = m,
-                _ => (),
-            },
-            Event::DeviceEvent { event, .. } => match event {
-                DeviceEvent::MouseMotion { delta } => println!("mouse moved: {delta:?}"),
-                DeviceEvent::Button { button, state } => match state {
-                    ElementState::Pressed => println!("mouse button {button} pressed"),
-                    ElementState::Released => println!("mouse button {button} released"),
-                },
-                _ => (),
-            },
-            _ => (),
-        }
-    });
-}

examples/drag_window.rs

@@ -1,75 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{
-        ElementState, Event, KeyboardInput, MouseButton, StartCause, VirtualKeyCode, WindowEvent,
-    },
-    event_loop::EventLoop,
-    window::{Window, WindowBuilder, WindowId},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window_1 = WindowBuilder::new().build(&event_loop).unwrap();
-    let window_2 = WindowBuilder::new().build(&event_loop).unwrap();
-
-    let mut switched = false;
-    let mut entered_id = window_2.id();
-
-    event_loop.run(move |event, _, control_flow| match event {
-        Event::NewEvents(StartCause::Init) => {
-            eprintln!("Switch which window is to be dragged by pressing \"x\".")
-        }
-        Event::WindowEvent { event, window_id } => match event {
-            WindowEvent::CloseRequested => control_flow.set_exit(),
-            WindowEvent::MouseInput {
-                state: ElementState::Pressed,
-                button: MouseButton::Left,
-                ..
-            } => {
-                let window = if (window_id == window_1.id() && switched)
-                    || (window_id == window_2.id() && !switched)
-                {
-                    &window_2
-                } else {
-                    &window_1
-                };
-
-                window.drag_window().unwrap()
-            }
-            WindowEvent::CursorEntered { .. } => {
-                entered_id = window_id;
-                name_windows(entered_id, switched, &window_1, &window_2)
-            }
-            WindowEvent::KeyboardInput {
-                input:
-                    KeyboardInput {
-                        state: ElementState::Released,
-                        virtual_keycode: Some(VirtualKeyCode::X),
-                        ..
-                    },
-                ..
-            } => {
-                switched = !switched;
-                name_windows(entered_id, switched, &window_1, &window_2);
-                println!("Switched!")
-            }
-            _ => (),
-        },
-        _ => (),
-    });
-}
-
-fn name_windows(window_id: WindowId, switched: bool, window_1: &Window, window_2: &Window) {
-    let (drag_target, other) =
-        if (window_id == window_1.id() && switched) || (window_id == window_2.id() && !switched) {
-            (&window_2, &window_1)
-        } else {
-            (&window_1, &window_2)
-        };
-    drag_target.set_title("drag target");
-    other.set_title("winit window");
-}

examples/fullscreen.rs

@@ -1,113 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent};
-use winit::event_loop::EventLoop;
-use winit::window::{Fullscreen, WindowBuilder};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let mut decorations = true;
-    let mut minimized = false;
-
-    let window = WindowBuilder::new()
-        .with_title("Hello world!")
-        .build(&event_loop)
-        .unwrap();
-
-    let mut monitor_index = 0;
-    let mut monitor = event_loop
-        .available_monitors()
-        .next()
-        .expect("no monitor found!");
-    println!("Monitor: {:?}", monitor.name());
-
-    let mut mode_index = 0;
-    let mut mode = monitor.video_modes().next().expect("no mode found");
-    println!("Mode: {mode}");
-
-    println!("Keys:");
-    println!("- Esc\tExit");
-    println!("- F\tToggle exclusive fullscreen mode");
-    println!("- B\tToggle borderless mode");
-    println!("- S\tNext screen");
-    println!("- M\tNext mode for this screen");
-    println!("- D\tToggle window decorations");
-    println!("- X\tMaximize window");
-    println!("- Z\tMinimize window");
-
-    event_loop.run(move |event, elwt, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => control_flow.set_exit(),
-                WindowEvent::KeyboardInput {
-                    input:
-                        KeyboardInput {
-                            virtual_keycode: Some(virtual_code),
-                            state: ElementState::Pressed,
-                            ..
-                        },
-                    ..
-                } => match virtual_code {
-                    VirtualKeyCode::Escape => control_flow.set_exit(),
-                    VirtualKeyCode::F | VirtualKeyCode::B if window.fullscreen().is_some() => {
-                        window.set_fullscreen(None);
-                    }
-                    VirtualKeyCode::F => {
-                        let fullscreen = Some(Fullscreen::Exclusive(mode.clone()));
-                        println!("Setting mode: {fullscreen:?}");
-                        window.set_fullscreen(fullscreen);
-                    }
-                    VirtualKeyCode::B => {
-                        let fullscreen = Some(Fullscreen::Borderless(Some(monitor.clone())));
-                        println!("Setting mode: {fullscreen:?}");
-                        window.set_fullscreen(fullscreen);
-                    }
-                    VirtualKeyCode::S => {
-                        monitor_index += 1;
-                        if let Some(mon) = elwt.available_monitors().nth(monitor_index) {
-                            monitor = mon;
-                        } else {
-                            monitor_index = 0;
-                            monitor = elwt.available_monitors().next().expect("no monitor found!");
-                        }
-                        println!("Monitor: {:?}", monitor.name());
-
-                        mode_index = 0;
-                        mode = monitor.video_modes().next().expect("no mode found");
-                        println!("Mode: {mode}");
-                    }
-                    VirtualKeyCode::M => {
-                        mode_index += 1;
-                        if let Some(m) = monitor.video_modes().nth(mode_index) {
-                            mode = m;
-                        } else {
-                            mode_index = 0;
-                            mode = monitor.video_modes().next().expect("no mode found");
-                        }
-                        println!("Mode: {mode}");
-                    }
-                    VirtualKeyCode::D => {
-                        decorations = !decorations;
-                        window.set_decorations(decorations);
-                    }
-                    VirtualKeyCode::X => {
-                        let is_maximized = window.is_maximized();
-                        window.set_maximized(!is_maximized);
-                    }
-                    VirtualKeyCode::Z => {
-                        minimized = !minimized;
-                        window.set_minimized(minimized);
-                    }
-                    _ => (),
-                },
-                _ => (),
-            },
-            _ => {}
-        }
-    });
-}

examples/handling_close.rs

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

examples/ime.rs

@@ -1,112 +0,0 @@
-#![allow(clippy::single_match)]
-
-use log::LevelFilter;
-use simple_logger::SimpleLogger;
-use winit::{
-    dpi::PhysicalPosition,
-    event::{ElementState, Event, Ime, VirtualKeyCode, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::{ImePurpose, WindowBuilder},
-};
-
-fn main() {
-    SimpleLogger::new()
-        .with_level(LevelFilter::Trace)
-        .init()
-        .unwrap();
-
-    println!("IME position will system default");
-    println!("Click to set IME position to cursor's");
-    println!("Press F2 to toggle IME. See the documentation of `set_ime_allowed` for more info");
-    println!("Press F3 to cycle through IME purposes.");
-
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_inner_size(winit::dpi::LogicalSize::new(256f64, 128f64))
-        .build(&event_loop)
-        .unwrap();
-
-    let mut ime_purpose = ImePurpose::Normal;
-    let mut ime_allowed = true;
-    window.set_ime_allowed(ime_allowed);
-
-    let mut may_show_ime = false;
-    let mut cursor_position = PhysicalPosition::new(0.0, 0.0);
-    let mut ime_pos = PhysicalPosition::new(0.0, 0.0);
-
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            Event::WindowEvent {
-                event: WindowEvent::CursorMoved { position, .. },
-                ..
-            } => {
-                cursor_position = position;
-            }
-            Event::WindowEvent {
-                event:
-                    WindowEvent::MouseInput {
-                        state: ElementState::Released,
-                        ..
-                    },
-                ..
-            } => {
-                println!(
-                    "Setting ime position to {}, {}",
-                    cursor_position.x, cursor_position.y
-                );
-                ime_pos = cursor_position;
-                if may_show_ime {
-                    window.set_ime_position(ime_pos);
-                }
-            }
-            Event::WindowEvent {
-                event: WindowEvent::Ime(event),
-                ..
-            } => {
-                println!("{event:?}");
-                may_show_ime = event != Ime::Disabled;
-                if may_show_ime {
-                    window.set_ime_position(ime_pos);
-                }
-            }
-            Event::WindowEvent {
-                event: WindowEvent::ReceivedCharacter(ch),
-                ..
-            } => {
-                println!("ch: {ch:?}");
-            }
-            Event::WindowEvent {
-                event: WindowEvent::KeyboardInput { input, .. },
-                ..
-            } => {
-                println!("key: {input:?}");
-
-                if input.state == ElementState::Pressed
-                    && input.virtual_keycode == Some(VirtualKeyCode::F2)
-                {
-                    ime_allowed = !ime_allowed;
-                    window.set_ime_allowed(ime_allowed);
-                    println!("\nIME allowed: {ime_allowed}\n");
-                }
-                if input.state == ElementState::Pressed
-                    && input.virtual_keycode == Some(VirtualKeyCode::F3)
-                {
-                    ime_purpose = match ime_purpose {
-                        ImePurpose::Normal => ImePurpose::Password,
-                        ImePurpose::Password => ImePurpose::Terminal,
-                        _ => ImePurpose::Normal,
-                    };
-                    window.set_ime_purpose(ime_purpose);
-                    println!("\nIME purpose: {ime_purpose:?}\n");
-                }
-            }
-            _ => (),
-        }
-    });
-}

examples/multithreaded.rs

@@ -1,199 +0,0 @@
-#![allow(clippy::single_match)]
-
-#[cfg(not(wasm_platform))]
-fn main() {
-    use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
-
-    use simple_logger::SimpleLogger;
-    use winit::{
-        dpi::{PhysicalPosition, PhysicalSize, Position, Size},
-        event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-        event_loop::EventLoop,
-        window::{CursorGrabMode, CursorIcon, Fullscreen, WindowBuilder, WindowLevel},
-    };
-
-    const WINDOW_COUNT: usize = 3;
-    const WINDOW_SIZE: PhysicalSize<u32> = PhysicalSize::new(600, 400);
-
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-    let mut window_senders = HashMap::with_capacity(WINDOW_COUNT);
-    for _ in 0..WINDOW_COUNT {
-        let window = WindowBuilder::new()
-            .with_inner_size(WINDOW_SIZE)
-            .build(&event_loop)
-            .unwrap();
-
-        let mut video_modes: Vec<_> = window.current_monitor().unwrap().video_modes().collect();
-        let mut video_mode_id = 0usize;
-
-        let (tx, rx) = mpsc::channel();
-        window_senders.insert(window.id(), tx);
-        thread::spawn(move || {
-            while let Ok(event) = rx.recv() {
-                match event {
-                    WindowEvent::Moved { .. } => {
-                        // We need to update our chosen video mode if the window
-                        // was moved to an another monitor, so that the window
-                        // appears on this monitor instead when we go fullscreen
-                        let previous_video_mode = video_modes.get(video_mode_id).cloned();
-                        video_modes = window.current_monitor().unwrap().video_modes().collect();
-                        video_mode_id = video_mode_id.min(video_modes.len());
-                        let video_mode = video_modes.get(video_mode_id);
-
-                        // Different monitors may support different video modes,
-                        // and the index we chose previously may now point to a
-                        // completely different video mode, so notify the user
-                        if video_mode != previous_video_mode.as_ref() {
-                            println!(
-                                "Window moved to another monitor, picked video mode: {}",
-                                video_modes.get(video_mode_id).unwrap()
-                            );
-                        }
-                    }
-                    #[allow(deprecated)]
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Released,
-                                virtual_keycode: Some(key),
-                                modifiers,
-                                ..
-                            },
-                        ..
-                    } => {
-                        window.set_title(&format!("{key:?}"));
-                        let state = !modifiers.shift();
-                        use VirtualKeyCode::*;
-                        match key {
-                            Key1 => window.set_window_level(WindowLevel::AlwaysOnTop),
-                            Key2 => window.set_window_level(WindowLevel::AlwaysOnBottom),
-                            Key3 => window.set_window_level(WindowLevel::Normal),
-                            C => window.set_cursor_icon(match state {
-                                true => CursorIcon::Progress,
-                                false => CursorIcon::Default,
-                            }),
-                            D => window.set_decorations(!state),
-                            // Cycle through video modes
-                            Right | Left => {
-                                video_mode_id = match key {
-                                    Left => video_mode_id.saturating_sub(1),
-                                    Right => (video_modes.len() - 1).min(video_mode_id + 1),
-                                    _ => unreachable!(),
-                                };
-                                println!("Picking video mode: {}", video_modes[video_mode_id]);
-                            }
-                            F => window.set_fullscreen(match (state, modifiers.alt()) {
-                                (true, false) => Some(Fullscreen::Borderless(None)),
-                                (true, true) => {
-                                    Some(Fullscreen::Exclusive(video_modes[video_mode_id].clone()))
-                                }
-                                (false, _) => None,
-                            }),
-                            L if state => {
-                                if let Err(err) = window.set_cursor_grab(CursorGrabMode::Locked) {
-                                    println!("error: {err}");
-                                }
-                            }
-                            G if state => {
-                                if let Err(err) = window.set_cursor_grab(CursorGrabMode::Confined) {
-                                    println!("error: {err}");
-                                }
-                            }
-                            G | L if !state => {
-                                if let Err(err) = window.set_cursor_grab(CursorGrabMode::None) {
-                                    println!("error: {err}");
-                                }
-                            }
-                            H => window.set_cursor_visible(!state),
-                            I => {
-                                println!("Info:");
-                                println!("-> outer_position : {:?}", window.outer_position());
-                                println!("-> inner_position : {:?}", window.inner_position());
-                                println!("-> outer_size     : {:?}", window.outer_size());
-                                println!("-> inner_size     : {:?}", window.inner_size());
-                                println!("-> fullscreen     : {:?}", window.fullscreen());
-                            }
-                            L => window.set_min_inner_size(match state {
-                                true => Some(WINDOW_SIZE),
-                                false => None,
-                            }),
-                            M => window.set_maximized(state),
-                            P => window.set_outer_position({
-                                let mut position = window.outer_position().unwrap();
-                                let sign = if state { 1 } else { -1 };
-                                position.x += 10 * sign;
-                                position.y += 10 * sign;
-                                position
-                            }),
-                            Q => window.request_redraw(),
-                            R => window.set_resizable(state),
-                            S => window.set_inner_size(match state {
-                                true => PhysicalSize::new(
-                                    WINDOW_SIZE.width + 100,
-                                    WINDOW_SIZE.height + 100,
-                                ),
-                                false => WINDOW_SIZE,
-                            }),
-                            W => {
-                                if let Size::Physical(size) = WINDOW_SIZE.into() {
-                                    window
-                                        .set_cursor_position(Position::Physical(
-                                            PhysicalPosition::new(
-                                                size.width as i32 / 2,
-                                                size.height as i32 / 2,
-                                            ),
-                                        ))
-                                        .unwrap()
-                                }
-                            }
-                            Z => {
-                                window.set_visible(false);
-                                thread::sleep(Duration::from_secs(1));
-                                window.set_visible(true);
-                            }
-                            _ => (),
-                        }
-                    }
-                    _ => (),
-                }
-            }
-        });
-    }
-    event_loop.run(move |event, _event_loop, control_flow| {
-        match !window_senders.is_empty() {
-            true => control_flow.set_wait(),
-            false => control_flow.set_exit(),
-        };
-        match event {
-            Event::WindowEvent { event, window_id } => match event {
-                WindowEvent::CloseRequested
-                | WindowEvent::Destroyed
-                | WindowEvent::KeyboardInput {
-                    input:
-                        KeyboardInput {
-                            state: ElementState::Released,
-                            virtual_keycode: Some(VirtualKeyCode::Escape),
-                            ..
-                        },
-                    ..
-                } => {
-                    window_senders.remove(&window_id);
-                }
-                _ => {
-                    if let Some(tx) = window_senders.get(&window_id) {
-                        if let Some(event) = event.to_static() {
-                            tx.send(event).unwrap();
-                        }
-                    }
-                }
-            },
-            _ => {}
-        }
-    })
-}
-
-#[cfg(wasm_platform)]
-fn main() {
-    panic!("Example not supported on Wasm");
-}

examples/multiwindow.rs

@@ -1,61 +0,0 @@
-#![allow(clippy::single_match)]
-
-use std::collections::HashMap;
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::EventLoop,
-    window::Window,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let mut windows = HashMap::new();
-    for _ in 0..3 {
-        let window = Window::new(&event_loop).unwrap();
-        println!("Opened a new window: {:?}", window.id());
-        windows.insert(window.id(), window);
-    }
-
-    println!("Press N to open a new window.");
-
-    event_loop.run(move |event, event_loop, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent { event, window_id } => {
-                match event {
-                    WindowEvent::CloseRequested => {
-                        println!("Window {window_id:?} has received the signal to close");
-
-                        // This drops the window, causing it to close.
-                        windows.remove(&window_id);
-
-                        if windows.is_empty() {
-                            control_flow.set_exit();
-                        }
-                    }
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                state: ElementState::Pressed,
-                                virtual_keycode: Some(VirtualKeyCode::N),
-                                ..
-                            },
-                        is_synthetic: false,
-                        ..
-                    } => {
-                        let window = Window::new(event_loop).unwrap();
-                        println!("Opened a new window: {:?}", window.id());
-                        windows.insert(window.id(), window);
-                    }
-                    _ => (),
-                }
-            }
-            _ => (),
-        }
-    })
-}

examples/request_redraw_threaded.rs

@@ -1,48 +0,0 @@
-#![allow(clippy::single_match)]
-
-#[cfg(not(wasm_platform))]
-fn main() {
-    use std::{thread, time};
-
-    use simple_logger::SimpleLogger;
-    use winit::{
-        event::{Event, WindowEvent},
-        event_loop::EventLoop,
-        window::WindowBuilder,
-    };
-
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
-
-    thread::spawn(move || loop {
-        thread::sleep(time::Duration::from_secs(1));
-        window.request_redraw();
-    });
-
-    event_loop.run(move |event, _, control_flow| {
-        println!("{event:?}");
-
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => control_flow.set_exit(),
-            Event::RedrawRequested(_) => {
-                println!("\nredrawing!\n");
-            }
-            _ => (),
-        }
-    });
-}
-
-#[cfg(wasm_platform)]
-fn main() {
-    unimplemented!() // `Window` can't be sent between threads
-}

examples/theme.rs

@@ -1,71 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::{Theme, WindowBuilder},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_theme(Some(Theme::Dark))
-        .build(&event_loop)
-        .unwrap();
-
-    println!("Initial theme: {:?}", window.theme());
-    println!("debugging keys:");
-    println!("  (A) Automatic theme");
-    println!("  (L) Light theme");
-    println!("  (D) Dark theme");
-
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            Event::WindowEvent {
-                event: WindowEvent::ThemeChanged(theme),
-                window_id,
-                ..
-            } if window_id == window.id() => {
-                println!("Theme is changed: {theme:?}")
-            }
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(key),
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    },
-                ..
-            } => match key {
-                VirtualKeyCode::A => {
-                    println!("Theme was: {:?}", window.theme());
-                    window.set_theme(None);
-                }
-                VirtualKeyCode::L => {
-                    println!("Theme was: {:?}", window.theme());
-                    window.set_theme(Some(Theme::Light));
-                }
-                VirtualKeyCode::D => {
-                    println!("Theme was: {:?}", window.theme());
-                    window.set_theme(Some(Theme::Dark));
-                }
-                _ => (),
-            },
-            _ => (),
-        }
-    });
-}

examples/timer.rs

@@ -1,42 +0,0 @@
-#![allow(clippy::single_match)]
-
-use instant::Instant;
-use std::time::Duration;
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{Event, StartCause, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let _window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
-
-    let timer_length = Duration::new(1, 0);
-
-    event_loop.run(move |event, _, control_flow| {
-        println!("{event:?}");
-
-        match event {
-            Event::NewEvents(StartCause::Init) => {
-                control_flow.set_wait_until(Instant::now() + timer_length);
-            }
-            Event::NewEvents(StartCause::ResumeTimeReached { .. }) => {
-                control_flow.set_wait_until(Instant::now() + timer_length);
-                println!("\nTimer\n");
-            }
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => control_flow.set_exit(),
-            _ => (),
-        }
-    });
-}

examples/touchpad_gestures.rs

@@ -1,46 +0,0 @@
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let _window = WindowBuilder::new()
-        .with_title("Touchpad gestures")
-        .build(&event_loop)
-        .unwrap();
-
-    println!("Only supported on macOS at the moment.");
-
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-
-        if let Event::WindowEvent { event, .. } = event {
-            match event {
-                WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
-                WindowEvent::TouchpadMagnify { delta, .. } => {
-                    if delta > 0.0 {
-                        println!("Zoomed in {delta}");
-                    } else {
-                        println!("Zoomed out {delta}");
-                    }
-                }
-                WindowEvent::SmartMagnify { .. } => {
-                    println!("Smart zoom");
-                }
-                WindowEvent::TouchpadRotate { delta, .. } => {
-                    if delta > 0.0 {
-                        println!("Rotated counterclockwise {delta}");
-                    } else {
-                        println!("Rotated clockwise {delta}");
-                    }
-                }
-                _ => (),
-            }
-        }
-    });
-}

examples/transparent.rs

@@ -1,34 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_decorations(false)
-        .with_transparent(true)
-        .build(&event_loop)
-        .unwrap();
-
-    window.set_title("A fantastic window!");
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-        println!("{event:?}");
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => control_flow.set_exit(),
-            _ => (),
-        }
-    });
-}

examples/web.rs

@@ -1,90 +0,0 @@
-#![allow(clippy::single_match)]
-
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-pub fn main() {
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
-
-    #[cfg(wasm_platform)]
-    let log_list = wasm::insert_canvas_and_create_log_list(&window);
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        #[cfg(wasm_platform)]
-        wasm::log_event(&log_list, &event);
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            Event::MainEventsCleared => {
-                window.request_redraw();
-            }
-            _ => (),
-        }
-    });
-}
-
-#[cfg(wasm_platform)]
-mod wasm {
-    use wasm_bindgen::prelude::*;
-    use winit::{event::Event, window::Window};
-
-    #[wasm_bindgen(start)]
-    pub fn run() {
-        console_log::init_with_level(log::Level::Debug).expect("error initializing logger");
-
-        #[allow(clippy::main_recursion)]
-        super::main();
-    }
-
-    pub fn insert_canvas_and_create_log_list(window: &Window) -> web_sys::Element {
-        use winit::platform::web::WindowExtWebSys;
-
-        let canvas = window.canvas();
-
-        let window = web_sys::window().unwrap();
-        let document = window.document().unwrap();
-        let body = document.body().unwrap();
-
-        // Set a background color for the canvas to make it easier to tell where the canvas is for debugging purposes.
-        canvas.style().set_css_text("background-color: crimson;");
-        body.append_child(&canvas).unwrap();
-
-        let log_header = document.create_element("h2").unwrap();
-        log_header.set_text_content(Some("Event Log"));
-        body.append_child(&log_header).unwrap();
-
-        let log_list = document.create_element("ul").unwrap();
-        body.append_child(&log_list).unwrap();
-        log_list
-    }
-
-    pub fn log_event(log_list: &web_sys::Element, event: &Event<()>) {
-        log::debug!("{:?}", event);
-
-        // Getting access to browser logs requires a lot of setup on mobile devices.
-        // So we implement this basic logging system into the page to give developers an easy alternative.
-        // As a bonus its also kind of handy on desktop.
-        if let Event::WindowEvent { event, .. } = &event {
-            let window = web_sys::window().unwrap();
-            let document = window.document().unwrap();
-            let log = document.create_element("li").unwrap();
-            log.set_text_content(Some(&format!("{event:?}")));
-            log_list
-                .insert_before(&log, log_list.first_child().as_ref())
-                .unwrap();
-        }
-    }
-}

examples/window.rs

@@ -1,35 +0,0 @@
-#![allow(clippy::single_match)]
-
-use simple_logger::SimpleLogger;
-use winit::{
-    event::{Event, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
-        .build(&event_loop)
-        .unwrap();
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-        println!("{event:?}");
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            Event::MainEventsCleared => {
-                window.request_redraw();
-            }
-            _ => (),
-        }
-    });
-}

examples/window_buttons.rs

@@ -1,68 +0,0 @@
-#![allow(clippy::single_match)]
-
-// This example is used by developers to test various window functions.
-
-use simple_logger::SimpleLogger;
-use winit::{
-    dpi::LogicalSize,
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{DeviceEventFilter, EventLoop},
-    window::{WindowBuilder, WindowButtons},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_inner_size(LogicalSize::new(300.0, 300.0))
-        .build(&event_loop)
-        .unwrap();
-
-    eprintln!("Window Button keys:");
-    eprintln!("  (F) Toggle close button");
-    eprintln!("  (G) Toggle maximize button");
-    eprintln!("  (H) Toggle minimize button");
-
-    event_loop.set_device_event_filter(DeviceEventFilter::Never);
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(key),
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    },
-                ..
-            } => match key {
-                VirtualKeyCode::F => {
-                    let buttons = window.enabled_buttons();
-                    window.set_enabled_buttons(buttons ^ WindowButtons::CLOSE);
-                }
-                VirtualKeyCode::G => {
-                    let buttons = window.enabled_buttons();
-                    window.set_enabled_buttons(buttons ^ WindowButtons::MAXIMIZE);
-                }
-                VirtualKeyCode::H => {
-                    let buttons = window.enabled_buttons();
-                    window.set_enabled_buttons(buttons ^ WindowButtons::MINIMIZE);
-                }
-                _ => (),
-            },
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            _ => (),
-        }
-    });
-}

examples/window_debug.rs

@@ -1,132 +0,0 @@
-#![allow(clippy::single_match)]
-
-// This example is used by developers to test various window functions.
-
-use simple_logger::SimpleLogger;
-use winit::{
-    dpi::{LogicalSize, PhysicalSize},
-    event::{DeviceEvent, ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::{DeviceEventFilter, EventLoop},
-    window::{Fullscreen, WindowBuilder},
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_inner_size(LogicalSize::new(100.0, 100.0))
-        .build(&event_loop)
-        .unwrap();
-
-    eprintln!("debugging keys:");
-    eprintln!("  (E) Enter exclusive fullscreen");
-    eprintln!("  (F) Toggle borderless fullscreen");
-    eprintln!("  (P) Toggle borderless fullscreen on system's preffered monitor");
-    eprintln!("  (M) Toggle minimized");
-    eprintln!("  (Q) Quit event loop");
-    eprintln!("  (V) Toggle visibility");
-    eprintln!("  (X) Toggle maximized");
-
-    let mut minimized = false;
-    let mut visible = true;
-
-    event_loop.set_device_event_filter(DeviceEventFilter::Never);
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::DeviceEvent {
-                event:
-                    DeviceEvent::Key(KeyboardInput {
-                        virtual_keycode: Some(key),
-                        state: ElementState::Pressed,
-                        ..
-                    }),
-                ..
-            } => match key {
-                VirtualKeyCode::M => {
-                    if minimized {
-                        minimized = !minimized;
-                        window.set_minimized(minimized);
-                        window.focus_window();
-                    }
-                }
-                VirtualKeyCode::V => {
-                    if !visible {
-                        visible = !visible;
-                        window.set_visible(visible);
-                    }
-                }
-                _ => (),
-            },
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(key),
-                                state: ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    },
-                ..
-            } => match key {
-                VirtualKeyCode::E => {
-                    fn area(size: PhysicalSize<u32>) -> u32 {
-                        size.width * size.height
-                    }
-
-                    let monitor = window.current_monitor().unwrap();
-                    if let Some(mode) = monitor
-                        .video_modes()
-                        .max_by(|a, b| area(a.size()).cmp(&area(b.size())))
-                    {
-                        window.set_fullscreen(Some(Fullscreen::Exclusive(mode)));
-                    } else {
-                        eprintln!("no video modes available");
-                    }
-                }
-                VirtualKeyCode::F => {
-                    if window.fullscreen().is_some() {
-                        window.set_fullscreen(None);
-                    } else {
-                        let monitor = window.current_monitor();
-                        window.set_fullscreen(Some(Fullscreen::Borderless(monitor)));
-                    }
-                }
-                VirtualKeyCode::P => {
-                    if window.fullscreen().is_some() {
-                        window.set_fullscreen(None);
-                    } else {
-                        window.set_fullscreen(Some(Fullscreen::Borderless(None)));
-                    }
-                }
-                VirtualKeyCode::M => {
-                    minimized = !minimized;
-                    window.set_minimized(minimized);
-                }
-                VirtualKeyCode::Q => {
-                    control_flow.set_exit();
-                }
-                VirtualKeyCode::V => {
-                    visible = !visible;
-                    window.set_visible(visible);
-                }
-                VirtualKeyCode::X => {
-                    let is_maximized = window.is_maximized();
-                    window.set_maximized(!is_maximized);
-                }
-                _ => (),
-            },
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            _ => (),
-        }
-    });
-}

examples/window_option_as_alt.rs

@@ -1,69 +0,0 @@
-#![allow(clippy::single_match)]
-
-#[cfg(target_os = "macos")]
-use winit::platform::macos::{OptionAsAlt, WindowExtMacOS};
-
-#[cfg(target_os = "macos")]
-use winit::{
-    event::ElementState,
-    event::{Event, MouseButton, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-/// Prints the keyboard events characters received when option_is_alt is true versus false.
-/// A left mouse click will toggle option_is_alt.
-#[cfg(target_os = "macos")]
-fn main() {
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
-        .build(&event_loop)
-        .unwrap();
-
-    let mut option_as_alt = OptionAsAlt::None;
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::MouseInput {
-                    state: ElementState::Pressed,
-                    button: MouseButton::Left,
-                    ..
-                } => {
-                    option_as_alt = match option_as_alt {
-                        OptionAsAlt::None => OptionAsAlt::OnlyLeft,
-                        OptionAsAlt::OnlyLeft => OptionAsAlt::OnlyRight,
-                        OptionAsAlt::OnlyRight => OptionAsAlt::Both,
-                        OptionAsAlt::Both => OptionAsAlt::None,
-                    };
-
-                    println!(
-                        "Received Mouse click, toggling option_as_alt to: {option_as_alt:?}"
-                    );
-                    window.set_option_as_alt(option_as_alt);
-                }
-                WindowEvent::ReceivedCharacter(c) => println!("ReceivedCharacter: {c:?}"),
-                WindowEvent::KeyboardInput { .. } => println!("KeyboardInput: {event:?}"),
-                _ => (),
-            },
-            Event::MainEventsCleared => {
-                window.request_redraw();
-            }
-            _ => (),
-        }
-    });
-}
-
-#[cfg(not(target_os = "macos"))]
-fn main() {
-    println!("This example is only supported on MacOS");
-}

examples/window_resize_increments.rs

@@ -1,57 +0,0 @@
-use log::debug;
-use simple_logger::SimpleLogger;
-use winit::{
-    dpi::LogicalSize,
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
-    event_loop::EventLoop,
-    window::WindowBuilder,
-};
-
-fn main() {
-    SimpleLogger::new().init().unwrap();
-    let event_loop = EventLoop::new();
-
-    let window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .with_inner_size(LogicalSize::new(128.0, 128.0))
-        .with_resize_increments(LogicalSize::new(25.0, 25.0))
-        .build(&event_loop)
-        .unwrap();
-
-    let mut has_increments = true;
-
-    event_loop.run(move |event, _, control_flow| {
-        control_flow.set_wait();
-
-        match event {
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                window_id,
-            } if window_id == window.id() => control_flow.set_exit(),
-            Event::WindowEvent {
-                event:
-                    WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
-                                virtual_keycode: Some(VirtualKeyCode::Space),
-                                state: ElementState::Released,
-                                ..
-                            },
-                        ..
-                    },
-                window_id,
-            } if window_id == window.id() => {
-                has_increments = !has_increments;
-
-                let new_increments = match window.resize_increments() {
-                    Some(_) => None,
-                    None => Some(LogicalSize::new(25.0, 25.0)),
-                };
-                debug!("Had increments: {}", new_increments.is_none());
-                window.set_resize_increments(new_increments);
-            }
-            Event::MainEventsCleared => window.request_redraw(),
-            _ => (),
-        }
-    });
-}

examples/window_run_return.rs

@@ -1,64 +0,0 @@
-#![allow(clippy::single_match)]
-
-// Limit this example to only compatible platforms.
-#[cfg(any(
-    windows_platform,
-    macos_platform,
-    x11_platform,
-    wayland_platform,
-    android_platform,
-    orbital_platform,
-))]
-fn main() {
-    use std::{thread::sleep, time::Duration};
-
-    use simple_logger::SimpleLogger;
-    use winit::{
-        event::{Event, WindowEvent},
-        event_loop::EventLoop,
-        platform::run_return::EventLoopExtRunReturn,
-        window::WindowBuilder,
-    };
-    let mut event_loop = EventLoop::new();
-
-    SimpleLogger::new().init().unwrap();
-    let _window = WindowBuilder::new()
-        .with_title("A fantastic window!")
-        .build(&event_loop)
-        .unwrap();
-
-    let mut quit = false;
-
-    while !quit {
-        event_loop.run_return(|event, _, control_flow| {
-            control_flow.set_wait();
-
-            if let Event::WindowEvent { event, .. } = &event {
-                // Print only Window events to reduce noise
-                println!("{event:?}");
-            }
-
-            match event {
-                Event::WindowEvent {
-                    event: WindowEvent::CloseRequested,
-                    ..
-                } => {
-                    quit = true;
-                }
-                Event::MainEventsCleared => {
-                    control_flow.set_exit();
-                }
-                _ => (),
-            }
-        });
-
-        // Sleep for 1/60 second to simulate rendering
-        println!("rendering");
-        sleep(Duration::from_millis(16));
-    }
-}
-
-#[cfg(any(ios_platform, wasm_platform))]
-fn main() {
-    println!("This platform doesn't support run_return.");
-}

run-wasm/Cargo.toml

@@ -2,8 +2,7 @@
 name = "run-wasm"
 version = "0.1.0"
 edition = "2021"
-
+publish = false
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 cargo-run-wasm = "0.2.0"

src/error.rs

@@ -1,82 +0,0 @@
-use std::{error, fmt};
-
-use crate::platform_impl;
-
-/// An error whose cause it outside Winit's control.
-#[derive(Debug)]
-pub enum ExternalError {
-    /// The operation is not supported by the backend.
-    NotSupported(NotSupportedError),
-    /// The OS cannot perform the operation.
-    Os(OsError),
-}
-
-/// The error type for when the requested operation is not supported by the backend.
-#[derive(Clone)]
-pub struct NotSupportedError {
-    _marker: (),
-}
-
-/// The error type for when the OS cannot perform the requested operation.
-#[derive(Debug)]
-pub struct OsError {
-    line: u32,
-    file: &'static str,
-    error: platform_impl::OsError,
-}
-
-impl NotSupportedError {
-    #[inline]
-    #[allow(dead_code)]
-    pub(crate) fn new() -> NotSupportedError {
-        NotSupportedError { _marker: () }
-    }
-}
-
-impl OsError {
-    #[allow(dead_code)]
-    pub(crate) fn new(line: u32, file: &'static str, error: platform_impl::OsError) -> OsError {
-        OsError { line, file, error }
-    }
-}
-
-#[allow(unused_macros)]
-macro_rules! os_error {
-    ($error:expr) => {{
-        crate::error::OsError::new(line!(), file!(), $error)
-    }};
-}
-
-impl fmt::Display for OsError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.pad(&format!(
-            "os error at {}:{}: {}",
-            self.file, self.line, self.error
-        ))
-    }
-}
-
-impl fmt::Display for ExternalError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            ExternalError::NotSupported(e) => e.fmt(f),
-            ExternalError::Os(e) => e.fmt(f),
-        }
-    }
-}
-
-impl fmt::Debug for NotSupportedError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.debug_struct("NotSupportedError").finish()
-    }
-}
-
-impl fmt::Display for NotSupportedError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.pad("the requested operation is not supported by Winit")
-    }
-}
-
-impl error::Error for OsError {}
-impl error::Error for ExternalError {}
-impl error::Error for NotSupportedError {}

src/event_loop.rs

@@ -1,433 +0,0 @@
-//! The [`EventLoop`] struct and assorted supporting types, including
-//! [`ControlFlow`].
-//!
-//! If you want to send custom events to the event loop, use
-//! [`EventLoop::create_proxy`] to acquire an [`EventLoopProxy`] and call its
-//! [`send_event`](`EventLoopProxy::send_event`) method.
-//!
-//! See the root-level documentation for information on how to create and use an event loop to
-//! handle events.
-use std::marker::PhantomData;
-use std::ops::Deref;
-use std::{error, fmt};
-
-use instant::{Duration, Instant};
-use once_cell::sync::OnceCell;
-use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
-
-use crate::{event::Event, monitor::MonitorHandle, platform_impl};
-
-/// Provides a way to retrieve events from the system and from the windows that were registered to
-/// the events loop.
-///
-/// An `EventLoop` can be seen more or less as a "context". Calling [`EventLoop::new`]
-/// initializes everything that will be required to create windows. For example on Linux creating
-/// an event loop opens a connection to the X or Wayland server.
-///
-/// To wake up an `EventLoop` from a another thread, see the [`EventLoopProxy`] docs.
-///
-/// Note that this cannot be shared across threads (due to platform-dependant logic
-/// forbidding it), as such it is neither [`Send`] nor [`Sync`]. If you need cross-thread access, the
-/// [`Window`] created from this _can_ be sent to an other thread, and the
-/// [`EventLoopProxy`] allows you to wake up an `EventLoop` from another thread.
-///
-/// [`Window`]: crate::window::Window
-pub struct EventLoop<T: 'static> {
-    pub(crate) event_loop: platform_impl::EventLoop<T>,
-    pub(crate) _marker: PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-/// Target that associates windows with an [`EventLoop`].
-///
-/// This type exists to allow you to create new windows while Winit executes
-/// your callback. [`EventLoop`] will coerce into this type (`impl<T> Deref for
-/// EventLoop<T>`), so functions that take this as a parameter can also take
-/// `&EventLoop`.
-pub struct EventLoopWindowTarget<T: 'static> {
-    pub(crate) p: platform_impl::EventLoopWindowTarget<T>,
-    pub(crate) _marker: PhantomData<*mut ()>, // Not Send nor Sync
-}
-
-/// Object that allows building the event loop.
-///
-/// This is used to make specifying options that affect the whole application
-/// easier. But note that constructing multiple event loops is not supported.
-#[derive(Default)]
-pub struct EventLoopBuilder<T: 'static> {
-    pub(crate) platform_specific: platform_impl::PlatformSpecificEventLoopAttributes,
-    _p: PhantomData<T>,
-}
-
-impl EventLoopBuilder<()> {
-    /// Start building a new event loop.
-    #[inline]
-    pub fn new() -> Self {
-        Self::with_user_event()
-    }
-}
-
-impl<T> EventLoopBuilder<T> {
-    /// Start building a new event loop, with the given type as the user event
-    /// type.
-    #[inline]
-    pub fn with_user_event() -> Self {
-        Self {
-            platform_specific: Default::default(),
-            _p: PhantomData,
-        }
-    }
-
-    /// Builds a new event loop.
-    ///
-    /// ***For cross-platform compatibility, the [`EventLoop`] must be created on the main thread,
-    /// and only once per application.***
-    ///
-    /// Attempting to create the event loop on a different thread, or multiple event loops in
-    /// the same application, will panic. This restriction isn't
-    /// strictly necessary on all platforms, but is imposed to eliminate any nasty surprises when
-    /// porting to platforms that require it. `EventLoopBuilderExt::any_thread` functions are exposed
-    /// in the relevant [`platform`] module if the target platform supports creating an event loop on
-    /// any thread.
-    ///
-    /// Calling this function will result in display backend initialisation.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Linux:** Backend type can be controlled using an environment variable
-    ///   `WINIT_UNIX_BACKEND`. Legal values are `x11` and `wayland`.
-    ///   If it is not set, winit will try to connect to a Wayland connection, and if that fails,
-    ///   will fall back on X11. If this variable is set with any other value, winit will panic.
-    /// - **Android:** Must be configured with an `AndroidApp` from `android_main()` by calling
-    ///     [`.with_android_app(app)`] before calling `.build()`.
-    ///
-    /// [`platform`]: crate::platform
-    #[cfg_attr(
-        android,
-        doc = "[`.with_android_app(app)`]: crate::platform::android::EventLoopBuilderExtAndroid::with_android_app"
-    )]
-    #[cfg_attr(
-        not(android),
-        doc = "[`.with_android_app(app)`]: #only-available-on-android"
-    )]
-    #[inline]
-    pub fn build(&mut self) -> EventLoop<T> {
-        static EVENT_LOOP_CREATED: OnceCell<()> = OnceCell::new();
-        if EVENT_LOOP_CREATED.set(()).is_err() {
-            panic!("Creating EventLoop multiple times is not supported.");
-        }
-        // Certain platforms accept a mutable reference in their API.
-        #[allow(clippy::unnecessary_mut_passed)]
-        EventLoop {
-            event_loop: platform_impl::EventLoop::new(&mut self.platform_specific),
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<T> fmt::Debug for EventLoop<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("EventLoop { .. }")
-    }
-}
-
-impl<T> fmt::Debug for EventLoopWindowTarget<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("EventLoopWindowTarget { .. }")
-    }
-}
-
-/// Set by the user callback given to the [`EventLoop::run`] method.
-///
-/// Indicates the desired behavior of the event loop after [`Event::RedrawEventsCleared`] is emitted.
-///
-/// Defaults to [`Poll`].
-///
-/// ## Persistency
-///
-/// Almost every change is persistent between multiple calls to the event loop closure within a
-/// given run loop. The only exception to this is [`ExitWithCode`] which, once set, cannot be unset.
-/// Changes are **not** persistent between multiple calls to `run_return` - issuing a new call will
-/// reset the control flow to [`Poll`].
-///
-/// [`ExitWithCode`]: Self::ExitWithCode
-/// [`Poll`]: Self::Poll
-#[derive(Copy, Clone, Debug, 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.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Web:** Events are queued and usually sent when `requestAnimationFrame` fires but sometimes
-    ///   the events in the queue may be sent before the next `requestAnimationFrame` callback, for
-    ///   example when the scaling of the page has changed. This should be treated as an implementation
-    ///   detail which should not be relied on.
-    Poll,
-
-    /// When the current loop iteration finishes, suspend the thread until another event arrives.
-    Wait,
-
-    /// When the current loop iteration finishes, suspend the thread until either another event
-    /// arrives or the given time is reached.
-    ///
-    /// Useful for implementing efficient timers. Applications which want to render at the display's
-    /// native refresh rate should instead use [`Poll`] and the VSync functionality of a graphics API
-    /// to reduce odds of missed frames.
-    ///
-    /// [`Poll`]: Self::Poll
-    WaitUntil(Instant),
-
-    /// Send a [`LoopDestroyed`] event and stop the event loop. This variant is *sticky* - once set,
-    /// `control_flow` cannot be changed from `ExitWithCode`, and any future attempts to do so will
-    /// result in the `control_flow` parameter being reset to `ExitWithCode`.
-    ///
-    /// The contained number will be used as exit code. The [`Exit`] constant is a shortcut for this
-    /// with exit code 0.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Android / iOS / WASM:** The supplied exit code is unused.
-    /// - **Unix:** On most Unix-like platforms, only the 8 least significant bits will be used,
-    ///   which can cause surprises with negative exit values (`-42` would end up as `214`). See
-    ///   [`std::process::exit`].
-    ///
-    /// [`LoopDestroyed`]: Event::LoopDestroyed
-    /// [`Exit`]: ControlFlow::Exit
-    ExitWithCode(i32),
-}
-
-impl ControlFlow {
-    /// Alias for [`ExitWithCode`]`(0)`.
-    ///
-    /// [`ExitWithCode`]: Self::ExitWithCode
-    #[allow(non_upper_case_globals)]
-    pub const Exit: Self = Self::ExitWithCode(0);
-
-    /// Sets this to [`Poll`].
-    ///
-    /// [`Poll`]: Self::Poll
-    pub fn set_poll(&mut self) {
-        *self = Self::Poll;
-    }
-
-    /// Sets this to [`Wait`].
-    ///
-    /// [`Wait`]: Self::Wait
-    pub fn set_wait(&mut self) {
-        *self = Self::Wait;
-    }
-
-    /// Sets this to [`WaitUntil`]`(instant)`.
-    ///
-    /// [`WaitUntil`]: Self::WaitUntil
-    pub fn set_wait_until(&mut self, instant: Instant) {
-        *self = Self::WaitUntil(instant);
-    }
-
-    /// Sets this to wait until a timeout has expired.
-    ///
-    /// In most cases, this is set to [`WaitUntil`]. However, if the timeout overflows, it is
-    /// instead set to [`Wait`].
-    ///
-    /// [`WaitUntil`]: Self::WaitUntil
-    /// [`Wait`]: Self::Wait
-    pub fn set_wait_timeout(&mut self, timeout: Duration) {
-        match Instant::now().checked_add(timeout) {
-            Some(instant) => self.set_wait_until(instant),
-            None => self.set_wait(),
-        }
-    }
-
-    /// Sets this to [`ExitWithCode`]`(code)`.
-    ///
-    /// [`ExitWithCode`]: Self::ExitWithCode
-    pub fn set_exit_with_code(&mut self, code: i32) {
-        *self = Self::ExitWithCode(code);
-    }
-
-    /// Sets this to [`Exit`].
-    ///
-    /// [`Exit`]: Self::Exit
-    pub fn set_exit(&mut self) {
-        *self = Self::Exit;
-    }
-}
-
-impl Default for ControlFlow {
-    #[inline(always)]
-    fn default() -> Self {
-        Self::Poll
-    }
-}
-
-impl EventLoop<()> {
-    /// Alias for [`EventLoopBuilder::new().build()`].
-    ///
-    /// [`EventLoopBuilder::new().build()`]: EventLoopBuilder::build
-    #[inline]
-    pub fn new() -> EventLoop<()> {
-        EventLoopBuilder::new().build()
-    }
-}
-
-impl Default for EventLoop<()> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T> EventLoop<T> {
-    #[deprecated = "Use `EventLoopBuilder::<T>::with_user_event().build()` instead."]
-    pub fn with_user_event() -> EventLoop<T> {
-        EventLoopBuilder::<T>::with_user_event().build()
-    }
-
-    /// Hijacks the calling thread and initializes the winit event loop with the provided
-    /// closure. Since the closure is `'static`, it must be a `move` closure if it needs to
-    /// access any data from the calling context.
-    ///
-    /// See the [`ControlFlow`] docs for information on how changes to `&mut ControlFlow` impact the
-    /// event loop's behavior.
-    ///
-    /// Any values not passed to this function will *not* be dropped.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **X11 / Wayland:** The program terminates with exit code 1 if the display server
-    ///   disconnects.
-    ///
-    /// [`ControlFlow`]: crate::event_loop::ControlFlow
-    #[inline]
-    pub fn run<F>(self, event_handler: F) -> !
-    where
-        F: 'static + FnMut(Event<'_, T>, &EventLoopWindowTarget<T>, &mut ControlFlow),
-    {
-        self.event_loop.run(event_handler)
-    }
-
-    /// Creates an [`EventLoopProxy`] that can be used to dispatch user events to the main event loop.
-    pub fn create_proxy(&self) -> EventLoopProxy<T> {
-        EventLoopProxy {
-            event_loop_proxy: self.event_loop.create_proxy(),
-        }
-    }
-}
-
-impl<T> Deref for EventLoop<T> {
-    type Target = EventLoopWindowTarget<T>;
-    fn deref(&self) -> &EventLoopWindowTarget<T> {
-        self.event_loop.window_target()
-    }
-}
-
-impl<T> EventLoopWindowTarget<T> {
-    /// Returns the list of all the monitors available on the system.
-    #[inline]
-    pub fn available_monitors(&self) -> impl Iterator<Item = MonitorHandle> {
-        self.p
-            .available_monitors()
-            .into_iter()
-            .map(|inner| MonitorHandle { inner })
-    }
-
-    /// Returns the primary monitor of the system.
-    ///
-    /// Returns `None` if it can't identify any monitor as a primary one.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **Wayland:** Always returns `None`.
-    #[inline]
-    pub fn primary_monitor(&self) -> Option<MonitorHandle> {
-        self.p
-            .primary_monitor()
-            .map(|inner| MonitorHandle { inner })
-    }
-
-    /// Change [`DeviceEvent`] filter mode.
-    ///
-    /// Since the [`DeviceEvent`] capture can lead to high CPU usage for unfocused windows, winit
-    /// will ignore them by default for unfocused windows on Linux/BSD. This method allows changing
-    /// this filter at runtime to explicitly capture them again.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Wayland / macOS / iOS / Android / Web / Orbital:** Unsupported.
-    ///
-    /// [`DeviceEvent`]: crate::event::DeviceEvent
-    pub fn set_device_event_filter(&self, _filter: DeviceEventFilter) {
-        #[cfg(any(x11_platform, wayland_platform, windows))]
-        self.p.set_device_event_filter(_filter);
-    }
-}
-
-unsafe impl<T> HasRawDisplayHandle for EventLoopWindowTarget<T> {
-    /// Returns a [`raw_window_handle::RawDisplayHandle`] for the event loop.
-    fn raw_display_handle(&self) -> RawDisplayHandle {
-        self.p.raw_display_handle()
-    }
-}
-
-/// 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>> {
-        self.event_loop_proxy.send_event(event)
-    }
-}
-
-impl<T: 'static> fmt::Debug for EventLoopProxy<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad("EventLoopProxy { .. }")
-    }
-}
-
-/// The error that is returned when an [`EventLoopProxy`] attempts to wake up an [`EventLoop`] that
-/// no longer exists.
-///
-/// Contains the original event given to [`EventLoopProxy::send_event`].
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct EventLoopClosed<T>(pub T);
-
-impl<T> fmt::Display for EventLoopClosed<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("Tried to wake up a closed `EventLoop`")
-    }
-}
-
-impl<T: fmt::Debug> error::Error for EventLoopClosed<T> {}
-
-/// Filter controlling the propagation of device events.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-pub enum DeviceEventFilter {
-    /// Always filter out device events.
-    Always,
-    /// Filter out device events while the window is not focused.
-    Unfocused,
-    /// Report all device events regardless of window focus.
-    Never,
-}
-
-impl Default for DeviceEventFilter {
-    fn default() -> Self {
-        Self::Unfocused
-    }
-}

src/platform/mod.rs

@@ -1,43 +0,0 @@
-//! Contains traits with platform-specific methods in them.
-//!
-//! Contains the follow OS-specific modules:
-//!
-//!  - `android`
-//!  - `ios`
-//!  - `macos`
-//!  - `unix`
-//!  - `windows`
-//!  - `web`
-//!
-//! And the following platform-specific module:
-//!
-//! - `run_return` (available on `windows`, `unix`, `macos`, and `android`)
-//!
-//! However only the module corresponding to the platform you're compiling to will be available.
-
-#[cfg(android_platform)]
-pub mod android;
-#[cfg(ios_platform)]
-pub mod ios;
-#[cfg(macos_platform)]
-pub mod macos;
-#[cfg(orbital_platform)]
-pub mod orbital;
-#[cfg(wayland_platform)]
-pub mod wayland;
-#[cfg(wasm_platform)]
-pub mod web;
-#[cfg(windows_platform)]
-pub mod windows;
-#[cfg(x11_platform)]
-pub mod x11;
-
-#[cfg(any(
-    windows_platform,
-    macos_platform,
-    android_platform,
-    x11_platform,
-    wayland_platform,
-    orbital_platform
-))]
-pub mod run_return;

src/platform/run_return.rs

@@ -1,53 +0,0 @@
-use crate::{
-    event::Event,
-    event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget},
-};
-
-/// Additional methods on [`EventLoop`] to return control flow to the caller.
-pub trait EventLoopExtRunReturn {
-    /// A type provided by the user that can be passed through [`Event::UserEvent`].
-    type UserEvent;
-
-    /// Initializes the `winit` event loop.
-    ///
-    /// Unlike [`EventLoop::run`], this function accepts non-`'static` (i.e. non-`move`) closures
-    /// and returns control flow to the caller when `control_flow` is set to [`ControlFlow::Exit`].
-    ///
-    /// # Caveats
-    ///
-    /// Despite its appearance at first glance, this is *not* a perfect replacement for
-    /// `poll_events`. For example, this function will not return on Windows or macOS while a
-    /// window is getting resized, resulting in all application logic outside of the
-    /// `event_handler` closure not running until the resize operation ends. Other OS operations
-    /// may also result in such freezes. This behavior is caused by fundamental limitations in the
-    /// underlying OS APIs, which cannot be hidden by `winit` without severe stability repercussions.
-    ///
-    /// You are strongly encouraged to use `run`, unless the use of this is absolutely necessary.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **X11 / Wayland:** This function returns `1` upon disconnection from
-    ///   the display server.
-    fn run_return<F>(&mut self, event_handler: F) -> i32
-    where
-        F: FnMut(
-            Event<'_, Self::UserEvent>,
-            &EventLoopWindowTarget<Self::UserEvent>,
-            &mut ControlFlow,
-        );
-}
-
-impl<T> EventLoopExtRunReturn for EventLoop<T> {
-    type UserEvent = T;
-
-    fn run_return<F>(&mut self, event_handler: F) -> i32
-    where
-        F: FnMut(
-            Event<'_, Self::UserEvent>,
-            &EventLoopWindowTarget<Self::UserEvent>,
-            &mut ControlFlow,
-        ),
-    {
-        self.event_loop.run_return(event_handler)
-    }
-}

src/platform/web.rs

@@ -1,89 +0,0 @@
-//! The web target does not automatically insert the canvas element object into the web page, to
-//! allow end users to determine how the page should be laid out. Use the [`WindowExtWebSys`] trait
-//! to retrieve the canvas from the Window. Alternatively, use the [`WindowBuilderExtWebSys`] trait
-//! to provide your own canvas.
-
-use crate::event::Event;
-use crate::event_loop::ControlFlow;
-use crate::event_loop::EventLoop;
-use crate::event_loop::EventLoopWindowTarget;
-use crate::window::WindowBuilder;
-
-use web_sys::HtmlCanvasElement;
-
-pub trait WindowExtWebSys {
-    fn canvas(&self) -> HtmlCanvasElement;
-
-    /// Whether the browser reports the preferred color scheme to be "dark".
-    fn is_dark_mode(&self) -> bool;
-}
-
-pub trait WindowBuilderExtWebSys {
-    fn with_canvas(self, canvas: Option<HtmlCanvasElement>) -> Self;
-
-    /// Whether `event.preventDefault` should be automatically called to prevent event propagation
-    /// when appropriate.
-    ///
-    /// For example, mouse wheel events are only handled by the canvas by default. This avoids
-    /// the default behavior of scrolling the page.
-    fn with_prevent_default(self, prevent_default: bool) -> Self;
-
-    /// Whether the canvas should be focusable using the tab key. This is necessary to capture
-    /// canvas keyboard events.
-    fn with_focusable(self, focusable: bool) -> Self;
-}
-
-impl WindowBuilderExtWebSys for WindowBuilder {
-    fn with_canvas(mut self, canvas: Option<HtmlCanvasElement>) -> Self {
-        self.platform_specific.canvas = canvas;
-
-        self
-    }
-
-    fn with_prevent_default(mut self, prevent_default: bool) -> Self {
-        self.platform_specific.prevent_default = prevent_default;
-
-        self
-    }
-
-    fn with_focusable(mut self, focusable: bool) -> Self {
-        self.platform_specific.focusable = focusable;
-
-        self
-    }
-}
-
-/// Additional methods on `EventLoop` that are specific to the web.
-pub trait EventLoopExtWebSys {
-    /// A type provided by the user that can be passed through `Event::UserEvent`.
-    type UserEvent;
-
-    /// Initializes the winit event loop.
-    ///
-    /// Unlike `run`, this returns immediately, and doesn't throw an exception in order to
-    /// satisfy its `!` return type.
-    fn spawn<F>(self, event_handler: F)
-    where
-        F: 'static
-            + FnMut(
-                Event<'_, Self::UserEvent>,
-                &EventLoopWindowTarget<Self::UserEvent>,
-                &mut ControlFlow,
-            );
-}
-
-impl<T> EventLoopExtWebSys for EventLoop<T> {
-    type UserEvent = T;
-
-    fn spawn<F>(self, event_handler: F)
-    where
-        F: 'static
-            + FnMut(
-                Event<'_, Self::UserEvent>,
-                &EventLoopWindowTarget<Self::UserEvent>,
-                &mut ControlFlow,
-            ),
-    {
-        self.event_loop.spawn(event_handler)
-    }
-}

src/platform/x11.rs

@@ -1,233 +0,0 @@
-use std::os::raw;
-use std::ptr;
-
-use crate::{
-    event_loop::{EventLoopBuilder, EventLoopWindowTarget},
-    monitor::MonitorHandle,
-    window::{Window, WindowBuilder},
-};
-
-use crate::dpi::Size;
-use crate::platform_impl::{
-    x11::ffi::XVisualInfo, ApplicationName, Backend, Window as LinuxWindow, XLIB_ERROR_HOOKS,
-};
-
-pub use crate::platform_impl::{x11::util::WindowType as XWindowType, XNotSupported};
-
-/// The first argument in the provided hook will be the pointer to `XDisplay`
-/// and the second one the pointer to [`XErrorEvent`]. The returned `bool` is an
-/// indicator whether the error was handled by the callback.
-///
-/// [`XErrorEvent`]: https://linux.die.net/man/3/xerrorevent
-pub type XlibErrorHook =
-    Box<dyn Fn(*mut std::ffi::c_void, *mut std::ffi::c_void) -> bool + Send + Sync>;
-
-/// Hook to winit's xlib error handling callback.
-///
-/// This method is provided as a safe way to handle the errors comming from X11
-/// when using xlib in external crates, like glutin for GLX access. Trying to
-/// handle errors by speculating with `XSetErrorHandler` is [`unsafe`].
-///
-/// **Be aware that your hook is always invoked and returning `true` from it will
-/// prevent `winit` from getting the error itself. It's wise to always return
-/// `false` if you're not initiated the `Sync`.**
-///
-/// [`unsafe`]: https://www.remlab.net/op/xlib.shtml
-#[inline]
-pub fn register_xlib_error_hook(hook: XlibErrorHook) {
-    // Append new hook.
-    unsafe {
-        XLIB_ERROR_HOOKS.lock().unwrap().push(hook);
-    }
-}
-
-/// Additional methods on [`EventLoopWindowTarget`] that are specific to X11.
-pub trait EventLoopWindowTargetExtX11 {
-    /// True if the [`EventLoopWindowTarget`] uses X11.
-    fn is_x11(&self) -> bool;
-}
-
-impl<T> EventLoopWindowTargetExtX11 for EventLoopWindowTarget<T> {
-    #[inline]
-    fn is_x11(&self) -> bool {
-        !self.p.is_wayland()
-    }
-}
-
-/// Additional methods on [`EventLoopBuilder`] that are specific to X11.
-pub trait EventLoopBuilderExtX11 {
-    /// Force using X11.
-    fn with_x11(&mut self) -> &mut Self;
-
-    /// Whether to allow the event loop to be created off of the main thread.
-    ///
-    /// By default, the window is only allowed to be created on the main
-    /// thread, to make platform compatibility easier.
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self;
-}
-
-impl<T> EventLoopBuilderExtX11 for EventLoopBuilder<T> {
-    #[inline]
-    fn with_x11(&mut self) -> &mut Self {
-        self.platform_specific.forced_backend = Some(Backend::X);
-        self
-    }
-
-    #[inline]
-    fn with_any_thread(&mut self, any_thread: bool) -> &mut Self {
-        self.platform_specific.any_thread = any_thread;
-        self
-    }
-}
-
-/// Additional methods on [`Window`] that are specific to X11.
-pub trait WindowExtX11 {
-    /// Returns the ID of the [`Window`] xlib object that is used by this window.
-    ///
-    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
-    fn xlib_window(&self) -> Option<raw::c_ulong>;
-
-    /// Returns a pointer to the `Display` object of xlib that is used by this window.
-    ///
-    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
-    ///
-    /// The pointer will become invalid when the [`Window`] is destroyed.
-    fn xlib_display(&self) -> Option<*mut raw::c_void>;
-
-    fn xlib_screen_id(&self) -> Option<raw::c_int>;
-
-    /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
-    ///
-    /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
-    ///
-    /// The pointer will become invalid when the [`Window`] is destroyed.
-    fn xcb_connection(&self) -> Option<*mut raw::c_void>;
-}
-
-impl WindowExtX11 for Window {
-    #[inline]
-    fn xlib_window(&self) -> Option<raw::c_ulong> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_window()),
-            #[cfg(wayland_platform)]
-            _ => None,
-        }
-    }
-
-    #[inline]
-    fn xlib_display(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_display()),
-            #[cfg(wayland_platform)]
-            _ => None,
-        }
-    }
-
-    #[inline]
-    fn xlib_screen_id(&self) -> Option<raw::c_int> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.xlib_screen_id()),
-            #[cfg(wayland_platform)]
-            _ => None,
-        }
-    }
-
-    #[inline]
-    fn xcb_connection(&self) -> Option<*mut raw::c_void> {
-        match self.window {
-            LinuxWindow::X(ref w) => Some(w.xcb_connection()),
-            #[cfg(wayland_platform)]
-            _ => None,
-        }
-    }
-}
-
-/// Additional methods on [`WindowBuilder`] that are specific to X11.
-pub trait WindowBuilderExtX11 {
-    fn with_x11_visual<T>(self, visual_infos: *const T) -> Self;
-
-    fn with_x11_screen(self, screen_id: i32) -> Self;
-
-    /// Build window with the given `general` and `instance` names.
-    ///
-    /// The `general` sets general class of `WM_CLASS(STRING)`, while `instance` set the
-    /// instance part of it. The resulted property looks like `WM_CLASS(STRING) = "general", "instance"`.
-    ///
-    /// For details about application ID conventions, see the
-    /// [Desktop Entry Spec](https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id)
-    fn with_name(self, general: impl Into<String>, instance: impl Into<String>) -> Self;
-
-    /// Build window with override-redirect flag; defaults to false. Only relevant on X11.
-    fn with_override_redirect(self, override_redirect: bool) -> Self;
-
-    /// Build window with `_NET_WM_WINDOW_TYPE` hints; defaults to `Normal`. Only relevant on X11.
-    fn with_x11_window_type(self, x11_window_type: Vec<XWindowType>) -> Self;
-
-    /// Build window with base size hint. Only implemented on X11.
-    ///
-    /// ```
-    /// # use winit::dpi::{LogicalSize, PhysicalSize};
-    /// # use winit::window::WindowBuilder;
-    /// # use winit::platform::x11::WindowBuilderExtX11;
-    /// // Specify the size in logical dimensions like this:
-    /// WindowBuilder::new().with_base_size(LogicalSize::new(400.0, 200.0));
-    ///
-    /// // Or specify the size in physical dimensions like this:
-    /// WindowBuilder::new().with_base_size(PhysicalSize::new(400, 200));
-    /// ```
-    fn with_base_size<S: Into<Size>>(self, base_size: S) -> Self;
-}
-
-impl WindowBuilderExtX11 for WindowBuilder {
-    #[inline]
-    fn with_x11_visual<T>(mut self, visual_infos: *const T) -> Self {
-        {
-            self.platform_specific.visual_infos =
-                Some(unsafe { ptr::read(visual_infos as *const XVisualInfo) });
-        }
-        self
-    }
-
-    #[inline]
-    fn with_x11_screen(mut self, screen_id: i32) -> Self {
-        self.platform_specific.screen_id = Some(screen_id);
-        self
-    }
-
-    #[inline]
-    fn with_name(mut self, general: impl Into<String>, instance: impl Into<String>) -> Self {
-        self.platform_specific.name = Some(ApplicationName::new(general.into(), instance.into()));
-        self
-    }
-
-    #[inline]
-    fn with_override_redirect(mut self, override_redirect: bool) -> Self {
-        self.platform_specific.override_redirect = override_redirect;
-        self
-    }
-
-    #[inline]
-    fn with_x11_window_type(mut self, x11_window_types: Vec<XWindowType>) -> Self {
-        self.platform_specific.x11_window_types = x11_window_types;
-        self
-    }
-
-    #[inline]
-    fn with_base_size<S: Into<Size>>(mut self, base_size: S) -> Self {
-        self.platform_specific.base_size = Some(base_size.into());
-        self
-    }
-}
-
-/// Additional methods on `MonitorHandle` that are specific to X11.
-pub trait MonitorHandleExtX11 {
-    /// Returns the inner identifier of the monitor.
-    fn native_id(&self) -> u32;
-}
-
-impl MonitorHandleExtX11 for MonitorHandle {
-    #[inline]
-    fn native_id(&self) -> u32 {
-        self.inner.native_identifier()
-    }
-}

src/platform_impl/ios/monitor.rs

@@ -1,246 +0,0 @@
-#![allow(clippy::unnecessary_cast)]
-
-use std::{
-    collections::{BTreeSet, VecDeque},
-    fmt,
-    ops::{Deref, DerefMut},
-};
-
-use objc2::foundation::{MainThreadMarker, NSInteger};
-use objc2::rc::{Id, Shared};
-
-use super::uikit::{UIScreen, UIScreenMode};
-use crate::{
-    dpi::{PhysicalPosition, PhysicalSize},
-    monitor::VideoMode as RootVideoMode,
-    platform_impl::platform::app_state,
-};
-
-// TODO(madsmtm): Remove or refactor this
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub(crate) struct ScreenModeSendSync(pub(crate) Id<UIScreenMode, Shared>);
-
-unsafe impl Send for ScreenModeSendSync {}
-unsafe impl Sync for ScreenModeSendSync {}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub struct VideoMode {
-    pub(crate) size: (u32, u32),
-    pub(crate) bit_depth: u16,
-    pub(crate) refresh_rate_millihertz: u32,
-    pub(crate) screen_mode: ScreenModeSendSync,
-    pub(crate) monitor: MonitorHandle,
-}
-
-impl VideoMode {
-    fn new(uiscreen: Id<UIScreen, Shared>, screen_mode: Id<UIScreenMode, Shared>) -> VideoMode {
-        assert_main_thread!("`VideoMode` can only be created on the main thread on iOS");
-        let refresh_rate_millihertz = refresh_rate_millihertz(&uiscreen);
-        let size = screen_mode.size();
-        VideoMode {
-            size: (size.width as u32, size.height as u32),
-            bit_depth: 32,
-            refresh_rate_millihertz,
-            screen_mode: ScreenModeSendSync(screen_mode),
-            monitor: MonitorHandle::new(uiscreen),
-        }
-    }
-
-    pub fn size(&self) -> PhysicalSize<u32> {
-        self.size.into()
-    }
-
-    pub fn bit_depth(&self) -> u16 {
-        self.bit_depth
-    }
-
-    pub fn refresh_rate_millihertz(&self) -> u32 {
-        self.refresh_rate_millihertz
-    }
-
-    pub fn monitor(&self) -> MonitorHandle {
-        self.monitor.clone()
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct Inner {
-    uiscreen: Id<UIScreen, Shared>,
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct MonitorHandle {
-    inner: Inner,
-}
-
-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 {
-        // TODO: Make a better ordering
-        (self as *const Self).cmp(&(other as *const Self))
-    }
-}
-
-impl Deref for MonitorHandle {
-    type Target = Inner;
-
-    fn deref(&self) -> &Inner {
-        assert_main_thread!("`MonitorHandle` methods can only be run on the main thread on iOS");
-        &self.inner
-    }
-}
-
-impl DerefMut for MonitorHandle {
-    fn deref_mut(&mut self) -> &mut Inner {
-        assert_main_thread!("`MonitorHandle` methods can only be run on the main thread on iOS");
-        &mut self.inner
-    }
-}
-
-unsafe impl Send for MonitorHandle {}
-unsafe impl Sync for MonitorHandle {}
-
-impl Drop for MonitorHandle {
-    fn drop(&mut self) {
-        assert_main_thread!("`MonitorHandle` can only be dropped on the main thread on iOS");
-    }
-}
-
-impl fmt::Debug for MonitorHandle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // TODO: Do this using the proper fmt API
-        #[derive(Debug)]
-        #[allow(dead_code)]
-        struct MonitorHandle {
-            name: Option<String>,
-            size: PhysicalSize<u32>,
-            position: PhysicalPosition<i32>,
-            scale_factor: f64,
-        }
-
-        let monitor_id_proxy = MonitorHandle {
-            name: self.name(),
-            size: self.size(),
-            position: self.position(),
-            scale_factor: self.scale_factor(),
-        };
-
-        monitor_id_proxy.fmt(f)
-    }
-}
-
-impl MonitorHandle {
-    pub(crate) fn new(uiscreen: Id<UIScreen, Shared>) -> Self {
-        assert_main_thread!("`MonitorHandle` can only be created on the main thread on iOS");
-        Self {
-            inner: Inner { uiscreen },
-        }
-    }
-}
-
-impl Inner {
-    pub fn name(&self) -> Option<String> {
-        let main = UIScreen::main(MainThreadMarker::new().unwrap());
-        if self.uiscreen == main {
-            Some("Primary".to_string())
-        } else if self.uiscreen == main.mirroredScreen() {
-            Some("Mirrored".to_string())
-        } else {
-            UIScreen::screens(MainThreadMarker::new().unwrap())
-                .iter()
-                .position(|rhs| rhs == &*self.uiscreen)
-                .map(|idx| idx.to_string())
-        }
-    }
-
-    pub fn size(&self) -> PhysicalSize<u32> {
-        let bounds = self.uiscreen.nativeBounds();
-        PhysicalSize::new(bounds.size.width as u32, bounds.size.height as u32)
-    }
-
-    pub fn position(&self) -> PhysicalPosition<i32> {
-        let bounds = self.uiscreen.nativeBounds();
-        (bounds.origin.x as f64, bounds.origin.y as f64).into()
-    }
-
-    pub fn scale_factor(&self) -> f64 {
-        self.uiscreen.nativeScale() as f64
-    }
-
-    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
-        Some(refresh_rate_millihertz(&self.uiscreen))
-    }
-
-    pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
-        // Use Ord impl of RootVideoMode
-        let modes: BTreeSet<_> = self
-            .uiscreen
-            .availableModes()
-            .into_iter()
-            .map(|mode| {
-                let mode: *const UIScreenMode = mode;
-                let mode = unsafe { Id::retain(mode as *mut UIScreenMode).unwrap() };
-
-                RootVideoMode {
-                    video_mode: VideoMode::new(self.uiscreen.clone(), mode),
-                }
-            })
-            .collect();
-
-        modes.into_iter().map(|mode| mode.video_mode)
-    }
-}
-
-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 {
-            uiscreen.maximumFramesPerSecond()
-        } else {
-            // https://developer.apple.com/library/archive/technotes/tn2460/_index.html
-            // https://en.wikipedia.org/wiki/IPad_Pro#Model_comparison
-            //
-            // All iOS devices support 60 fps, and on devices where `maximumFramesPerSecond` is not
-            // supported, they are all guaranteed to have 60hz refresh rates. This does not
-            // correctly handle external displays. ProMotion displays support 120fps, but they were
-            // introduced at the same time as the `maximumFramesPerSecond` API.
-            //
-            // FIXME: earlier OSs could calculate the refresh rate using
-            // `-[CADisplayLink duration]`.
-            os_capabilities.maximum_frames_per_second_err_msg("defaulting to 60 fps");
-            60
-        }
-    };
-
-    refresh_rate_millihertz as u32 * 1000
-}
-
-// MonitorHandleExtIOS
-impl Inner {
-    pub(crate) fn ui_screen(&self) -> &Id<UIScreen, Shared> {
-        &self.uiscreen
-    }
-
-    pub fn preferred_video_mode(&self) -> VideoMode {
-        VideoMode::new(
-            self.uiscreen.clone(),
-            self.uiscreen.preferredMode().unwrap(),
-        )
-    }
-}
-
-pub fn uiscreens(mtm: MainThreadMarker) -> VecDeque<MonitorHandle> {
-    UIScreen::screens(mtm)
-        .into_iter()
-        .map(|screen| {
-            let screen: *const UIScreen = screen;
-            let screen = unsafe { Id::retain(screen as *mut UIScreen).unwrap() };
-            MonitorHandle::new(screen)
-        })
-        .collect()
-}

src/platform_impl/ios/view.rs

@@ -1,535 +0,0 @@
-#![allow(clippy::unnecessary_cast)]
-
-use objc2::foundation::{CGFloat, CGRect, MainThreadMarker, NSObject, NSSet};
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Class;
-use objc2::{declare_class, extern_methods, msg_send, msg_send_id, ClassType};
-
-use super::uikit::{
-    UIApplication, UIDevice, UIEvent, UIForceTouchCapability, UIInterfaceOrientationMask,
-    UIResponder, UITouch, UITouchPhase, UITouchType, UITraitCollection, UIView, UIViewController,
-    UIWindow,
-};
-use super::window::WindowId;
-use crate::{
-    dpi::PhysicalPosition,
-    event::{DeviceId as RootDeviceId, Event, Force, Touch, TouchPhase, WindowEvent},
-    platform::ios::ValidOrientations,
-    platform_impl::platform::{
-        app_state,
-        event_loop::{EventProxy, EventWrapper},
-        ffi::{UIRectEdge, UIUserInterfaceIdiom},
-        window::PlatformSpecificWindowBuilderAttributes,
-        DeviceId, Fullscreen,
-    },
-    window::{WindowAttributes, WindowId as RootWindowId},
-};
-
-declare_class!(
-    pub(crate) struct WinitView {}
-
-    unsafe impl ClassType for WinitView {
-        #[inherits(UIResponder, NSObject)]
-        type Super = UIView;
-        const NAME: &'static str = "WinitUIView";
-    }
-
-    unsafe impl WinitView {
-        #[sel(drawRect:)]
-        fn draw_rect(&self, rect: CGRect) {
-            let window = self.window().unwrap();
-            unsafe {
-                app_state::handle_nonuser_events(
-                    std::iter::once(EventWrapper::StaticEvent(Event::RedrawRequested(
-                        RootWindowId(window.id()),
-                    )))
-                    .chain(std::iter::once(EventWrapper::StaticEvent(
-                        Event::RedrawEventsCleared,
-                    ))),
-                );
-            }
-            let _: () = unsafe { msg_send![super(self), drawRect: rect] };
-        }
-
-        #[sel(layoutSubviews)]
-        fn layout_subviews(&self) {
-            let _: () = unsafe { msg_send![super(self), layoutSubviews] };
-
-            let window = self.window().unwrap();
-            let window_bounds = window.bounds();
-            let screen = window.screen();
-            let screen_space = screen.coordinateSpace();
-            let screen_frame = self.convertRect_toCoordinateSpace(window_bounds, &screen_space);
-            let scale_factor = screen.scale();
-            let size = crate::dpi::LogicalSize {
-                width: screen_frame.size.width as f64,
-                height: screen_frame.size.height as f64,
-            }
-            .to_physical(scale_factor as f64);
-
-            // If the app is started in landscape, the view frame and window bounds can be mismatched.
-            // The view frame will be in portrait and the window bounds in landscape. So apply the
-            // window bounds to the view frame to make it consistent.
-            let view_frame = self.frame();
-            if view_frame != window_bounds {
-                self.setFrame(window_bounds);
-            }
-
-            unsafe {
-                app_state::handle_nonuser_event(EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: RootWindowId(window.id()),
-                    event: WindowEvent::Resized(size),
-                }));
-            }
-        }
-
-        #[sel(setContentScaleFactor:)]
-        fn set_content_scale_factor(&self, untrusted_scale_factor: CGFloat) {
-            let _: () =
-                unsafe { msg_send![super(self), setContentScaleFactor: untrusted_scale_factor] };
-
-            // `window` is null when `setContentScaleFactor` is invoked prior to `[UIWindow
-            // makeKeyAndVisible]` at window creation time (either manually or internally by
-            // UIKit when the `UIView` is first created), in which case we send no events here
-            let window = match self.window() {
-                Some(window) => window,
-                None => return,
-            };
-            // `setContentScaleFactor` may be called with a value of 0, which means "reset the
-            // content scale factor to a device-specific default value", so we can't use the
-            // parameter here. We can query the actual factor using the getter
-            let scale_factor = self.contentScaleFactor();
-            assert!(
-                !scale_factor.is_nan()
-                    && scale_factor.is_finite()
-                    && scale_factor.is_sign_positive()
-                    && scale_factor > 0.0,
-                "invalid scale_factor set on UIView",
-            );
-            let scale_factor = scale_factor as f64;
-            let bounds = self.bounds();
-            let screen = window.screen();
-            let screen_space = screen.coordinateSpace();
-            let screen_frame = self.convertRect_toCoordinateSpace(bounds, &screen_space);
-            let size = crate::dpi::LogicalSize {
-                width: screen_frame.size.width as _,
-                height: screen_frame.size.height as _,
-            };
-            let window_id = RootWindowId(window.id());
-            unsafe {
-                app_state::handle_nonuser_events(
-                    std::iter::once(EventWrapper::EventProxy(EventProxy::DpiChangedProxy {
-                        window,
-                        scale_factor,
-                        suggested_size: size,
-                    }))
-                    .chain(std::iter::once(EventWrapper::StaticEvent(
-                        Event::WindowEvent {
-                            window_id,
-                            event: WindowEvent::Resized(size.to_physical(scale_factor)),
-                        },
-                    ))),
-                );
-            }
-        }
-
-        #[sel(touchesBegan:withEvent:)]
-        fn touches_began(&self, touches: &NSSet<UITouch>, _event: Option<&UIEvent>) {
-            self.handle_touches(touches)
-        }
-
-        #[sel(touchesMoved:withEvent:)]
-        fn touches_moved(&self, touches: &NSSet<UITouch>, _event: Option<&UIEvent>) {
-            self.handle_touches(touches)
-        }
-
-        #[sel(touchesEnded:withEvent:)]
-        fn touches_ended(&self, touches: &NSSet<UITouch>, _event: Option<&UIEvent>) {
-            self.handle_touches(touches)
-        }
-
-        #[sel(touchesCancelled:withEvent:)]
-        fn touches_cancelled(&self, touches: &NSSet<UITouch>, _event: Option<&UIEvent>) {
-            self.handle_touches(touches)
-        }
-    }
-);
-
-extern_methods!(
-    #[allow(non_snake_case)]
-    unsafe impl WinitView {
-        fn window(&self) -> Option<Id<WinitUIWindow, Shared>> {
-            unsafe { msg_send_id![self, window] }
-        }
-
-        unsafe fn traitCollection(&self) -> Id<UITraitCollection, Shared> {
-            msg_send_id![self, traitCollection]
-        }
-
-        // TODO: Allow the user to customize this
-        #[sel(layerClass)]
-        pub(crate) fn layerClass() -> &'static Class;
-    }
-);
-
-impl WinitView {
-    pub(crate) fn new(
-        _mtm: MainThreadMarker,
-        _window_attributes: &WindowAttributes,
-        platform_attributes: &PlatformSpecificWindowBuilderAttributes,
-        frame: CGRect,
-    ) -> Id<Self, Shared> {
-        let this: Id<Self, Shared> =
-            unsafe { msg_send_id![msg_send_id![Self::class(), alloc], initWithFrame: frame] };
-
-        this.setMultipleTouchEnabled(true);
-
-        if let Some(scale_factor) = platform_attributes.scale_factor {
-            this.setContentScaleFactor(scale_factor as _);
-        }
-
-        this
-    }
-
-    fn handle_touches(&self, touches: &NSSet<UITouch>) {
-        let window = self.window().unwrap();
-        let uiscreen = window.screen();
-        let mut touch_events = Vec::new();
-        let os_supports_force = app_state::os_capabilities().force_touch;
-        for touch in touches {
-            let logical_location = touch.locationInView(None);
-            let touch_type = touch.type_();
-            let force = if os_supports_force {
-                let trait_collection = unsafe { self.traitCollection() };
-                let touch_capability = trait_collection.forceTouchCapability();
-                // Both the OS _and_ the device need to be checked for force touch support.
-                if touch_capability == UIForceTouchCapability::Available {
-                    let force = touch.force();
-                    let max_possible_force = touch.maximumPossibleForce();
-                    let altitude_angle: Option<f64> = if touch_type == UITouchType::Pencil {
-                        let angle = touch.altitudeAngle();
-                        Some(angle as _)
-                    } else {
-                        None
-                    };
-                    Some(Force::Calibrated {
-                        force: force as _,
-                        max_possible_force: max_possible_force as _,
-                        altitude_angle,
-                    })
-                } else {
-                    None
-                }
-            } else {
-                None
-            };
-            let touch_id = touch as *const UITouch as u64;
-            let phase = touch.phase();
-            let phase = match phase {
-                UITouchPhase::Began => TouchPhase::Started,
-                UITouchPhase::Moved => TouchPhase::Moved,
-                // 2 is UITouchPhase::Stationary and is not expected here
-                UITouchPhase::Ended => TouchPhase::Ended,
-                UITouchPhase::Cancelled => TouchPhase::Cancelled,
-                _ => panic!("unexpected touch phase: {:?}", phase as i32),
-            };
-
-            let physical_location = {
-                let scale_factor = self.contentScaleFactor();
-                PhysicalPosition::from_logical::<(f64, f64), f64>(
-                    (logical_location.x as _, logical_location.y as _),
-                    scale_factor as f64,
-                )
-            };
-            touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: RootWindowId(window.id()),
-                event: WindowEvent::Touch(Touch {
-                    device_id: RootDeviceId(DeviceId {
-                        uiscreen: Id::as_ptr(&uiscreen),
-                    }),
-                    id: touch_id,
-                    location: physical_location,
-                    force,
-                    phase,
-                }),
-            }));
-        }
-        unsafe {
-            app_state::handle_nonuser_events(touch_events);
-        }
-    }
-}
-
-declare_class!(
-    pub(crate) struct WinitViewController {
-        _prefers_status_bar_hidden: bool,
-        _prefers_home_indicator_auto_hidden: bool,
-        _supported_orientations: UIInterfaceOrientationMask,
-        _preferred_screen_edges_deferring_system_gestures: UIRectEdge,
-    }
-
-    unsafe impl ClassType for WinitViewController {
-        #[inherits(UIResponder, NSObject)]
-        type Super = UIViewController;
-        const NAME: &'static str = "WinitUIViewController";
-    }
-
-    unsafe impl WinitViewController {
-        #[sel(shouldAutorotate)]
-        fn should_autorotate(&self) -> bool {
-            true
-        }
-    }
-
-    unsafe impl WinitViewController {
-        #[sel(prefersStatusBarHidden)]
-        fn prefers_status_bar_hidden(&self) -> bool {
-            *self._prefers_status_bar_hidden
-        }
-
-        #[sel(setPrefersStatusBarHidden:)]
-        fn set_prefers_status_bar_hidden(&mut self, val: bool) {
-            *self._prefers_status_bar_hidden = val;
-            self.setNeedsStatusBarAppearanceUpdate();
-        }
-
-        #[sel(prefersHomeIndicatorAutoHidden)]
-        fn prefers_home_indicator_auto_hidden(&self) -> bool {
-            *self._prefers_home_indicator_auto_hidden
-        }
-
-        #[sel(setPrefersHomeIndicatorAutoHidden:)]
-        fn set_prefers_home_indicator_auto_hidden(&mut self, val: bool) {
-            *self._prefers_home_indicator_auto_hidden = val;
-            let os_capabilities = app_state::os_capabilities();
-            if os_capabilities.home_indicator_hidden {
-                self.setNeedsUpdateOfHomeIndicatorAutoHidden();
-            } else {
-                os_capabilities.home_indicator_hidden_err_msg("ignoring")
-            }
-        }
-
-        #[sel(supportedInterfaceOrientations)]
-        fn supported_orientations(&self) -> UIInterfaceOrientationMask {
-            *self._supported_orientations
-        }
-
-        #[sel(setSupportedInterfaceOrientations:)]
-        fn set_supported_orientations(&mut self, val: UIInterfaceOrientationMask) {
-            *self._supported_orientations = val;
-            UIViewController::attemptRotationToDeviceOrientation();
-        }
-
-        #[sel(preferredScreenEdgesDeferringSystemGestures)]
-        fn preferred_screen_edges_deferring_system_gestures(&self) -> UIRectEdge {
-            *self._preferred_screen_edges_deferring_system_gestures
-        }
-
-        #[sel(setPreferredScreenEdgesDeferringSystemGestures:)]
-        fn set_preferred_screen_edges_deferring_system_gestures(&mut self, val: UIRectEdge) {
-            *self._preferred_screen_edges_deferring_system_gestures = val;
-            let os_capabilities = app_state::os_capabilities();
-            if os_capabilities.defer_system_gestures {
-                self.setNeedsUpdateOfScreenEdgesDeferringSystemGestures();
-            } else {
-                os_capabilities.defer_system_gestures_err_msg("ignoring")
-            }
-        }
-    }
-);
-
-extern_methods!(
-    #[allow(non_snake_case)]
-    unsafe impl WinitViewController {
-        #[sel(setPrefersStatusBarHidden:)]
-        pub(crate) fn setPrefersStatusBarHidden(&self, flag: bool);
-
-        #[sel(setSupportedInterfaceOrientations:)]
-        pub(crate) fn setSupportedInterfaceOrientations(&self, val: UIInterfaceOrientationMask);
-
-        #[sel(setPrefersHomeIndicatorAutoHidden:)]
-        pub(crate) fn setPrefersHomeIndicatorAutoHidden(&self, val: bool);
-
-        #[sel(setPreferredScreenEdgesDeferringSystemGestures:)]
-        pub(crate) fn setPreferredScreenEdgesDeferringSystemGestures(&self, val: UIRectEdge);
-    }
-);
-
-impl WinitViewController {
-    pub(crate) fn set_supported_interface_orientations(
-        &self,
-        mtm: MainThreadMarker,
-        valid_orientations: ValidOrientations,
-    ) {
-        let mask = match (
-            valid_orientations,
-            UIDevice::current(mtm).userInterfaceIdiom(),
-        ) {
-            (ValidOrientations::LandscapeAndPortrait, UIUserInterfaceIdiom::Phone) => {
-                UIInterfaceOrientationMask::AllButUpsideDown
-            }
-            (ValidOrientations::LandscapeAndPortrait, _) => UIInterfaceOrientationMask::All,
-            (ValidOrientations::Landscape, _) => UIInterfaceOrientationMask::Landscape,
-            (ValidOrientations::Portrait, UIUserInterfaceIdiom::Phone) => {
-                UIInterfaceOrientationMask::Portrait
-            }
-            (ValidOrientations::Portrait, _) => {
-                UIInterfaceOrientationMask::Portrait
-                    | UIInterfaceOrientationMask::PortraitUpsideDown
-            }
-        };
-        self.setSupportedInterfaceOrientations(mask);
-    }
-
-    pub(crate) fn new(
-        mtm: MainThreadMarker,
-        _window_attributes: &WindowAttributes,
-        platform_attributes: &PlatformSpecificWindowBuilderAttributes,
-        view: &UIView,
-    ) -> Id<Self, Shared> {
-        let this: Id<Self, Shared> =
-            unsafe { msg_send_id![msg_send_id![Self::class(), alloc], init] };
-
-        this.setPrefersStatusBarHidden(platform_attributes.prefers_status_bar_hidden);
-
-        this.set_supported_interface_orientations(mtm, platform_attributes.valid_orientations);
-
-        this.setPrefersHomeIndicatorAutoHidden(platform_attributes.prefers_home_indicator_hidden);
-
-        this.setPreferredScreenEdgesDeferringSystemGestures(
-            platform_attributes
-                .preferred_screen_edges_deferring_system_gestures
-                .into(),
-        );
-
-        this.setView(Some(view));
-
-        this
-    }
-}
-
-declare_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct WinitUIWindow {}
-
-    unsafe impl ClassType for WinitUIWindow {
-        #[inherits(UIResponder, NSObject)]
-        type Super = UIWindow;
-    }
-
-    unsafe impl WinitUIWindow {
-        #[sel(becomeKeyWindow)]
-        fn become_key_window(&self) {
-            unsafe {
-                app_state::handle_nonuser_event(EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: RootWindowId(self.id()),
-                    event: WindowEvent::Focused(true),
-                }));
-            }
-            let _: () = unsafe { msg_send![super(self), becomeKeyWindow] };
-        }
-
-        #[sel(resignKeyWindow)]
-        fn resign_key_window(&self) {
-            unsafe {
-                app_state::handle_nonuser_event(EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: RootWindowId(self.id()),
-                    event: WindowEvent::Focused(false),
-                }));
-            }
-            let _: () = unsafe { msg_send![super(self), resignKeyWindow] };
-        }
-    }
-);
-
-impl WinitUIWindow {
-    pub(crate) fn new(
-        _mtm: MainThreadMarker,
-        window_attributes: &WindowAttributes,
-        _platform_attributes: &PlatformSpecificWindowBuilderAttributes,
-        frame: CGRect,
-        view_controller: &UIViewController,
-    ) -> Id<Self, Shared> {
-        let this: Id<Self, Shared> =
-            unsafe { msg_send_id![msg_send_id![Self::class(), alloc], initWithFrame: frame] };
-
-        this.setRootViewController(Some(view_controller));
-
-        match window_attributes.fullscreen.clone().map(Into::into) {
-            Some(Fullscreen::Exclusive(ref video_mode)) => {
-                let monitor = video_mode.monitor();
-                let screen = monitor.ui_screen();
-                screen.setCurrentMode(Some(&video_mode.screen_mode.0));
-                this.setScreen(screen);
-            }
-            Some(Fullscreen::Borderless(Some(ref monitor))) => {
-                let screen = monitor.ui_screen();
-                this.setScreen(screen);
-            }
-            _ => (),
-        }
-
-        this
-    }
-
-    pub(crate) fn id(&self) -> WindowId {
-        (self as *const Self as usize as u64).into()
-    }
-}
-
-declare_class!(
-    pub struct WinitApplicationDelegate {}
-
-    unsafe impl ClassType for WinitApplicationDelegate {
-        type Super = NSObject;
-    }
-
-    // UIApplicationDelegate protocol
-    unsafe impl WinitApplicationDelegate {
-        #[sel(application:didFinishLaunchingWithOptions:)]
-        fn did_finish_launching(&self, _application: &UIApplication, _: *mut NSObject) -> bool {
-            unsafe {
-                app_state::did_finish_launching();
-            }
-            true
-        }
-
-        #[sel(applicationDidBecomeActive:)]
-        fn did_become_active(&self, _application: &UIApplication) {
-            unsafe { app_state::handle_nonuser_event(EventWrapper::StaticEvent(Event::Resumed)) }
-        }
-
-        #[sel(applicationWillResignActive:)]
-        fn will_resign_active(&self, _application: &UIApplication) {
-            unsafe { app_state::handle_nonuser_event(EventWrapper::StaticEvent(Event::Suspended)) }
-        }
-
-        #[sel(applicationWillEnterForeground:)]
-        fn will_enter_foreground(&self, _application: &UIApplication) {}
-        #[sel(applicationDidEnterBackground:)]
-        fn did_enter_background(&self, _application: &UIApplication) {}
-
-        #[sel(applicationWillTerminate:)]
-        fn will_terminate(&self, application: &UIApplication) {
-            let mut events = Vec::new();
-            for window in application.windows().iter() {
-                if window.is_kind_of::<WinitUIWindow>() {
-                    // SAFETY: We just checked that the window is a `winit` window
-                    let window = unsafe {
-                        let ptr: *const UIWindow = window;
-                        let ptr: *const WinitUIWindow = ptr.cast();
-                        &*ptr
-                    };
-                    events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                        window_id: RootWindowId(window.id()),
-                        event: WindowEvent::Destroyed,
-                    }));
-                }
-            }
-            unsafe {
-                app_state::handle_nonuser_events(events);
-                app_state::terminated();
-            }
-        }
-    }
-);

src/platform_impl/linux/wayland/env.rs

@@ -1,183 +0,0 @@
-//! SCTK environment setup.
-
-use sctk::reexports::client::protocol::wl_compositor::WlCompositor;
-use sctk::reexports::client::protocol::wl_output::WlOutput;
-use sctk::reexports::protocols::unstable::xdg_shell::v6::client::zxdg_shell_v6::ZxdgShellV6;
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::protocols::unstable::xdg_decoration::v1::client::zxdg_decoration_manager_v1::ZxdgDecorationManagerV1;
-use sctk::reexports::client::protocol::wl_shell::WlShell;
-use sctk::reexports::client::protocol::wl_subcompositor::WlSubcompositor;
-use sctk::reexports::client::{Attached, DispatchData};
-use sctk::reexports::client::protocol::wl_shm::WlShm;
-use sctk::reexports::protocols::xdg_shell::client::xdg_wm_base::XdgWmBase;
-use sctk::reexports::protocols::unstable::relative_pointer::v1::client::zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_pointer_constraints_v1::ZwpPointerConstraintsV1;
-use sctk::reexports::protocols::unstable::text_input::v3::client::zwp_text_input_manager_v3::ZwpTextInputManagerV3;
-use sctk::reexports::protocols::staging::xdg_activation::v1::client::xdg_activation_v1::XdgActivationV1;
-use sctk::reexports::protocols::viewporter::client::wp_viewporter::WpViewporter;
-
-use sctk::environment::{Environment, SimpleGlobal};
-use sctk::output::{OutputHandler, OutputHandling, OutputInfo, OutputStatusListener};
-use sctk::seat::{SeatData, SeatHandler, SeatHandling, SeatListener};
-use sctk::shell::{Shell, ShellHandler, ShellHandling};
-use sctk::shm::ShmHandler;
-
-use crate::platform_impl::wayland::protocols::wp_fractional_scale_manager_v1::WpFractionalScaleManagerV1;
-
-/// Set of extra features that are supported by the compositor.
-#[derive(Debug, Clone, Copy)]
-pub struct WindowingFeatures {
-    pointer_constraints: bool,
-    xdg_activation: bool,
-}
-
-impl WindowingFeatures {
-    /// Create `WindowingFeatures` based on the presented interfaces.
-    pub fn new(env: &Environment<WinitEnv>) -> Self {
-        let pointer_constraints = env.get_global::<ZwpPointerConstraintsV1>().is_some();
-        let xdg_activation = env.get_global::<XdgActivationV1>().is_some();
-        Self {
-            pointer_constraints,
-            xdg_activation,
-        }
-    }
-
-    pub fn pointer_constraints(&self) -> bool {
-        self.pointer_constraints
-    }
-
-    pub fn xdg_activation(&self) -> bool {
-        self.xdg_activation
-    }
-}
-
-sctk::environment!(WinitEnv,
-    singles = [
-        WlShm => shm,
-        WlCompositor => compositor,
-        WlSubcompositor => subcompositor,
-        WlShell => shell,
-        XdgWmBase => shell,
-        ZxdgShellV6 => shell,
-        ZxdgDecorationManagerV1 => decoration_manager,
-        ZwpRelativePointerManagerV1 => relative_pointer_manager,
-        ZwpPointerConstraintsV1 => pointer_constraints,
-        ZwpTextInputManagerV3 => text_input_manager,
-        XdgActivationV1 => xdg_activation,
-        WpFractionalScaleManagerV1 => fractional_scale_manager,
-        WpViewporter => viewporter,
-    ],
-    multis = [
-        WlSeat => seats,
-        WlOutput => outputs,
-    ]
-);
-
-/// The environment that we utilize.
-pub struct WinitEnv {
-    seats: SeatHandler,
-
-    outputs: OutputHandler,
-
-    shm: ShmHandler,
-
-    compositor: SimpleGlobal<WlCompositor>,
-
-    subcompositor: SimpleGlobal<WlSubcompositor>,
-
-    shell: ShellHandler,
-
-    relative_pointer_manager: SimpleGlobal<ZwpRelativePointerManagerV1>,
-
-    pointer_constraints: SimpleGlobal<ZwpPointerConstraintsV1>,
-
-    text_input_manager: SimpleGlobal<ZwpTextInputManagerV3>,
-
-    decoration_manager: SimpleGlobal<ZxdgDecorationManagerV1>,
-
-    xdg_activation: SimpleGlobal<XdgActivationV1>,
-
-    fractional_scale_manager: SimpleGlobal<WpFractionalScaleManagerV1>,
-
-    viewporter: SimpleGlobal<WpViewporter>,
-}
-
-impl WinitEnv {
-    pub fn new() -> Self {
-        // Output tracking for available_monitors, etc.
-        let outputs = OutputHandler::new();
-
-        // Keyboard/Pointer/Touch input.
-        let seats = SeatHandler::new();
-
-        // Essential globals.
-        let shm = ShmHandler::new();
-        let compositor = SimpleGlobal::new();
-        let subcompositor = SimpleGlobal::new();
-
-        // Gracefully handle shell picking, since SCTK automatically supports multiple
-        // backends.
-        let shell = ShellHandler::new();
-
-        // Server side decorations.
-        let decoration_manager = SimpleGlobal::new();
-
-        // Device events for pointer.
-        let relative_pointer_manager = SimpleGlobal::new();
-
-        // Pointer grab functionality.
-        let pointer_constraints = SimpleGlobal::new();
-
-        // IME handling.
-        let text_input_manager = SimpleGlobal::new();
-
-        // Surface activation.
-        let xdg_activation = SimpleGlobal::new();
-
-        // Fractional surface scaling.
-        let fractional_scale_manager = SimpleGlobal::new();
-
-        // Surface resizing (used for fractional scaling).
-        let viewporter = SimpleGlobal::new();
-
-        Self {
-            seats,
-            outputs,
-            shm,
-            compositor,
-            subcompositor,
-            shell,
-            decoration_manager,
-            relative_pointer_manager,
-            pointer_constraints,
-            text_input_manager,
-            xdg_activation,
-            fractional_scale_manager,
-            viewporter,
-        }
-    }
-}
-
-impl ShellHandling for WinitEnv {
-    fn get_shell(&self) -> Option<Shell> {
-        self.shell.get_shell()
-    }
-}
-
-impl SeatHandling for WinitEnv {
-    fn listen<F: FnMut(Attached<WlSeat>, &SeatData, DispatchData<'_>) + 'static>(
-        &mut self,
-        f: F,
-    ) -> SeatListener {
-        self.seats.listen(f)
-    }
-}
-
-impl OutputHandling for WinitEnv {
-    fn listen<F: FnMut(WlOutput, &OutputInfo, DispatchData<'_>) + 'static>(
-        &mut self,
-        f: F,
-    ) -> OutputStatusListener {
-        self.outputs.listen(f)
-    }
-}

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

@@ -1,601 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::error::Error;
-use std::io::Result as IOResult;
-use std::mem;
-use std::process;
-use std::rc::Rc;
-use std::time::{Duration, Instant};
-
-use raw_window_handle::{RawDisplayHandle, WaylandDisplayHandle};
-
-use sctk::reexports::client::protocol::wl_compositor::WlCompositor;
-use sctk::reexports::client::protocol::wl_shm::WlShm;
-use sctk::reexports::client::Display;
-
-use sctk::reexports::calloop;
-
-use sctk::environment::Environment;
-use sctk::seat::pointer::{ThemeManager, ThemeSpec};
-use sctk::WaylandSource;
-
-use crate::event::{Event, StartCause, WindowEvent};
-use crate::event_loop::{ControlFlow, EventLoopWindowTarget as RootEventLoopWindowTarget};
-use crate::platform_impl::platform::sticky_exit_callback;
-use crate::platform_impl::EventLoopWindowTarget as PlatformEventLoopWindowTarget;
-
-use super::env::{WindowingFeatures, WinitEnv};
-use super::output::OutputManager;
-use super::seat::SeatManager;
-use super::window::shim::{self, WindowCompositorUpdate, WindowUserRequest};
-use super::{DeviceId, WindowId};
-
-mod proxy;
-mod sink;
-mod state;
-
-pub use proxy::EventLoopProxy;
-pub use sink::EventSink;
-pub use state::WinitState;
-
-type WinitDispatcher = calloop::Dispatcher<'static, WaylandSource, WinitState>;
-
-pub struct EventLoopWindowTarget<T> {
-    /// Wayland display.
-    pub display: Display,
-
-    /// Environment to handle object creation, etc.
-    pub env: Environment<WinitEnv>,
-
-    /// Event loop handle.
-    pub event_loop_handle: calloop::LoopHandle<'static, WinitState>,
-
-    /// Output manager.
-    pub output_manager: OutputManager,
-
-    /// State that we share across callbacks.
-    pub state: RefCell<WinitState>,
-
-    /// Dispatcher of Wayland events.
-    pub wayland_dispatcher: WinitDispatcher,
-
-    /// A proxy to wake up event loop.
-    pub event_loop_awakener: calloop::ping::Ping,
-
-    /// The available windowing features.
-    pub windowing_features: WindowingFeatures,
-
-    /// Theme manager to manage cursors.
-    ///
-    /// It's being shared between all windows to avoid loading
-    /// multiple similar themes.
-    pub theme_manager: ThemeManager,
-
-    _marker: std::marker::PhantomData<T>,
-}
-
-impl<T> EventLoopWindowTarget<T> {
-    pub fn raw_display_handle(&self) -> RawDisplayHandle {
-        let mut display_handle = WaylandDisplayHandle::empty();
-        display_handle.display = self.display.get_display_ptr() as *mut _;
-        RawDisplayHandle::Wayland(display_handle)
-    }
-}
-
-pub struct EventLoop<T: 'static> {
-    /// Dispatcher of Wayland events.
-    pub wayland_dispatcher: WinitDispatcher,
-
-    /// Event loop.
-    event_loop: calloop::EventLoop<'static, WinitState>,
-
-    /// Wayland display.
-    display: Display,
-
-    /// Pending user events.
-    pending_user_events: Rc<RefCell<Vec<T>>>,
-
-    /// Sender of user events.
-    user_events_sender: calloop::channel::Sender<T>,
-
-    /// Window target.
-    window_target: RootEventLoopWindowTarget<T>,
-
-    /// Output manager.
-    _seat_manager: SeatManager,
-}
-
-impl<T: 'static> EventLoop<T> {
-    pub fn new() -> Result<EventLoop<T>, Box<dyn Error>> {
-        // Connect to wayland server and setup event queue.
-        let display = Display::connect_to_env()?;
-        let mut event_queue = display.create_event_queue();
-        let display_proxy = display.attach(event_queue.token());
-
-        // Setup environment.
-        let env = Environment::new(&display_proxy, &mut event_queue, WinitEnv::new())?;
-
-        // Create event loop.
-        let event_loop = calloop::EventLoop::<'static, WinitState>::try_new()?;
-        // Build windowing features.
-        let windowing_features = WindowingFeatures::new(&env);
-
-        // Create a theme manager.
-        let compositor = env.require_global::<WlCompositor>();
-        let shm = env.require_global::<WlShm>();
-        let theme_manager = ThemeManager::init(ThemeSpec::System, compositor, shm);
-
-        // Setup theme seat and output managers.
-        let seat_manager = SeatManager::new(&env, event_loop.handle(), theme_manager.clone());
-        let output_manager = OutputManager::new(&env);
-
-        // A source of events that we plug into our event loop.
-        let wayland_source = WaylandSource::new(event_queue);
-        let wayland_dispatcher =
-            calloop::Dispatcher::new(wayland_source, |_, queue, winit_state| {
-                queue.dispatch_pending(winit_state, |event, object, _| {
-                    panic!(
-                        "[calloop] Encountered an orphan event: {}@{} : {}",
-                        event.interface,
-                        object.as_ref().id(),
-                        event.name
-                    );
-                })
-            });
-
-        let _wayland_source_dispatcher = event_loop
-            .handle()
-            .register_dispatcher(wayland_dispatcher.clone())?;
-
-        // A source of user events.
-        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();
-
-        // User events channel.
-        event_loop
-            .handle()
-            .insert_source(user_events_channel, move |event, _, _| {
-                if let calloop::channel::Event::Msg(msg) = event {
-                    pending_user_events_clone.borrow_mut().push(msg);
-                }
-            })?;
-
-        // An event's loop awakener to wake up for window events from winit's windows.
-        let (event_loop_awakener, event_loop_awakener_source) = calloop::ping::make_ping()?;
-
-        // Handler of window requests.
-        event_loop
-            .handle()
-            .insert_source(event_loop_awakener_source, move |_, _, state| {
-                // Drain events here as well to account for application doing batch event processing
-                // on RedrawEventsCleared.
-                shim::handle_window_requests(state);
-            })?;
-
-        let event_loop_handle = event_loop.handle();
-        let window_map = HashMap::new();
-        let event_sink = EventSink::new();
-        let window_user_requests = HashMap::new();
-        let window_compositor_updates = HashMap::new();
-
-        // Create event loop window target.
-        let event_loop_window_target = EventLoopWindowTarget {
-            display: display.clone(),
-            env,
-            state: RefCell::new(WinitState {
-                window_map,
-                event_sink,
-                window_user_requests,
-                window_compositor_updates,
-            }),
-            event_loop_handle,
-            output_manager,
-            event_loop_awakener,
-            wayland_dispatcher: wayland_dispatcher.clone(),
-            windowing_features,
-            theme_manager,
-            _marker: std::marker::PhantomData,
-        };
-
-        // Create event loop itself.
-        let event_loop = Self {
-            event_loop,
-            display,
-            pending_user_events,
-            wayland_dispatcher,
-            _seat_manager: seat_manager,
-            user_events_sender,
-            window_target: RootEventLoopWindowTarget {
-                p: PlatformEventLoopWindowTarget::Wayland(event_loop_window_target),
-                _marker: std::marker::PhantomData,
-            },
-        };
-
-        Ok(event_loop)
-    }
-
-    pub fn run<F>(mut self, callback: F) -> !
-    where
-        F: FnMut(Event<'_, T>, &RootEventLoopWindowTarget<T>, &mut ControlFlow) + 'static,
-    {
-        let exit_code = self.run_return(callback);
-        process::exit(exit_code);
-    }
-
-    pub fn run_return<F>(&mut self, mut callback: F) -> i32
-    where
-        F: FnMut(Event<'_, T>, &RootEventLoopWindowTarget<T>, &mut ControlFlow),
-    {
-        let mut control_flow = ControlFlow::Poll;
-        let pending_user_events = self.pending_user_events.clone();
-
-        callback(
-            Event::NewEvents(StartCause::Init),
-            &self.window_target,
-            &mut control_flow,
-        );
-
-        // NB: For consistency all platforms must emit a 'resumed' event even though Wayland
-        // applications don't themselves have a formal suspend/resume lifecycle.
-        callback(Event::Resumed, &self.window_target, &mut control_flow);
-
-        let mut window_compositor_updates: Vec<(WindowId, WindowCompositorUpdate)> = Vec::new();
-        let mut window_user_requests: Vec<(WindowId, WindowUserRequest)> = Vec::new();
-        let mut event_sink_back_buffer = Vec::new();
-
-        // NOTE We break on errors from dispatches, since if we've got protocol error
-        // libwayland-client/wayland-rs will inform us anyway, but crashing downstream is not
-        // really an option. Instead we inform that the event loop got destroyed. We may
-        // communicate an error that something was terminated, but winit doesn't provide us
-        // with an API to do that via some event.
-        // Still, we set the exit code to the error's OS error code, or to 1 if not possible.
-        let exit_code = loop {
-            // Send pending events to the server.
-            let _ = self.display.flush();
-
-            // During the run of the user callback, some other code monitoring and reading the
-            // Wayland socket may have been run (mesa for example does this with vsync), if that
-            // is the case, some events may have been enqueued in our event queue.
-            //
-            // If some messages are there, the event loop needs to behave as if it was instantly
-            // woken up by messages arriving from the Wayland socket, to avoid delaying the
-            // dispatch of these events until we're woken up again.
-            let instant_wakeup = {
-                let mut wayland_source = self.wayland_dispatcher.as_source_mut();
-                let queue = wayland_source.queue();
-                let state = match &mut self.window_target.p {
-                    PlatformEventLoopWindowTarget::Wayland(window_target) => {
-                        window_target.state.get_mut()
-                    }
-                    #[cfg(x11_platform)]
-                    _ => unreachable!(),
-                };
-
-                match queue.dispatch_pending(state, |_, _, _| unimplemented!()) {
-                    Ok(dispatched) => dispatched > 0,
-                    Err(error) => break error.raw_os_error().unwrap_or(1),
-                }
-            };
-
-            match control_flow {
-                ControlFlow::ExitWithCode(code) => break code,
-                ControlFlow::Poll => {
-                    // Non-blocking dispatch.
-                    let timeout = Duration::from_millis(0);
-                    if let Err(error) = self.loop_dispatch(Some(timeout)) {
-                        break error.raw_os_error().unwrap_or(1);
-                    }
-
-                    callback(
-                        Event::NewEvents(StartCause::Poll),
-                        &self.window_target,
-                        &mut control_flow,
-                    );
-                }
-                ControlFlow::Wait => {
-                    let timeout = if instant_wakeup {
-                        Some(Duration::from_millis(0))
-                    } else {
-                        None
-                    };
-
-                    if let Err(error) = self.loop_dispatch(timeout) {
-                        break error.raw_os_error().unwrap_or(1);
-                    }
-
-                    callback(
-                        Event::NewEvents(StartCause::WaitCancelled {
-                            start: Instant::now(),
-                            requested_resume: None,
-                        }),
-                        &self.window_target,
-                        &mut control_flow,
-                    );
-                }
-                ControlFlow::WaitUntil(deadline) => {
-                    let start = Instant::now();
-
-                    // Compute the amount of time we'll block for.
-                    let duration = if deadline > start && !instant_wakeup {
-                        deadline - start
-                    } else {
-                        Duration::from_millis(0)
-                    };
-
-                    if let Err(error) = self.loop_dispatch(Some(duration)) {
-                        break error.raw_os_error().unwrap_or(1);
-                    }
-
-                    let now = Instant::now();
-
-                    if now < deadline {
-                        callback(
-                            Event::NewEvents(StartCause::WaitCancelled {
-                                start,
-                                requested_resume: Some(deadline),
-                            }),
-                            &self.window_target,
-                            &mut control_flow,
-                        )
-                    } else {
-                        callback(
-                            Event::NewEvents(StartCause::ResumeTimeReached {
-                                start,
-                                requested_resume: deadline,
-                            }),
-                            &self.window_target,
-                            &mut control_flow,
-                        )
-                    }
-                }
-            }
-
-            // 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 pending_user_events.borrow_mut().drain(..) {
-                sticky_exit_callback(
-                    Event::UserEvent(user_event),
-                    &self.window_target,
-                    &mut control_flow,
-                    &mut callback,
-                );
-            }
-
-            // Process 'new' pending updates from compositor.
-            self.with_state(|state| {
-                window_compositor_updates.clear();
-                window_compositor_updates.extend(
-                    state
-                        .window_compositor_updates
-                        .iter_mut()
-                        .map(|(wid, window_update)| (*wid, mem::take(window_update))),
-                );
-            });
-
-            for (window_id, window_compositor_update) in window_compositor_updates.iter_mut() {
-                if let Some(scale_factor) = window_compositor_update.scale_factor {
-                    let mut physical_size = self.with_state(|state| {
-                        let window_handle = state.window_map.get(window_id).unwrap();
-                        *window_handle.scale_factor.lock().unwrap() = scale_factor;
-
-                        let mut size = window_handle.size.lock().unwrap();
-
-                        // Update the new logical size if it was changed.
-                        let window_size = window_compositor_update.size.unwrap_or(*size);
-                        *size = window_size;
-
-                        window_size.to_physical(scale_factor)
-                    });
-
-                    sticky_exit_callback(
-                        Event::WindowEvent {
-                            window_id: crate::window::WindowId(*window_id),
-                            event: WindowEvent::ScaleFactorChanged {
-                                scale_factor,
-                                new_inner_size: &mut physical_size,
-                            },
-                        },
-                        &self.window_target,
-                        &mut control_flow,
-                        &mut callback,
-                    );
-
-                    // We don't update size on a window handle since we'll do that later
-                    // when handling size update.
-                    let new_logical_size = physical_size.to_logical(scale_factor);
-                    window_compositor_update.size = Some(new_logical_size);
-                }
-
-                if let Some(size) = window_compositor_update.size.take() {
-                    let physical_size = self.with_state(|state| {
-                        let window_handle = state.window_map.get_mut(window_id).unwrap();
-
-                        if let Some(fs_state) = window_handle.fractional_scaling_state.as_ref() {
-                            // If we have a viewport then we support fractional scaling. As per the
-                            // protocol, we have to set the viewport size of the size prior scaling.
-                            fs_state
-                                .viewport
-                                .set_destination(size.width as _, size.height as _);
-                        }
-
-                        let mut window_size = window_handle.size.lock().unwrap();
-
-                        // Always issue resize event on scale factor change.
-                        let physical_size = if window_compositor_update.scale_factor.is_none()
-                            && *window_size == size
-                        {
-                            // The size hasn't changed, don't inform downstream about that.
-                            None
-                        } else {
-                            *window_size = size;
-                            let scale_factor = window_handle.scale_factor();
-                            let physical_size = size.to_physical(scale_factor);
-                            Some(physical_size)
-                        };
-
-                        // We still perform all of those resize related logic even if the size
-                        // hasn't changed, since GNOME relies on `set_geometry` calls after
-                        // configures.
-                        window_handle.window.resize(size.width, size.height);
-                        window_handle.window.refresh();
-
-                        // Update the opaque region.
-                        window_handle.set_transparent(window_handle.transparent.get());
-
-                        // Mark that refresh isn't required, since we've done it right now.
-                        state
-                            .window_user_requests
-                            .get_mut(window_id)
-                            .unwrap()
-                            .refresh_frame = false;
-
-                        // Queue redraw requested.
-                        state
-                            .window_user_requests
-                            .get_mut(window_id)
-                            .unwrap()
-                            .redraw_requested = true;
-
-                        physical_size
-                    });
-
-                    if let Some(physical_size) = physical_size {
-                        sticky_exit_callback(
-                            Event::WindowEvent {
-                                window_id: crate::window::WindowId(*window_id),
-                                event: WindowEvent::Resized(physical_size),
-                            },
-                            &self.window_target,
-                            &mut control_flow,
-                            &mut callback,
-                        );
-                    }
-                }
-
-                // If the close is requested, send it here.
-                if window_compositor_update.close_window {
-                    sticky_exit_callback(
-                        Event::WindowEvent {
-                            window_id: crate::window::WindowId(*window_id),
-                            event: WindowEvent::CloseRequested,
-                        },
-                        &self.window_target,
-                        &mut control_flow,
-                        &mut callback,
-                    );
-                }
-            }
-
-            // The purpose of the back buffer and that swap is to not hold borrow_mut when
-            // we're doing callback to the user, since we can double borrow if the user decides
-            // to create a window in one of those callbacks.
-            self.with_state(|state| {
-                std::mem::swap(
-                    &mut event_sink_back_buffer,
-                    &mut state.event_sink.window_events,
-                )
-            });
-
-            // Handle pending window events.
-            for event in event_sink_back_buffer.drain(..) {
-                let event = event.map_nonuser_event().unwrap();
-                sticky_exit_callback(event, &self.window_target, &mut control_flow, &mut callback);
-            }
-
-            // Send events cleared.
-            sticky_exit_callback(
-                Event::MainEventsCleared,
-                &self.window_target,
-                &mut control_flow,
-                &mut callback,
-            );
-
-            // Apply user requests, so every event required resize and latter surface commit will
-            // be applied right before drawing. This will also ensure that every `RedrawRequested`
-            // event will be delivered in time.
-            self.with_state(|state| {
-                shim::handle_window_requests(state);
-            });
-
-            // Process 'new' pending updates from compositor.
-            self.with_state(|state| {
-                window_user_requests.clear();
-                window_user_requests.extend(
-                    state
-                        .window_user_requests
-                        .iter_mut()
-                        .map(|(wid, window_request)| (*wid, mem::take(window_request))),
-                );
-            });
-
-            // Handle RedrawRequested events.
-            for (window_id, mut window_request) in window_user_requests.iter() {
-                // Handle refresh of the frame.
-                if window_request.refresh_frame {
-                    self.with_state(|state| {
-                        let window_handle = state.window_map.get_mut(window_id).unwrap();
-                        window_handle.window.refresh();
-                    });
-
-                    // In general refreshing the frame requires surface commit, those force user
-                    // to redraw.
-                    window_request.redraw_requested = true;
-                }
-
-                // Handle redraw request.
-                if window_request.redraw_requested {
-                    sticky_exit_callback(
-                        Event::RedrawRequested(crate::window::WindowId(*window_id)),
-                        &self.window_target,
-                        &mut control_flow,
-                        &mut callback,
-                    );
-                }
-            }
-
-            // Send RedrawEventCleared.
-            sticky_exit_callback(
-                Event::RedrawEventsCleared,
-                &self.window_target,
-                &mut control_flow,
-                &mut callback,
-            );
-        };
-
-        callback(Event::LoopDestroyed, &self.window_target, &mut control_flow);
-        exit_code
-    }
-
-    #[inline]
-    pub fn create_proxy(&self) -> EventLoopProxy<T> {
-        EventLoopProxy::new(self.user_events_sender.clone())
-    }
-
-    #[inline]
-    pub fn window_target(&self) -> &RootEventLoopWindowTarget<T> {
-        &self.window_target
-    }
-
-    fn with_state<U, F: FnOnce(&mut WinitState) -> U>(&mut self, f: F) -> U {
-        let state = match &mut self.window_target.p {
-            PlatformEventLoopWindowTarget::Wayland(window_target) => window_target.state.get_mut(),
-            #[cfg(x11_platform)]
-            _ => unreachable!(),
-        };
-
-        f(state)
-    }
-
-    fn loop_dispatch<D: Into<Option<std::time::Duration>>>(&mut self, timeout: D) -> IOResult<()> {
-        let state = match &mut self.window_target.p {
-            PlatformEventLoopWindowTarget::Wayland(window_target) => window_target.state.get_mut(),
-            #[cfg(x11_platform)]
-            _ => unreachable!(),
-        };
-
-        self.event_loop
-            .dispatch(timeout, state)
-            .map_err(|error| error.into())
-    }
-}

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

@@ -1,36 +0,0 @@
-//! An event loop's sink to deliver events from the Wayland event callbacks.
-
-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 window_events: Vec<Event<'static, ()>>,
-}
-
-impl EventSink {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Add new device event to a queue.
-    pub fn push_device_event(&mut self, event: DeviceEvent, device_id: DeviceId) {
-        self.window_events.push(Event::DeviceEvent {
-            event,
-            device_id: RootDeviceId(PlatformDeviceId::Wayland(device_id)),
-        });
-    }
-
-    /// Add new window event to a queue.
-    pub fn push_window_event(&mut self, event: WindowEvent<'static>, window_id: WindowId) {
-        self.window_events.push(Event::WindowEvent {
-            event,
-            window_id: RootWindowId(window_id),
-        });
-    }
-}

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

@@ -1,31 +0,0 @@
-//! A state that we pass around in a dispatch.
-
-use std::collections::HashMap;
-
-use super::EventSink;
-use crate::platform_impl::wayland::window::shim::{
-    WindowCompositorUpdate, WindowHandle, WindowUserRequest,
-};
-use crate::platform_impl::wayland::WindowId;
-
-/// Wrapper to carry winit's state.
-pub struct WinitState {
-    /// A sink for window and device events that is being filled during dispatching
-    /// event loop and forwarded downstream afterwards.
-    pub event_sink: EventSink,
-
-    /// Window updates comming from the user requests. Those are separatelly dispatched right after
-    /// `MainEventsCleared`.
-    pub window_user_requests: HashMap<WindowId, WindowUserRequest>,
-
-    /// Window updates, which are coming from SCTK or the compositor, which require
-    /// calling back to the winit's downstream. They are handled right in the event loop,
-    /// unlike the ones coming from buffers on the `WindowHandle`'s.
-    pub window_compositor_updates: HashMap<WindowId, WindowCompositorUpdate>,
-
-    /// Window map containing all SCTK windows. Since those windows aren't allowed
-    /// to be sent to other threads, they live on the event loop's thread
-    /// and requests from winit's windows are being forwarded to them either via
-    /// `WindowUpdate` or buffer on the associated with it `WindowHandle`.
-    pub window_map: HashMap<WindowId, WindowHandle>,
-}

src/platform_impl/linux/wayland/mod.rs

@@ -1,29 +0,0 @@
-#![cfg(wayland_platform)]
-
-use sctk::reexports::client::protocol::wl_surface::WlSurface;
-
-pub use crate::platform_impl::platform::WindowId;
-pub use event_loop::{EventLoop, EventLoopProxy, EventLoopWindowTarget};
-pub use output::{MonitorHandle, VideoMode};
-pub use window::Window;
-
-mod env;
-mod event_loop;
-mod output;
-mod protocols;
-mod seat;
-mod window;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId;
-
-impl DeviceId {
-    pub const unsafe fn dummy() -> Self {
-        DeviceId
-    }
-}
-
-#[inline]
-fn make_wid(surface: &WlSurface) -> WindowId {
-    WindowId(surface.as_ref().c_ptr() as u64)
-}

src/platform_impl/linux/wayland/output.rs

@@ -1,247 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::{Arc, Mutex};
-
-use sctk::reexports::client::protocol::wl_output::WlOutput;
-use sctk::reexports::client::Display;
-
-use sctk::environment::Environment;
-use sctk::output::OutputStatusListener;
-
-use crate::dpi::{PhysicalPosition, PhysicalSize};
-use crate::platform_impl::platform::{
-    MonitorHandle as PlatformMonitorHandle, VideoMode as PlatformVideoMode,
-};
-
-use super::env::WinitEnv;
-use super::event_loop::EventLoopWindowTarget;
-
-/// Output manager.
-pub struct OutputManager {
-    /// A handle that actually performs all operations on outputs.
-    handle: OutputManagerHandle,
-
-    _output_listener: OutputStatusListener,
-}
-
-impl OutputManager {
-    pub fn new(env: &Environment<WinitEnv>) -> Self {
-        let handle = OutputManagerHandle::new();
-
-        // Handle existing outputs.
-        for output in env.get_all_outputs() {
-            match sctk::output::with_output_info(&output, |info| info.obsolete) {
-                Some(false) => (),
-                // The output is obsolete or we've failed to access its data, skipping.
-                _ => continue,
-            }
-
-            // The output is present and unusable, add it to the output manager manager.
-            handle.add_output(output);
-        }
-
-        let handle_for_listener = handle.clone();
-
-        let output_listener = env.listen_for_outputs(move |output, info, _| {
-            if info.obsolete {
-                handle_for_listener.remove_output(output)
-            } else {
-                handle_for_listener.add_output(output)
-            }
-        });
-
-        Self {
-            handle,
-            _output_listener: output_listener,
-        }
-    }
-
-    pub fn handle(&self) -> OutputManagerHandle {
-        self.handle.clone()
-    }
-}
-
-/// A handle to output manager.
-#[derive(Debug, Clone)]
-pub struct OutputManagerHandle {
-    outputs: Arc<Mutex<VecDeque<MonitorHandle>>>,
-}
-
-impl OutputManagerHandle {
-    fn new() -> Self {
-        let outputs = Arc::new(Mutex::new(VecDeque::new()));
-        Self { outputs }
-    }
-
-    /// Handle addition of the output.
-    fn add_output(&self, output: WlOutput) {
-        let mut outputs = self.outputs.lock().unwrap();
-        let position = outputs.iter().position(|handle| handle.proxy == output);
-        if position.is_none() {
-            outputs.push_back(MonitorHandle::new(output));
-        }
-    }
-
-    /// Handle removal of the output.
-    fn remove_output(&self, output: WlOutput) {
-        let mut outputs = self.outputs.lock().unwrap();
-        let position = outputs.iter().position(|handle| handle.proxy == output);
-        if let Some(position) = position {
-            outputs.remove(position);
-        }
-    }
-
-    /// Get all observed outputs.
-    pub fn available_outputs(&self) -> VecDeque<MonitorHandle> {
-        self.outputs.lock().unwrap().clone()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct MonitorHandle {
-    pub(crate) proxy: WlOutput,
-}
-
-impl PartialEq for MonitorHandle {
-    fn eq(&self, other: &Self) -> bool {
-        self.native_identifier() == other.native_identifier()
-    }
-}
-
-impl Eq for MonitorHandle {}
-
-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 {
-        self.native_identifier().cmp(&other.native_identifier())
-    }
-}
-
-impl std::hash::Hash for MonitorHandle {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.native_identifier().hash(state);
-    }
-}
-
-impl MonitorHandle {
-    #[inline]
-    pub(crate) fn new(proxy: WlOutput) -> Self {
-        Self { proxy }
-    }
-
-    #[inline]
-    pub fn name(&self) -> Option<String> {
-        sctk::output::with_output_info(&self.proxy, |info| {
-            format!("{} ({})", info.model, info.make)
-        })
-    }
-
-    #[inline]
-    pub fn native_identifier(&self) -> u32 {
-        sctk::output::with_output_info(&self.proxy, |info| info.id).unwrap_or(0)
-    }
-
-    #[inline]
-    pub fn size(&self) -> PhysicalSize<u32> {
-        match sctk::output::with_output_info(&self.proxy, |info| {
-            info.modes
-                .iter()
-                .find(|mode| mode.is_current)
-                .map(|mode| mode.dimensions)
-        }) {
-            Some(Some((w, h))) => (w as u32, h as u32),
-            _ => (0, 0),
-        }
-        .into()
-    }
-
-    #[inline]
-    pub fn position(&self) -> PhysicalPosition<i32> {
-        sctk::output::with_output_info(&self.proxy, |info| info.location)
-            .unwrap_or((0, 0))
-            .into()
-    }
-
-    #[inline]
-    pub fn refresh_rate_millihertz(&self) -> Option<u32> {
-        sctk::output::with_output_info(&self.proxy, |info| {
-            info.modes
-                .iter()
-                .find_map(|mode| mode.is_current.then(|| mode.refresh_rate as u32))
-        })
-        .flatten()
-    }
-
-    #[inline]
-    pub fn scale_factor(&self) -> i32 {
-        sctk::output::with_output_info(&self.proxy, |info| info.scale_factor).unwrap_or(1)
-    }
-
-    #[inline]
-    pub fn video_modes(&self) -> impl Iterator<Item = PlatformVideoMode> {
-        let modes = sctk::output::with_output_info(&self.proxy, |info| info.modes.clone())
-            .unwrap_or_default();
-
-        let monitor = self.clone();
-
-        modes.into_iter().map(move |mode| {
-            PlatformVideoMode::Wayland(VideoMode {
-                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(),
-            })
-        })
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct VideoMode {
-    pub(crate) size: PhysicalSize<u32>,
-    pub(crate) bit_depth: u16,
-    pub(crate) refresh_rate_millihertz: u32,
-    pub(crate) monitor: MonitorHandle,
-}
-
-impl VideoMode {
-    #[inline]
-    pub fn size(&self) -> PhysicalSize<u32> {
-        self.size
-    }
-
-    #[inline]
-    pub fn bit_depth(&self) -> u16 {
-        self.bit_depth
-    }
-
-    #[inline]
-    pub fn refresh_rate_millihertz(&self) -> u32 {
-        self.refresh_rate_millihertz
-    }
-
-    pub fn monitor(&self) -> PlatformMonitorHandle {
-        PlatformMonitorHandle::Wayland(self.monitor.clone())
-    }
-}
-
-impl<T> EventLoopWindowTarget<T> {
-    #[inline]
-    pub fn display(&self) -> &Display {
-        &self.display
-    }
-
-    #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
-        self.output_manager.handle.available_outputs()
-    }
-
-    #[inline]
-    pub fn primary_monitor(&self) -> Option<PlatformMonitorHandle> {
-        // There's no primary monitor on Wayland.
-        None
-    }
-}

src/platform_impl/linux/wayland/protocols.rs

@@ -1,13 +0,0 @@
-#![allow(dead_code, non_camel_case_types, unused_unsafe, unused_variables)]
-#![allow(non_upper_case_globals, non_snake_case, unused_imports)]
-#![allow(missing_docs, clippy::all)]
-
-use wayland_client::protocol::wl_surface;
-use wayland_client::sys;
-use wayland_client::{AnonymousObject, Attached, Main, Proxy, ProxyMap};
-use wayland_commons::map::{Object, ObjectMetadata};
-use wayland_commons::smallvec;
-use wayland_commons::wire::{Argument, ArgumentType, Message, MessageDesc};
-use wayland_commons::{Interface, MessageGroup};
-
-include!(concat!(env!("OUT_DIR"), "/fractional_scale_v1.rs"));

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

@@ -1,159 +0,0 @@
-//! Handling of various keyboard events.
-
-use std::sync::atomic::Ordering;
-
-use sctk::reexports::client::protocol::wl_keyboard::KeyState;
-
-use sctk::seat::keyboard::Event as KeyboardEvent;
-
-use crate::event::{ElementState, KeyboardInput, ModifiersState, WindowEvent};
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::{self, DeviceId};
-
-use super::keymap;
-use super::KeyboardInner;
-
-#[inline]
-pub(super) fn handle_keyboard(
-    event: KeyboardEvent<'_>,
-    inner: &mut KeyboardInner,
-    winit_state: &mut WinitState,
-) {
-    let event_sink = &mut winit_state.event_sink;
-    match event {
-        KeyboardEvent::Enter { surface, .. } => {
-            let window_id = wayland::make_wid(&surface);
-
-            let window_handle = winit_state.window_map.get_mut(&window_id).unwrap();
-            window_handle.has_focus.store(true, Ordering::Relaxed);
-
-            // Window gained focus.
-            event_sink.push_window_event(WindowEvent::Focused(true), window_id);
-
-            // Dispatch modifers changes that we've received before getting `Enter` event.
-            if let Some(modifiers) = inner.pending_modifers_state.take() {
-                *inner.modifiers_state.borrow_mut() = modifiers;
-                event_sink.push_window_event(WindowEvent::ModifiersChanged(modifiers), window_id);
-            }
-
-            inner.target_window_id = Some(window_id);
-        }
-        KeyboardEvent::Leave { surface, .. } => {
-            let window_id = wayland::make_wid(&surface);
-
-            // Notify that no modifiers are being pressed.
-            if !inner.modifiers_state.borrow().is_empty() {
-                event_sink.push_window_event(
-                    WindowEvent::ModifiersChanged(ModifiersState::empty()),
-                    window_id,
-                );
-            }
-
-            let window_handle = winit_state.window_map.get_mut(&window_id).unwrap();
-            window_handle.has_focus.store(false, Ordering::Relaxed);
-
-            // Window lost focus.
-            event_sink.push_window_event(WindowEvent::Focused(false), window_id);
-
-            // Reset the id.
-            inner.target_window_id = None;
-        }
-        KeyboardEvent::Key {
-            rawkey,
-            keysym,
-            state,
-            utf8,
-            ..
-        } => {
-            let window_id = match inner.target_window_id {
-                Some(window_id) => window_id,
-                None => return,
-            };
-
-            let state = match state {
-                KeyState::Pressed => ElementState::Pressed,
-                KeyState::Released => ElementState::Released,
-                _ => unreachable!(),
-            };
-
-            let virtual_keycode = keymap::keysym_to_vkey(keysym);
-
-            event_sink.push_window_event(
-                #[allow(deprecated)]
-                WindowEvent::KeyboardInput {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    input: KeyboardInput {
-                        state,
-                        scancode: rawkey,
-                        virtual_keycode,
-                        modifiers: *inner.modifiers_state.borrow(),
-                    },
-                    is_synthetic: false,
-                },
-                window_id,
-            );
-
-            // Send ReceivedCharacter event only on ElementState::Pressed.
-            if ElementState::Released == state {
-                return;
-            }
-
-            if let Some(txt) = utf8 {
-                for ch in txt.chars() {
-                    event_sink.push_window_event(WindowEvent::ReceivedCharacter(ch), window_id);
-                }
-            }
-        }
-        KeyboardEvent::Repeat {
-            rawkey,
-            keysym,
-            utf8,
-            ..
-        } => {
-            let window_id = match inner.target_window_id {
-                Some(window_id) => window_id,
-                None => return,
-            };
-
-            let virtual_keycode = keymap::keysym_to_vkey(keysym);
-
-            event_sink.push_window_event(
-                #[allow(deprecated)]
-                WindowEvent::KeyboardInput {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    input: KeyboardInput {
-                        state: ElementState::Pressed,
-                        scancode: rawkey,
-                        virtual_keycode,
-                        modifiers: *inner.modifiers_state.borrow(),
-                    },
-                    is_synthetic: false,
-                },
-                window_id,
-            );
-
-            if let Some(txt) = utf8 {
-                for ch in txt.chars() {
-                    event_sink.push_window_event(WindowEvent::ReceivedCharacter(ch), window_id);
-                }
-            }
-        }
-        KeyboardEvent::Modifiers { modifiers } => {
-            let modifiers = ModifiersState::from(modifiers);
-            if let Some(window_id) = inner.target_window_id {
-                *inner.modifiers_state.borrow_mut() = modifiers;
-
-                event_sink.push_window_event(WindowEvent::ModifiersChanged(modifiers), window_id);
-            } else {
-                // Compositor must send modifiers after wl_keyboard::enter, however certain
-                // compositors are still sending it before, so stash such events and send
-                // them on wl_keyboard::enter.
-                inner.pending_modifers_state = Some(modifiers);
-            }
-        }
-    }
-}

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

@@ -1,192 +0,0 @@
-//! Convert Wayland keys to winit keys.
-
-use crate::event::VirtualKeyCode;
-
-pub fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
-    use sctk::seat::keyboard::keysyms;
-    match keysym {
-        // Numbers.
-        keysyms::XKB_KEY_1 => Some(VirtualKeyCode::Key1),
-        keysyms::XKB_KEY_2 => Some(VirtualKeyCode::Key2),
-        keysyms::XKB_KEY_3 => Some(VirtualKeyCode::Key3),
-        keysyms::XKB_KEY_4 => Some(VirtualKeyCode::Key4),
-        keysyms::XKB_KEY_5 => Some(VirtualKeyCode::Key5),
-        keysyms::XKB_KEY_6 => Some(VirtualKeyCode::Key6),
-        keysyms::XKB_KEY_7 => Some(VirtualKeyCode::Key7),
-        keysyms::XKB_KEY_8 => Some(VirtualKeyCode::Key8),
-        keysyms::XKB_KEY_9 => Some(VirtualKeyCode::Key9),
-        keysyms::XKB_KEY_0 => Some(VirtualKeyCode::Key0),
-        // Letters.
-        keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
-        keysyms::XKB_KEY_B | keysyms::XKB_KEY_b => Some(VirtualKeyCode::B),
-        keysyms::XKB_KEY_C | keysyms::XKB_KEY_c => Some(VirtualKeyCode::C),
-        keysyms::XKB_KEY_D | keysyms::XKB_KEY_d => Some(VirtualKeyCode::D),
-        keysyms::XKB_KEY_E | keysyms::XKB_KEY_e => Some(VirtualKeyCode::E),
-        keysyms::XKB_KEY_F | keysyms::XKB_KEY_f => Some(VirtualKeyCode::F),
-        keysyms::XKB_KEY_G | keysyms::XKB_KEY_g => Some(VirtualKeyCode::G),
-        keysyms::XKB_KEY_H | keysyms::XKB_KEY_h => Some(VirtualKeyCode::H),
-        keysyms::XKB_KEY_I | keysyms::XKB_KEY_i => Some(VirtualKeyCode::I),
-        keysyms::XKB_KEY_J | keysyms::XKB_KEY_j => Some(VirtualKeyCode::J),
-        keysyms::XKB_KEY_K | keysyms::XKB_KEY_k => Some(VirtualKeyCode::K),
-        keysyms::XKB_KEY_L | keysyms::XKB_KEY_l => Some(VirtualKeyCode::L),
-        keysyms::XKB_KEY_M | keysyms::XKB_KEY_m => Some(VirtualKeyCode::M),
-        keysyms::XKB_KEY_N | keysyms::XKB_KEY_n => Some(VirtualKeyCode::N),
-        keysyms::XKB_KEY_O | keysyms::XKB_KEY_o => Some(VirtualKeyCode::O),
-        keysyms::XKB_KEY_P | keysyms::XKB_KEY_p => Some(VirtualKeyCode::P),
-        keysyms::XKB_KEY_Q | keysyms::XKB_KEY_q => Some(VirtualKeyCode::Q),
-        keysyms::XKB_KEY_R | keysyms::XKB_KEY_r => Some(VirtualKeyCode::R),
-        keysyms::XKB_KEY_S | keysyms::XKB_KEY_s => Some(VirtualKeyCode::S),
-        keysyms::XKB_KEY_T | keysyms::XKB_KEY_t => Some(VirtualKeyCode::T),
-        keysyms::XKB_KEY_U | keysyms::XKB_KEY_u => Some(VirtualKeyCode::U),
-        keysyms::XKB_KEY_V | keysyms::XKB_KEY_v => Some(VirtualKeyCode::V),
-        keysyms::XKB_KEY_W | keysyms::XKB_KEY_w => Some(VirtualKeyCode::W),
-        keysyms::XKB_KEY_X | keysyms::XKB_KEY_x => Some(VirtualKeyCode::X),
-        keysyms::XKB_KEY_Y | keysyms::XKB_KEY_y => Some(VirtualKeyCode::Y),
-        keysyms::XKB_KEY_Z | keysyms::XKB_KEY_z => Some(VirtualKeyCode::Z),
-        // Escape.
-        keysyms::XKB_KEY_Escape => Some(VirtualKeyCode::Escape),
-        // Function keys.
-        keysyms::XKB_KEY_F1 => Some(VirtualKeyCode::F1),
-        keysyms::XKB_KEY_F2 => Some(VirtualKeyCode::F2),
-        keysyms::XKB_KEY_F3 => Some(VirtualKeyCode::F3),
-        keysyms::XKB_KEY_F4 => Some(VirtualKeyCode::F4),
-        keysyms::XKB_KEY_F5 => Some(VirtualKeyCode::F5),
-        keysyms::XKB_KEY_F6 => Some(VirtualKeyCode::F6),
-        keysyms::XKB_KEY_F7 => Some(VirtualKeyCode::F7),
-        keysyms::XKB_KEY_F8 => Some(VirtualKeyCode::F8),
-        keysyms::XKB_KEY_F9 => Some(VirtualKeyCode::F9),
-        keysyms::XKB_KEY_F10 => Some(VirtualKeyCode::F10),
-        keysyms::XKB_KEY_F11 => Some(VirtualKeyCode::F11),
-        keysyms::XKB_KEY_F12 => Some(VirtualKeyCode::F12),
-        keysyms::XKB_KEY_F13 => Some(VirtualKeyCode::F13),
-        keysyms::XKB_KEY_F14 => Some(VirtualKeyCode::F14),
-        keysyms::XKB_KEY_F15 => Some(VirtualKeyCode::F15),
-        keysyms::XKB_KEY_F16 => Some(VirtualKeyCode::F16),
-        keysyms::XKB_KEY_F17 => Some(VirtualKeyCode::F17),
-        keysyms::XKB_KEY_F18 => Some(VirtualKeyCode::F18),
-        keysyms::XKB_KEY_F19 => Some(VirtualKeyCode::F19),
-        keysyms::XKB_KEY_F20 => Some(VirtualKeyCode::F20),
-        keysyms::XKB_KEY_F21 => Some(VirtualKeyCode::F21),
-        keysyms::XKB_KEY_F22 => Some(VirtualKeyCode::F22),
-        keysyms::XKB_KEY_F23 => Some(VirtualKeyCode::F23),
-        keysyms::XKB_KEY_F24 => Some(VirtualKeyCode::F24),
-        // Flow control.
-        keysyms::XKB_KEY_Print => Some(VirtualKeyCode::Snapshot),
-        keysyms::XKB_KEY_Scroll_Lock => Some(VirtualKeyCode::Scroll),
-        keysyms::XKB_KEY_Pause => Some(VirtualKeyCode::Pause),
-        keysyms::XKB_KEY_Insert => Some(VirtualKeyCode::Insert),
-        keysyms::XKB_KEY_Home => Some(VirtualKeyCode::Home),
-        keysyms::XKB_KEY_Delete => Some(VirtualKeyCode::Delete),
-        keysyms::XKB_KEY_End => Some(VirtualKeyCode::End),
-        keysyms::XKB_KEY_Page_Down => Some(VirtualKeyCode::PageDown),
-        keysyms::XKB_KEY_Page_Up => Some(VirtualKeyCode::PageUp),
-        // Arrows.
-        keysyms::XKB_KEY_Left => Some(VirtualKeyCode::Left),
-        keysyms::XKB_KEY_Up => Some(VirtualKeyCode::Up),
-        keysyms::XKB_KEY_Right => Some(VirtualKeyCode::Right),
-        keysyms::XKB_KEY_Down => Some(VirtualKeyCode::Down),
-
-        keysyms::XKB_KEY_BackSpace => Some(VirtualKeyCode::Back),
-        keysyms::XKB_KEY_Return => Some(VirtualKeyCode::Return),
-        keysyms::XKB_KEY_space => Some(VirtualKeyCode::Space),
-
-        keysyms::XKB_KEY_Multi_key => Some(VirtualKeyCode::Compose),
-        keysyms::XKB_KEY_caret => Some(VirtualKeyCode::Caret),
-
-        // Keypad.
-        keysyms::XKB_KEY_Num_Lock => Some(VirtualKeyCode::Numlock),
-        keysyms::XKB_KEY_KP_0 => Some(VirtualKeyCode::Numpad0),
-        keysyms::XKB_KEY_KP_1 => Some(VirtualKeyCode::Numpad1),
-        keysyms::XKB_KEY_KP_2 => Some(VirtualKeyCode::Numpad2),
-        keysyms::XKB_KEY_KP_3 => Some(VirtualKeyCode::Numpad3),
-        keysyms::XKB_KEY_KP_4 => Some(VirtualKeyCode::Numpad4),
-        keysyms::XKB_KEY_KP_5 => Some(VirtualKeyCode::Numpad5),
-        keysyms::XKB_KEY_KP_6 => Some(VirtualKeyCode::Numpad6),
-        keysyms::XKB_KEY_KP_7 => Some(VirtualKeyCode::Numpad7),
-        keysyms::XKB_KEY_KP_8 => Some(VirtualKeyCode::Numpad8),
-        keysyms::XKB_KEY_KP_9 => Some(VirtualKeyCode::Numpad9),
-        // Misc.
-        // => Some(VirtualKeyCode::AbntC1),
-        // => Some(VirtualKeyCode::AbntC2),
-        keysyms::XKB_KEY_plus => Some(VirtualKeyCode::Plus),
-        keysyms::XKB_KEY_apostrophe => Some(VirtualKeyCode::Apostrophe),
-        // => Some(VirtualKeyCode::Apps),
-        keysyms::XKB_KEY_at => Some(VirtualKeyCode::At),
-        // => Some(VirtualKeyCode::Ax),
-        keysyms::XKB_KEY_backslash => Some(VirtualKeyCode::Backslash),
-        keysyms::XKB_KEY_XF86Calculator => Some(VirtualKeyCode::Calculator),
-        // => Some(VirtualKeyCode::Capital),
-        keysyms::XKB_KEY_colon => Some(VirtualKeyCode::Colon),
-        keysyms::XKB_KEY_comma => Some(VirtualKeyCode::Comma),
-        // => Some(VirtualKeyCode::Convert),
-        keysyms::XKB_KEY_equal => Some(VirtualKeyCode::Equals),
-        keysyms::XKB_KEY_grave => Some(VirtualKeyCode::Grave),
-        // => Some(VirtualKeyCode::Kana),
-        keysyms::XKB_KEY_Kanji => Some(VirtualKeyCode::Kanji),
-        keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
-        keysyms::XKB_KEY_bracketleft => Some(VirtualKeyCode::LBracket),
-        keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
-        keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
-        keysyms::XKB_KEY_Super_L => Some(VirtualKeyCode::LWin),
-        keysyms::XKB_KEY_XF86Mail => Some(VirtualKeyCode::Mail),
-        // => Some(VirtualKeyCode::MediaSelect),
-        // => Some(VirtualKeyCode::MediaStop),
-        keysyms::XKB_KEY_minus => Some(VirtualKeyCode::Minus),
-        keysyms::XKB_KEY_asterisk => Some(VirtualKeyCode::Asterisk),
-        keysyms::XKB_KEY_XF86AudioMute => Some(VirtualKeyCode::Mute),
-        // => Some(VirtualKeyCode::MyComputer),
-        keysyms::XKB_KEY_XF86AudioNext => Some(VirtualKeyCode::NextTrack),
-        // => Some(VirtualKeyCode::NoConvert),
-        keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma),
-        keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter),
-        keysyms::XKB_KEY_KP_Equal => Some(VirtualKeyCode::NumpadEquals),
-        keysyms::XKB_KEY_KP_Add => Some(VirtualKeyCode::NumpadAdd),
-        keysyms::XKB_KEY_KP_Subtract => Some(VirtualKeyCode::NumpadSubtract),
-        keysyms::XKB_KEY_KP_Multiply => Some(VirtualKeyCode::NumpadMultiply),
-        keysyms::XKB_KEY_KP_Divide => Some(VirtualKeyCode::NumpadDivide),
-        keysyms::XKB_KEY_KP_Decimal => Some(VirtualKeyCode::NumpadDecimal),
-        keysyms::XKB_KEY_KP_Page_Up => Some(VirtualKeyCode::PageUp),
-        keysyms::XKB_KEY_KP_Page_Down => Some(VirtualKeyCode::PageDown),
-        keysyms::XKB_KEY_KP_Home => Some(VirtualKeyCode::Home),
-        keysyms::XKB_KEY_KP_End => Some(VirtualKeyCode::End),
-        keysyms::XKB_KEY_KP_Left => Some(VirtualKeyCode::Left),
-        keysyms::XKB_KEY_KP_Up => Some(VirtualKeyCode::Up),
-        keysyms::XKB_KEY_KP_Right => Some(VirtualKeyCode::Right),
-        keysyms::XKB_KEY_KP_Down => Some(VirtualKeyCode::Down),
-        // => Some(VirtualKeyCode::OEM102),
-        keysyms::XKB_KEY_period => Some(VirtualKeyCode::Period),
-        // => Some(VirtualKeyCode::Playpause),
-        keysyms::XKB_KEY_XF86PowerOff => Some(VirtualKeyCode::Power),
-        keysyms::XKB_KEY_XF86AudioPrev => Some(VirtualKeyCode::PrevTrack),
-        keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
-        keysyms::XKB_KEY_bracketright => Some(VirtualKeyCode::RBracket),
-        keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
-        keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
-        keysyms::XKB_KEY_Super_R => Some(VirtualKeyCode::RWin),
-        keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
-        keysyms::XKB_KEY_slash => Some(VirtualKeyCode::Slash),
-        keysyms::XKB_KEY_XF86Sleep => Some(VirtualKeyCode::Sleep),
-        // => Some(VirtualKeyCode::Stop),
-        // => Some(VirtualKeyCode::Sysrq),
-        keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
-        keysyms::XKB_KEY_ISO_Left_Tab => Some(VirtualKeyCode::Tab),
-        keysyms::XKB_KEY_underscore => Some(VirtualKeyCode::Underline),
-        // => Some(VirtualKeyCode::Unlabeled),
-        keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
-        keysyms::XKB_KEY_XF86AudioRaiseVolume => Some(VirtualKeyCode::VolumeUp),
-        // => Some(VirtualKeyCode::Wake),
-        // => Some(VirtualKeyCode::Webback),
-        // => Some(VirtualKeyCode::WebFavorites),
-        // => Some(VirtualKeyCode::WebForward),
-        // => Some(VirtualKeyCode::WebHome),
-        // => Some(VirtualKeyCode::WebRefresh),
-        // => Some(VirtualKeyCode::WebSearch),
-        // => Some(VirtualKeyCode::WebStop),
-        keysyms::XKB_KEY_yen => Some(VirtualKeyCode::Yen),
-        keysyms::XKB_KEY_XF86Copy => Some(VirtualKeyCode::Copy),
-        keysyms::XKB_KEY_XF86Paste => Some(VirtualKeyCode::Paste),
-        keysyms::XKB_KEY_XF86Cut => Some(VirtualKeyCode::Cut),
-        // Fallback.
-        _ => None,
-    }
-}

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

@@ -1,90 +0,0 @@
-//! Wayland keyboard handling.
-
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use sctk::reexports::client::protocol::wl_keyboard::WlKeyboard;
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::client::Attached;
-
-use sctk::reexports::calloop::LoopHandle;
-
-use sctk::seat::keyboard;
-
-use crate::event::ModifiersState;
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::WindowId;
-
-mod handlers;
-mod keymap;
-
-pub(crate) struct Keyboard {
-    pub keyboard: WlKeyboard,
-}
-
-impl Keyboard {
-    pub fn new(
-        seat: &Attached<WlSeat>,
-        loop_handle: LoopHandle<'static, WinitState>,
-        modifiers_state: Rc<RefCell<ModifiersState>>,
-    ) -> Option<Self> {
-        let mut inner = KeyboardInner::new(modifiers_state);
-        let keyboard = keyboard::map_keyboard_repeat(
-            loop_handle.clone(),
-            seat,
-            None,
-            keyboard::RepeatKind::System,
-            move |event, _, mut dispatch_data| {
-                let winit_state = dispatch_data.get::<WinitState>().unwrap();
-                handlers::handle_keyboard(event, &mut inner, winit_state);
-            },
-        )
-        .ok()?;
-
-        Some(Self { keyboard })
-    }
-}
-
-impl Drop for Keyboard {
-    fn drop(&mut self) {
-        if self.keyboard.as_ref().version() >= 3 {
-            self.keyboard.release();
-        }
-    }
-}
-
-struct KeyboardInner {
-    /// Currently focused surface.
-    target_window_id: Option<WindowId>,
-
-    /// A pending state of modifiers.
-    ///
-    /// This state is getting set if we've got a modifiers update
-    /// before `Enter` event, which shouldn't happen in general, however
-    /// some compositors are still doing so.
-    pending_modifers_state: Option<ModifiersState>,
-
-    /// Current state of modifiers keys.
-    modifiers_state: Rc<RefCell<ModifiersState>>,
-}
-
-impl KeyboardInner {
-    fn new(modifiers_state: Rc<RefCell<ModifiersState>>) -> Self {
-        Self {
-            target_window_id: None,
-            pending_modifers_state: None,
-            modifiers_state,
-        }
-    }
-}
-
-impl From<keyboard::ModifiersState> for ModifiersState {
-    fn from(mods: keyboard::ModifiersState) -> ModifiersState {
-        let mut wl_mods = ModifiersState::empty();
-        wl_mods.set(ModifiersState::SHIFT, mods.shift);
-        wl_mods.set(ModifiersState::CTRL, mods.ctrl);
-        wl_mods.set(ModifiersState::ALT, mods.alt);
-        wl_mods.set(ModifiersState::LOGO, mods.logo);
-        wl_mods
-    }
-}

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

@@ -1,208 +0,0 @@
-//! Seat handling and managing.
-
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use sctk::reexports::protocols::unstable::relative_pointer::v1::client::zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_pointer_constraints_v1::ZwpPointerConstraintsV1;
-use sctk::reexports::protocols::unstable::text_input::v3::client::zwp_text_input_manager_v3::ZwpTextInputManagerV3;
-
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::client::Attached;
-
-use sctk::environment::Environment;
-use sctk::reexports::calloop::LoopHandle;
-use sctk::seat::pointer::ThemeManager;
-use sctk::seat::{SeatData, SeatListener};
-
-use super::env::WinitEnv;
-use super::event_loop::WinitState;
-use crate::event::ModifiersState;
-
-mod keyboard;
-pub mod pointer;
-pub mod text_input;
-mod touch;
-
-use keyboard::Keyboard;
-use pointer::Pointers;
-use text_input::TextInput;
-use touch::Touch;
-
-pub struct SeatManager {
-    /// Listener for seats.
-    _seat_listener: SeatListener,
-}
-
-impl SeatManager {
-    pub fn new(
-        env: &Environment<WinitEnv>,
-        loop_handle: LoopHandle<'static, WinitState>,
-        theme_manager: ThemeManager,
-    ) -> Self {
-        let relative_pointer_manager = env.get_global::<ZwpRelativePointerManagerV1>();
-        let pointer_constraints = env.get_global::<ZwpPointerConstraintsV1>();
-        let text_input_manager = env.get_global::<ZwpTextInputManagerV3>();
-
-        let mut inner = SeatManagerInner::new(
-            theme_manager,
-            relative_pointer_manager,
-            pointer_constraints,
-            text_input_manager,
-            loop_handle,
-        );
-
-        // Handle existing seats.
-        for seat in env.get_all_seats() {
-            let seat_data = match sctk::seat::clone_seat_data(&seat) {
-                Some(seat_data) => seat_data,
-                None => continue,
-            };
-
-            inner.process_seat_update(&seat, &seat_data);
-        }
-
-        let seat_listener = env.listen_for_seats(move |seat, seat_data, _| {
-            inner.process_seat_update(&seat, seat_data);
-        });
-
-        Self {
-            _seat_listener: seat_listener,
-        }
-    }
-}
-
-/// Inner state of the seat manager.
-struct SeatManagerInner {
-    /// Currently observed seats.
-    seats: Vec<SeatInfo>,
-
-    /// Loop handle.
-    loop_handle: LoopHandle<'static, WinitState>,
-
-    /// Relative pointer manager.
-    relative_pointer_manager: Option<Attached<ZwpRelativePointerManagerV1>>,
-
-    /// Pointer constraints.
-    pointer_constraints: Option<Attached<ZwpPointerConstraintsV1>>,
-
-    /// Text input manager.
-    text_input_manager: Option<Attached<ZwpTextInputManagerV3>>,
-
-    /// A theme manager.
-    theme_manager: ThemeManager,
-}
-
-impl SeatManagerInner {
-    fn new(
-        theme_manager: ThemeManager,
-        relative_pointer_manager: Option<Attached<ZwpRelativePointerManagerV1>>,
-        pointer_constraints: Option<Attached<ZwpPointerConstraintsV1>>,
-        text_input_manager: Option<Attached<ZwpTextInputManagerV3>>,
-        loop_handle: LoopHandle<'static, WinitState>,
-    ) -> Self {
-        Self {
-            seats: Vec::new(),
-            loop_handle,
-            relative_pointer_manager,
-            pointer_constraints,
-            text_input_manager,
-            theme_manager,
-        }
-    }
-
-    /// Handle seats update from the `SeatListener`.
-    pub fn process_seat_update(&mut self, seat: &Attached<WlSeat>, seat_data: &SeatData) {
-        let detached_seat = seat.detach();
-
-        let position = self.seats.iter().position(|si| si.seat == detached_seat);
-        let index = position.unwrap_or_else(|| {
-            self.seats.push(SeatInfo::new(detached_seat));
-            self.seats.len() - 1
-        });
-
-        let seat_info = &mut self.seats[index];
-
-        // Pointer handling.
-        if seat_data.has_pointer && !seat_data.defunct {
-            if seat_info.pointer.is_none() {
-                seat_info.pointer = Some(Pointers::new(
-                    seat,
-                    &self.theme_manager,
-                    &self.relative_pointer_manager,
-                    &self.pointer_constraints,
-                    seat_info.modifiers_state.clone(),
-                ));
-            }
-        } else {
-            seat_info.pointer = None;
-        }
-
-        // Handle keyboard.
-        if seat_data.has_keyboard && !seat_data.defunct {
-            if seat_info.keyboard.is_none() {
-                seat_info.keyboard = Keyboard::new(
-                    seat,
-                    self.loop_handle.clone(),
-                    seat_info.modifiers_state.clone(),
-                );
-            }
-        } else {
-            seat_info.keyboard = None;
-        }
-
-        // Handle touch.
-        if seat_data.has_touch && !seat_data.defunct {
-            if seat_info.touch.is_none() {
-                seat_info.touch = Some(Touch::new(seat));
-            }
-        } else {
-            seat_info.touch = None;
-        }
-
-        // Handle text input.
-        if let Some(text_input_manager) = self.text_input_manager.as_ref() {
-            if seat_data.defunct {
-                seat_info.text_input = None;
-            } else if seat_info.text_input.is_none() {
-                seat_info.text_input = Some(TextInput::new(seat, text_input_manager));
-            }
-        }
-    }
-}
-
-/// Resources associtated with a given seat.
-struct SeatInfo {
-    /// Seat to which this `SeatInfo` belongs.
-    seat: WlSeat,
-
-    /// A keyboard handle with its repeat rate handling.
-    keyboard: Option<Keyboard>,
-
-    /// All pointers we're using on a seat.
-    pointer: Option<Pointers>,
-
-    /// Touch handling.
-    touch: Option<Touch>,
-
-    /// Text input handling aka IME.
-    text_input: Option<TextInput>,
-
-    /// The current state of modifiers observed in keyboard handler.
-    ///
-    /// We keep modifiers state on a seat, since it's being used by pointer events as well.
-    modifiers_state: Rc<RefCell<ModifiersState>>,
-}
-
-impl SeatInfo {
-    pub fn new(seat: WlSeat) -> Self {
-        Self {
-            seat,
-            keyboard: None,
-            pointer: None,
-            touch: None,
-            text_input: None,
-            modifiers_state: Rc::new(RefCell::new(ModifiersState::default())),
-        }
-    }
-}

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

@@ -1,82 +0,0 @@
-//! Data which is used in pointer callbacks.
-
-use std::cell::{Cell, RefCell};
-use std::rc::Rc;
-
-use sctk::reexports::client::protocol::wl_surface::WlSurface;
-use sctk::reexports::client::Attached;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_pointer_constraints_v1::ZwpPointerConstraintsV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_confined_pointer_v1::ZwpConfinedPointerV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_locked_pointer_v1::ZwpLockedPointerV1;
-
-use crate::event::{ModifiersState, TouchPhase};
-
-/// A data being used by pointer handlers.
-pub(super) struct PointerData {
-    /// Winit's surface the pointer is currently over.
-    pub surface: Option<WlSurface>,
-
-    /// Current modifiers state.
-    ///
-    /// This refers a state of modifiers from `WlKeyboard` on
-    /// the given seat.
-    pub modifiers_state: Rc<RefCell<ModifiersState>>,
-
-    /// Pointer constraints.
-    pub pointer_constraints: Option<Attached<ZwpPointerConstraintsV1>>,
-
-    pub confined_pointer: Rc<RefCell<Option<ZwpConfinedPointerV1>>>,
-    pub locked_pointer: Rc<RefCell<Option<ZwpLockedPointerV1>>>,
-
-    /// Latest observed serial in pointer events.
-    pub latest_serial: Rc<Cell<u32>>,
-
-    /// Latest observed serial in pointer enter events.
-    pub latest_enter_serial: Rc<Cell<u32>>,
-
-    /// The currently accumulated axis data on a pointer.
-    pub axis_data: AxisData,
-}
-
-impl PointerData {
-    pub fn new(
-        confined_pointer: Rc<RefCell<Option<ZwpConfinedPointerV1>>>,
-        locked_pointer: Rc<RefCell<Option<ZwpLockedPointerV1>>>,
-        pointer_constraints: Option<Attached<ZwpPointerConstraintsV1>>,
-        modifiers_state: Rc<RefCell<ModifiersState>>,
-    ) -> Self {
-        Self {
-            surface: None,
-            latest_serial: Rc::new(Cell::new(0)),
-            latest_enter_serial: Rc::new(Cell::new(0)),
-            confined_pointer,
-            locked_pointer,
-            modifiers_state,
-            pointer_constraints,
-            axis_data: AxisData::new(),
-        }
-    }
-}
-
-/// Axis data.
-#[derive(Clone, Copy)]
-pub(super) struct AxisData {
-    /// Current state of the axis.
-    pub axis_state: TouchPhase,
-
-    /// A buffer for `PixelDelta` event.
-    pub axis_buffer: Option<(f32, f32)>,
-
-    /// A buffer for `LineDelta` event.
-    pub axis_discrete_buffer: Option<(f32, f32)>,
-}
-
-impl AxisData {
-    pub fn new() -> Self {
-        Self {
-            axis_state: TouchPhase::Ended,
-            axis_buffer: None,
-            axis_discrete_buffer: None,
-        }
-    }
-}

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

@@ -1,330 +0,0 @@
-//! Handlers for the pointers we're using.
-
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use sctk::reexports::client::protocol::wl_pointer::{self, Event as PointerEvent};
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::protocols::unstable::relative_pointer::v1::client::zwp_relative_pointer_v1::Event as RelativePointerEvent;
-
-use sctk::seat::pointer::ThemedPointer;
-
-use crate::dpi::LogicalPosition;
-use crate::event::{
-    DeviceEvent, ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent,
-};
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::{self, DeviceId};
-
-use super::{PointerData, WinitPointer};
-
-// These values are comming from <linux/input-event-codes.h>.
-const BTN_LEFT: u32 = 0x110;
-const BTN_RIGHT: u32 = 0x111;
-const BTN_MIDDLE: u32 = 0x112;
-
-#[inline]
-pub(super) fn handle_pointer(
-    pointer: ThemedPointer,
-    event: PointerEvent,
-    pointer_data: &Rc<RefCell<PointerData>>,
-    winit_state: &mut WinitState,
-    seat: WlSeat,
-) {
-    let event_sink = &mut winit_state.event_sink;
-    let mut pointer_data = pointer_data.borrow_mut();
-    match event {
-        PointerEvent::Enter {
-            surface,
-            surface_x,
-            surface_y,
-            serial,
-            ..
-        } => {
-            pointer_data.latest_serial.replace(serial);
-            pointer_data.latest_enter_serial.replace(serial);
-
-            let window_id = wayland::make_wid(&surface);
-            if !winit_state.window_map.contains_key(&window_id) {
-                return;
-            }
-            let window_handle = match winit_state.window_map.get_mut(&window_id) {
-                Some(window_handle) => window_handle,
-                None => return,
-            };
-
-            let scale_factor = window_handle.scale_factor();
-            pointer_data.surface = Some(surface);
-
-            // Notify window that pointer entered the surface.
-            let winit_pointer = WinitPointer {
-                pointer,
-                confined_pointer: Rc::downgrade(&pointer_data.confined_pointer),
-                locked_pointer: Rc::downgrade(&pointer_data.locked_pointer),
-                pointer_constraints: pointer_data.pointer_constraints.clone(),
-                latest_serial: pointer_data.latest_serial.clone(),
-                latest_enter_serial: pointer_data.latest_enter_serial.clone(),
-                seat,
-            };
-            window_handle.pointer_entered(winit_pointer);
-
-            event_sink.push_window_event(
-                WindowEvent::CursorEntered {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                },
-                window_id,
-            );
-
-            let position = LogicalPosition::new(surface_x, surface_y).to_physical(scale_factor);
-
-            event_sink.push_window_event(
-                WindowEvent::CursorMoved {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    position,
-                    modifiers: *pointer_data.modifiers_state.borrow(),
-                },
-                window_id,
-            );
-        }
-        PointerEvent::Leave { surface, serial } => {
-            pointer_data.surface = None;
-            pointer_data.latest_serial.replace(serial);
-
-            let window_id = wayland::make_wid(&surface);
-
-            let window_handle = match winit_state.window_map.get_mut(&window_id) {
-                Some(window_handle) => window_handle,
-                None => return,
-            };
-
-            // Notify a window that pointer is no longer observing it.
-            let winit_pointer = WinitPointer {
-                pointer,
-                confined_pointer: Rc::downgrade(&pointer_data.confined_pointer),
-                locked_pointer: Rc::downgrade(&pointer_data.locked_pointer),
-                pointer_constraints: pointer_data.pointer_constraints.clone(),
-                latest_serial: pointer_data.latest_serial.clone(),
-                latest_enter_serial: pointer_data.latest_enter_serial.clone(),
-                seat,
-            };
-            window_handle.pointer_left(winit_pointer);
-
-            event_sink.push_window_event(
-                WindowEvent::CursorLeft {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                },
-                window_id,
-            );
-        }
-        PointerEvent::Motion {
-            surface_x,
-            surface_y,
-            ..
-        } => {
-            let surface = match pointer_data.surface.as_ref() {
-                Some(surface) => surface,
-                None => return,
-            };
-
-            let window_id = wayland::make_wid(surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-
-            let scale_factor = window_handle.scale_factor();
-            let position = LogicalPosition::new(surface_x, surface_y).to_physical(scale_factor);
-
-            event_sink.push_window_event(
-                WindowEvent::CursorMoved {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    position,
-                    modifiers: *pointer_data.modifiers_state.borrow(),
-                },
-                window_id,
-            );
-        }
-        PointerEvent::Button {
-            button,
-            state,
-            serial,
-            ..
-        } => {
-            pointer_data.latest_serial.replace(serial);
-            let window_id = match pointer_data.surface.as_ref().map(wayland::make_wid) {
-                Some(window_id) => window_id,
-                None => return,
-            };
-
-            let state = match state {
-                wl_pointer::ButtonState::Pressed => ElementState::Pressed,
-                wl_pointer::ButtonState::Released => ElementState::Released,
-                _ => unreachable!(),
-            };
-
-            let button = match button {
-                BTN_LEFT => MouseButton::Left,
-                BTN_RIGHT => MouseButton::Right,
-                BTN_MIDDLE => MouseButton::Middle,
-                button => MouseButton::Other(button as u16),
-            };
-
-            event_sink.push_window_event(
-                WindowEvent::MouseInput {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    state,
-                    button,
-                    modifiers: *pointer_data.modifiers_state.borrow(),
-                },
-                window_id,
-            );
-        }
-        PointerEvent::Axis { axis, value, .. } => {
-            let surface = match pointer_data.surface.as_ref() {
-                Some(surface) => surface,
-                None => return,
-            };
-
-            let window_id = wayland::make_wid(surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-
-            if pointer.as_ref().version() < 5 {
-                let (mut x, mut y) = (0.0, 0.0);
-
-                // Old seat compatibility.
-                match axis {
-                    // Wayland sign convention is the inverse of winit.
-                    wl_pointer::Axis::VerticalScroll => y -= value as f32,
-                    wl_pointer::Axis::HorizontalScroll => x -= value as f32,
-                    _ => unreachable!(),
-                }
-
-                let scale_factor = window_handle.scale_factor();
-                let delta = LogicalPosition::new(x as f64, y as f64).to_physical(scale_factor);
-
-                event_sink.push_window_event(
-                    WindowEvent::MouseWheel {
-                        device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                            DeviceId,
-                        )),
-                        delta: MouseScrollDelta::PixelDelta(delta),
-                        phase: TouchPhase::Moved,
-                        modifiers: *pointer_data.modifiers_state.borrow(),
-                    },
-                    window_id,
-                );
-            } else {
-                let (mut x, mut y) = pointer_data.axis_data.axis_buffer.unwrap_or((0.0, 0.0));
-                match axis {
-                    // Wayland sign convention is the inverse of winit.
-                    wl_pointer::Axis::VerticalScroll => y -= value as f32,
-                    wl_pointer::Axis::HorizontalScroll => x -= value as f32,
-                    _ => unreachable!(),
-                }
-
-                pointer_data.axis_data.axis_buffer = Some((x, y));
-
-                pointer_data.axis_data.axis_state = match pointer_data.axis_data.axis_state {
-                    TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
-                    _ => TouchPhase::Started,
-                }
-            }
-        }
-        PointerEvent::AxisDiscrete { axis, discrete } => {
-            let (mut x, mut y) = pointer_data
-                .axis_data
-                .axis_discrete_buffer
-                .unwrap_or((0., 0.));
-
-            match axis {
-                // Wayland sign convention is the inverse of winit.
-                wl_pointer::Axis::VerticalScroll => y -= discrete as f32,
-                wl_pointer::Axis::HorizontalScroll => x -= discrete as f32,
-                _ => unreachable!(),
-            }
-
-            pointer_data.axis_data.axis_discrete_buffer = Some((x, y));
-
-            pointer_data.axis_data.axis_state = match pointer_data.axis_data.axis_state {
-                TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
-                _ => TouchPhase::Started,
-            }
-        }
-        PointerEvent::AxisSource { .. } => (),
-        PointerEvent::AxisStop { .. } => {
-            pointer_data.axis_data.axis_state = TouchPhase::Ended;
-        }
-        PointerEvent::Frame => {
-            let axis_buffer = pointer_data.axis_data.axis_buffer.take();
-            let axis_discrete_buffer = pointer_data.axis_data.axis_discrete_buffer.take();
-
-            let surface = match pointer_data.surface.as_ref() {
-                Some(surface) => surface,
-                None => return,
-            };
-            let window_id = wayland::make_wid(surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-
-            let window_event = if let Some((x, y)) = axis_discrete_buffer {
-                WindowEvent::MouseWheel {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    delta: MouseScrollDelta::LineDelta(x, y),
-                    phase: pointer_data.axis_data.axis_state,
-                    modifiers: *pointer_data.modifiers_state.borrow(),
-                }
-            } else if let Some((x, y)) = axis_buffer {
-                let scale_factor = window_handle.scale_factor();
-                let delta = LogicalPosition::new(x, y).to_physical(scale_factor);
-
-                WindowEvent::MouseWheel {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    delta: MouseScrollDelta::PixelDelta(delta),
-                    phase: pointer_data.axis_data.axis_state,
-                    modifiers: *pointer_data.modifiers_state.borrow(),
-                }
-            } else {
-                return;
-            };
-
-            event_sink.push_window_event(window_event, window_id);
-        }
-        _ => (),
-    }
-}
-
-#[inline]
-pub(super) fn handle_relative_pointer(event: RelativePointerEvent, winit_state: &mut WinitState) {
-    if let RelativePointerEvent::RelativeMotion {
-        dx_unaccel,
-        dy_unaccel,
-        ..
-    } = event
-    {
-        winit_state.event_sink.push_device_event(
-            DeviceEvent::MouseMotion {
-                delta: (dx_unaccel, dy_unaccel),
-            },
-            DeviceId,
-        )
-    }
-}

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

@@ -1,343 +0,0 @@
-//! All pointer related handling.
-
-use std::cell::{Cell, RefCell};
-use std::rc::{Rc, Weak};
-
-use sctk::reexports::client::protocol::wl_pointer::WlPointer;
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::client::protocol::wl_surface::WlSurface;
-use sctk::reexports::client::Attached;
-use sctk::reexports::protocols::unstable::relative_pointer::v1::client::zwp_relative_pointer_manager_v1::ZwpRelativePointerManagerV1;
-use sctk::reexports::protocols::unstable::relative_pointer::v1::client::zwp_relative_pointer_v1::ZwpRelativePointerV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_pointer_constraints_v1::{ZwpPointerConstraintsV1, Lifetime};
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_confined_pointer_v1::ZwpConfinedPointerV1;
-use sctk::reexports::protocols::unstable::pointer_constraints::v1::client::zwp_locked_pointer_v1::ZwpLockedPointerV1;
-
-use sctk::seat::pointer::{ThemeManager, ThemedPointer};
-use sctk::window::Window;
-
-use crate::event::ModifiersState;
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::window::WinitFrame;
-use crate::window::CursorIcon;
-
-mod data;
-mod handlers;
-
-use data::PointerData;
-
-/// A proxy to Wayland pointer, which serves requests from a `WindowHandle`.
-pub struct WinitPointer {
-    pointer: ThemedPointer,
-
-    /// Create confined pointers.
-    pointer_constraints: Option<Attached<ZwpPointerConstraintsV1>>,
-
-    /// Cursor to handle confine requests.
-    confined_pointer: Weak<RefCell<Option<ZwpConfinedPointerV1>>>,
-
-    /// Cursor to handle locked requests.
-    locked_pointer: Weak<RefCell<Option<ZwpLockedPointerV1>>>,
-
-    /// Latest observed serial in pointer events.
-    /// used by Window::start_interactive_move()
-    latest_serial: Rc<Cell<u32>>,
-
-    /// Latest observed serial in pointer enter events.
-    /// used by Window::set_cursor()
-    latest_enter_serial: Rc<Cell<u32>>,
-
-    /// Seat.
-    seat: WlSeat,
-}
-
-impl PartialEq for WinitPointer {
-    fn eq(&self, other: &Self) -> bool {
-        *self.pointer == *other.pointer
-    }
-}
-
-impl Eq for WinitPointer {}
-
-impl WinitPointer {
-    /// Set the cursor icon.
-    ///
-    /// Providing `None` will hide the cursor.
-    pub fn set_cursor(&self, cursor_icon: Option<CursorIcon>) {
-        let cursor_icon = match cursor_icon {
-            Some(cursor_icon) => cursor_icon,
-            None => {
-                // Hide the cursor.
-                // WlPointer::set_cursor() expects the serial of the last *enter*
-                // event (compare to to start_interactive_move()).
-                (*self.pointer).set_cursor(self.latest_enter_serial.get(), None, 0, 0);
-                return;
-            }
-        };
-
-        let cursors: &[&str] = match cursor_icon {
-            CursorIcon::Alias => &["link"],
-            CursorIcon::Arrow => &["arrow"],
-            CursorIcon::Cell => &["plus"],
-            CursorIcon::Copy => &["copy"],
-            CursorIcon::Crosshair => &["crosshair"],
-            CursorIcon::Default => &["left_ptr"],
-            CursorIcon::Hand => &["hand2", "hand1"],
-            CursorIcon::Help => &["question_arrow"],
-            CursorIcon::Move => &["move"],
-            CursorIcon::Grab => &["openhand", "grab"],
-            CursorIcon::Grabbing => &["closedhand", "grabbing"],
-            CursorIcon::Progress => &["progress"],
-            CursorIcon::AllScroll => &["all-scroll"],
-            CursorIcon::ContextMenu => &["context-menu"],
-
-            CursorIcon::NoDrop => &["no-drop", "circle"],
-            CursorIcon::NotAllowed => &["crossed_circle"],
-
-            // Resize cursors
-            CursorIcon::EResize => &["right_side"],
-            CursorIcon::NResize => &["top_side"],
-            CursorIcon::NeResize => &["top_right_corner"],
-            CursorIcon::NwResize => &["top_left_corner"],
-            CursorIcon::SResize => &["bottom_side"],
-            CursorIcon::SeResize => &["bottom_right_corner"],
-            CursorIcon::SwResize => &["bottom_left_corner"],
-            CursorIcon::WResize => &["left_side"],
-            CursorIcon::EwResize => &["h_double_arrow"],
-            CursorIcon::NsResize => &["v_double_arrow"],
-            CursorIcon::NwseResize => &["bd_double_arrow", "size_fdiag"],
-            CursorIcon::NeswResize => &["fd_double_arrow", "size_bdiag"],
-            CursorIcon::ColResize => &["split_h", "h_double_arrow"],
-            CursorIcon::RowResize => &["split_v", "v_double_arrow"],
-            CursorIcon::Text => &["text", "xterm"],
-            CursorIcon::VerticalText => &["vertical-text"],
-
-            CursorIcon::Wait => &["watch"],
-
-            CursorIcon::ZoomIn => &["zoom-in"],
-            CursorIcon::ZoomOut => &["zoom-out"],
-        };
-
-        let serial = Some(self.latest_enter_serial.get());
-        for cursor in cursors {
-            if self.pointer.set_cursor(cursor, serial).is_ok() {
-                return;
-            }
-        }
-        warn!("Failed to set cursor to {:?}", cursor_icon);
-    }
-
-    /// Confine the pointer to a surface.
-    pub fn confine(&self, surface: &WlSurface) {
-        let pointer_constraints = match &self.pointer_constraints {
-            Some(pointer_constraints) => pointer_constraints,
-            None => return,
-        };
-
-        let confined_pointer = match self.confined_pointer.upgrade() {
-            Some(confined_pointer) => confined_pointer,
-            // A pointer is gone.
-            None => return,
-        };
-
-        *confined_pointer.borrow_mut() = Some(init_confined_pointer(
-            pointer_constraints,
-            surface,
-            &self.pointer,
-        ));
-    }
-
-    /// Tries to unconfine the pointer if the current pointer is confined.
-    pub fn unconfine(&self) {
-        let confined_pointer = match self.confined_pointer.upgrade() {
-            Some(confined_pointer) => confined_pointer,
-            // A pointer is gone.
-            None => return,
-        };
-
-        let mut confined_pointer = confined_pointer.borrow_mut();
-
-        if let Some(confined_pointer) = confined_pointer.take() {
-            confined_pointer.destroy();
-        }
-    }
-
-    pub fn lock(&self, surface: &WlSurface) {
-        let pointer_constraints = match &self.pointer_constraints {
-            Some(pointer_constraints) => pointer_constraints,
-            None => return,
-        };
-
-        let locked_pointer = match self.locked_pointer.upgrade() {
-            Some(locked_pointer) => locked_pointer,
-            // A pointer is gone.
-            None => return,
-        };
-
-        *locked_pointer.borrow_mut() = Some(init_locked_pointer(
-            pointer_constraints,
-            surface,
-            &self.pointer,
-        ));
-    }
-
-    pub fn unlock(&self) {
-        let locked_pointer = match self.locked_pointer.upgrade() {
-            Some(locked_pointer) => locked_pointer,
-            // A pointer is gone.
-            None => return,
-        };
-
-        let mut locked_pointer = locked_pointer.borrow_mut();
-
-        if let Some(locked_pointer) = locked_pointer.take() {
-            locked_pointer.destroy();
-        }
-    }
-
-    pub fn set_cursor_position(&self, surface_x: u32, surface_y: u32) {
-        let locked_pointer = match self.locked_pointer.upgrade() {
-            Some(locked_pointer) => locked_pointer,
-            // A pointer is gone.
-            None => return,
-        };
-
-        let locked_pointer = locked_pointer.borrow_mut();
-        if let Some(locked_pointer) = locked_pointer.as_ref() {
-            locked_pointer.set_cursor_position_hint(surface_x.into(), surface_y.into());
-        }
-    }
-
-    pub fn drag_window(&self, window: &Window<WinitFrame>) {
-        // WlPointer::setart_interactive_move() expects the last serial of *any*
-        // pointer event (compare to set_cursor()).
-        window.start_interactive_move(&self.seat, self.latest_serial.get());
-    }
-}
-
-/// A pointer wrapper for easy releasing and managing pointers.
-pub(super) struct Pointers {
-    /// A pointer itself.
-    pointer: ThemedPointer,
-
-    /// A relative pointer handler.
-    relative_pointer: Option<ZwpRelativePointerV1>,
-
-    /// Confined pointer.
-    confined_pointer: Rc<RefCell<Option<ZwpConfinedPointerV1>>>,
-
-    /// Locked pointer.
-    locked_pointer: Rc<RefCell<Option<ZwpLockedPointerV1>>>,
-}
-
-impl Pointers {
-    pub(super) fn new(
-        seat: &Attached<WlSeat>,
-        theme_manager: &ThemeManager,
-        relative_pointer_manager: &Option<Attached<ZwpRelativePointerManagerV1>>,
-        pointer_constraints: &Option<Attached<ZwpPointerConstraintsV1>>,
-        modifiers_state: Rc<RefCell<ModifiersState>>,
-    ) -> Self {
-        let confined_pointer = Rc::new(RefCell::new(None));
-        let locked_pointer = Rc::new(RefCell::new(None));
-
-        let pointer_data = Rc::new(RefCell::new(PointerData::new(
-            confined_pointer.clone(),
-            locked_pointer.clone(),
-            pointer_constraints.clone(),
-            modifiers_state,
-        )));
-
-        let pointer_seat = seat.detach();
-        let pointer = theme_manager.theme_pointer_with_impl(
-            seat,
-            move |event, pointer, mut dispatch_data| {
-                let winit_state = dispatch_data.get::<WinitState>().unwrap();
-                handlers::handle_pointer(
-                    pointer,
-                    event,
-                    &pointer_data,
-                    winit_state,
-                    pointer_seat.clone(),
-                );
-            },
-        );
-
-        // Setup relative_pointer if it's available.
-        let relative_pointer = relative_pointer_manager
-            .as_ref()
-            .map(|relative_pointer_manager| {
-                init_relative_pointer(relative_pointer_manager, &pointer)
-            });
-
-        Self {
-            pointer,
-            relative_pointer,
-            confined_pointer,
-            locked_pointer,
-        }
-    }
-}
-
-impl Drop for Pointers {
-    fn drop(&mut self) {
-        // Drop relative pointer.
-        if let Some(relative_pointer) = self.relative_pointer.take() {
-            relative_pointer.destroy();
-        }
-
-        // Drop confined pointer.
-        if let Some(confined_pointer) = self.confined_pointer.borrow_mut().take() {
-            confined_pointer.destroy();
-        }
-
-        // Drop lock ponter.
-        if let Some(locked_pointer) = self.locked_pointer.borrow_mut().take() {
-            locked_pointer.destroy();
-        }
-
-        // Drop the pointer itself in case it's possible.
-        if self.pointer.as_ref().version() >= 3 {
-            self.pointer.release();
-        }
-    }
-}
-
-pub(super) fn init_relative_pointer(
-    relative_pointer_manager: &ZwpRelativePointerManagerV1,
-    pointer: &WlPointer,
-) -> ZwpRelativePointerV1 {
-    let relative_pointer = relative_pointer_manager.get_relative_pointer(pointer);
-    relative_pointer.quick_assign(move |_, event, mut dispatch_data| {
-        let winit_state = dispatch_data.get::<WinitState>().unwrap();
-        handlers::handle_relative_pointer(event, winit_state);
-    });
-
-    relative_pointer.detach()
-}
-
-pub(super) fn init_confined_pointer(
-    pointer_constraints: &Attached<ZwpPointerConstraintsV1>,
-    surface: &WlSurface,
-    pointer: &WlPointer,
-) -> ZwpConfinedPointerV1 {
-    let confined_pointer =
-        pointer_constraints.confine_pointer(surface, pointer, None, Lifetime::Persistent);
-
-    confined_pointer.quick_assign(move |_, _, _| {});
-
-    confined_pointer.detach()
-}
-
-pub(super) fn init_locked_pointer(
-    pointer_constraints: &Attached<ZwpPointerConstraintsV1>,
-    surface: &WlSurface,
-    pointer: &WlPointer,
-) -> ZwpLockedPointerV1 {
-    let locked_pointer =
-        pointer_constraints.lock_pointer(surface, pointer, None, Lifetime::Persistent);
-
-    locked_pointer.quick_assign(move |_, _, _| {});
-
-    locked_pointer.detach()
-}

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

@@ -1,122 +0,0 @@
-//! Handling of IME events.
-
-use sctk::reexports::client::Main;
-use sctk::reexports::protocols::unstable::text_input::v3::client::zwp_text_input_v3::{
-    Event as TextInputEvent, ZwpTextInputV3,
-};
-
-use crate::event::{Ime, WindowEvent};
-use crate::platform_impl::wayland;
-use crate::platform_impl::wayland::event_loop::WinitState;
-
-use super::{Preedit, TextInputHandler, TextInputInner, ZwpTextInputV3Ext};
-
-#[inline]
-pub(super) fn handle_text_input(
-    text_input: Main<ZwpTextInputV3>,
-    inner: &mut TextInputInner,
-    event: TextInputEvent,
-    winit_state: &mut WinitState,
-) {
-    let event_sink = &mut winit_state.event_sink;
-    match event {
-        TextInputEvent::Enter { surface } => {
-            let window_id = wayland::make_wid(&surface);
-
-            let window_handle = match winit_state.window_map.get_mut(&window_id) {
-                Some(window_handle) => window_handle,
-                None => return,
-            };
-            inner.target_window_id = Some(window_id);
-
-            // Enable text input on that surface.
-            if window_handle.ime_allowed.get() {
-                text_input.enable();
-                text_input.set_content_type_by_purpose(window_handle.ime_purpose.get());
-                text_input.commit();
-                event_sink.push_window_event(WindowEvent::Ime(Ime::Enabled), window_id);
-            }
-
-            // Notify a window we're currently over about text input handler.
-            let text_input_handler = TextInputHandler {
-                text_input: text_input.detach(),
-            };
-            window_handle.text_input_entered(text_input_handler);
-        }
-        TextInputEvent::Leave { surface } => {
-            // Always issue a disable.
-            text_input.disable();
-            text_input.commit();
-
-            let window_id = wayland::make_wid(&surface);
-
-            let window_handle = match winit_state.window_map.get_mut(&window_id) {
-                Some(window_handle) => window_handle,
-                None => return,
-            };
-
-            inner.target_window_id = None;
-
-            // Remove text input handler from the window we're leaving.
-            let text_input_handler = TextInputHandler {
-                text_input: text_input.detach(),
-            };
-            window_handle.text_input_left(text_input_handler);
-            event_sink.push_window_event(WindowEvent::Ime(Ime::Disabled), window_id);
-        }
-        TextInputEvent::PreeditString {
-            text,
-            cursor_begin,
-            cursor_end,
-        } => {
-            let text = text.unwrap_or_default();
-            let cursor_begin = usize::try_from(cursor_begin)
-                .ok()
-                .and_then(|idx| text.is_char_boundary(idx).then(|| idx));
-            let cursor_end = usize::try_from(cursor_end)
-                .ok()
-                .and_then(|idx| text.is_char_boundary(idx).then(|| idx));
-
-            inner.pending_preedit = Some(Preedit {
-                text,
-                cursor_begin,
-                cursor_end,
-            });
-        }
-        TextInputEvent::CommitString { text } => {
-            // Update currenly commited string and reset previous preedit.
-            inner.pending_preedit = None;
-            inner.pending_commit = Some(text.unwrap_or_default());
-        }
-        TextInputEvent::Done { .. } => {
-            let window_id = match inner.target_window_id {
-                Some(window_id) => window_id,
-                _ => return,
-            };
-
-            // Clear preedit at the start of `Done`.
-            event_sink.push_window_event(
-                WindowEvent::Ime(Ime::Preedit(String::new(), None)),
-                window_id,
-            );
-
-            // Send `Commit`.
-            if let Some(text) = inner.pending_commit.take() {
-                event_sink.push_window_event(WindowEvent::Ime(Ime::Commit(text)), window_id);
-            }
-
-            // Send preedit.
-            if let Some(preedit) = inner.pending_preedit.take() {
-                let cursor_range = preedit
-                    .cursor_begin
-                    .map(|b| (b, preedit.cursor_end.unwrap_or(b)));
-
-                event_sink.push_window_event(
-                    WindowEvent::Ime(Ime::Preedit(preedit.text, cursor_range)),
-                    window_id,
-                );
-            }
-        }
-        _ => (),
-    }
-}

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

@@ -1,112 +0,0 @@
-use sctk::reexports::client::protocol::wl_seat::WlSeat;
-use sctk::reexports::client::Attached;
-use sctk::reexports::protocols::unstable::text_input::v3::client::zwp_text_input_manager_v3::ZwpTextInputManagerV3;
-use sctk::reexports::protocols::unstable::text_input::v3::client::zwp_text_input_v3::{
-    ContentHint, ContentPurpose, ZwpTextInputV3,
-};
-
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::WindowId;
-use crate::window::ImePurpose;
-
-mod handlers;
-
-/// A handler for text input that we're advertising for `WindowHandle`.
-#[derive(Eq, PartialEq)]
-pub struct TextInputHandler {
-    text_input: ZwpTextInputV3,
-}
-
-trait ZwpTextInputV3Ext {
-    fn set_content_type_by_purpose(&self, purpose: ImePurpose);
-}
-
-impl ZwpTextInputV3Ext for ZwpTextInputV3 {
-    fn set_content_type_by_purpose(&self, purpose: ImePurpose) {
-        let (hint, purpose) = match purpose {
-            ImePurpose::Normal => (ContentHint::None, ContentPurpose::Normal),
-            ImePurpose::Password => (ContentHint::SensitiveData, ContentPurpose::Password),
-            ImePurpose::Terminal => (ContentHint::None, ContentPurpose::Terminal),
-        };
-        self.set_content_type(hint, purpose);
-    }
-}
-
-impl TextInputHandler {
-    #[inline]
-    pub fn set_ime_position(&self, x: i32, y: i32) {
-        self.text_input.set_cursor_rectangle(x, y, 0, 0);
-        self.text_input.commit();
-    }
-
-    #[inline]
-    pub fn set_content_type_by_purpose(&self, purpose: ImePurpose) {
-        self.text_input.set_content_type_by_purpose(purpose);
-        self.text_input.commit();
-    }
-
-    #[inline]
-    pub fn set_input_allowed(&self, allowed: Option<ImePurpose>) {
-        if let Some(purpose) = allowed {
-            self.text_input.set_content_type_by_purpose(purpose);
-            self.text_input.enable();
-        } else {
-            self.text_input.disable();
-        }
-
-        self.text_input.commit();
-    }
-}
-
-/// A wrapper around text input to automatically destroy the object on `Drop`.
-pub struct TextInput {
-    text_input: Attached<ZwpTextInputV3>,
-}
-
-impl TextInput {
-    pub fn new(seat: &Attached<WlSeat>, text_input_manager: &ZwpTextInputManagerV3) -> Self {
-        let text_input = text_input_manager.get_text_input(seat);
-        let mut text_input_inner = TextInputInner::new();
-        text_input.quick_assign(move |text_input, event, mut dispatch_data| {
-            let winit_state = dispatch_data.get::<WinitState>().unwrap();
-            handlers::handle_text_input(text_input, &mut text_input_inner, event, winit_state);
-        });
-
-        let text_input: Attached<ZwpTextInputV3> = text_input.into();
-
-        Self { text_input }
-    }
-}
-
-impl Drop for TextInput {
-    fn drop(&mut self) {
-        self.text_input.destroy();
-    }
-}
-
-struct TextInputInner {
-    /// Currently focused surface.
-    target_window_id: Option<WindowId>,
-
-    /// Pending commit event which will be dispatched on `text_input_v3::Done`.
-    pending_commit: Option<String>,
-
-    /// Pending preedit event which will be dispatched on `text_input_v3::Done`.
-    pending_preedit: Option<Preedit>,
-}
-
-struct Preedit {
-    text: String,
-    cursor_begin: Option<usize>,
-    cursor_end: Option<usize>,
-}
-
-impl TextInputInner {
-    fn new() -> Self {
-        Self {
-            target_window_id: None,
-            pending_commit: None,
-            pending_preedit: None,
-        }
-    }
-}

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

@@ -1,144 +0,0 @@
-//! Various handlers for touch events.
-
-use sctk::reexports::client::protocol::wl_touch::Event as TouchEvent;
-
-use crate::dpi::LogicalPosition;
-use crate::event::{TouchPhase, WindowEvent};
-
-use crate::platform_impl::wayland::event_loop::WinitState;
-use crate::platform_impl::wayland::{self, DeviceId};
-
-use super::{TouchInner, TouchPoint};
-
-/// Handle WlTouch events.
-#[inline]
-pub(super) fn handle_touch(
-    event: TouchEvent,
-    inner: &mut TouchInner,
-    winit_state: &mut WinitState,
-) {
-    let event_sink = &mut winit_state.event_sink;
-
-    match event {
-        TouchEvent::Down {
-            surface, id, x, y, ..
-        } => {
-            let window_id = wayland::make_wid(&surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-
-            let scale_factor = window_handle.scale_factor();
-            let position = LogicalPosition::new(x, y);
-
-            event_sink.push_window_event(
-                WindowEvent::Touch(crate::event::Touch {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    phase: TouchPhase::Started,
-                    location: position.to_physical(scale_factor),
-                    force: None, // TODO
-                    id: id as u64,
-                }),
-                window_id,
-            );
-
-            // For `TouchEvent::Up` we don't receive a position, so we're tracking active
-            // touch points. Update either a known touch id or register a new one.
-            if let Some(i) = inner.touch_points.iter().position(|p| p.id == id) {
-                inner.touch_points[i].position = position;
-            } else {
-                inner
-                    .touch_points
-                    .push(TouchPoint::new(surface, position, id));
-            }
-        }
-        TouchEvent::Up { id, .. } => {
-            let touch_point = match inner.touch_points.iter().find(|p| p.id == id) {
-                Some(touch_point) => touch_point,
-                None => return,
-            };
-
-            let window_id = wayland::make_wid(&touch_point.surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-            let scale_factor = window_handle.scale_factor();
-            let location = touch_point.position.to_physical(scale_factor);
-            let window_id = wayland::make_wid(&touch_point.surface);
-
-            event_sink.push_window_event(
-                WindowEvent::Touch(crate::event::Touch {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    phase: TouchPhase::Ended,
-                    location,
-                    force: None, // TODO
-                    id: id as u64,
-                }),
-                window_id,
-            );
-        }
-        TouchEvent::Motion { id, x, y, .. } => {
-            let touch_point = match inner.touch_points.iter_mut().find(|p| p.id == id) {
-                Some(touch_point) => touch_point,
-                None => return,
-            };
-            let window_id = wayland::make_wid(&touch_point.surface);
-            let window_handle = match winit_state.window_map.get(&window_id) {
-                Some(w) => w,
-                _ => return,
-            };
-
-            touch_point.position = LogicalPosition::new(x, y);
-
-            let scale_factor = window_handle.scale_factor();
-            let location = touch_point.position.to_physical(scale_factor);
-            let window_id = wayland::make_wid(&touch_point.surface);
-
-            event_sink.push_window_event(
-                WindowEvent::Touch(crate::event::Touch {
-                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                        DeviceId,
-                    )),
-                    phase: TouchPhase::Moved,
-                    location,
-                    force: None, // TODO
-                    id: id as u64,
-                }),
-                window_id,
-            );
-        }
-        TouchEvent::Frame => (),
-        TouchEvent::Cancel => {
-            for touch_point in inner.touch_points.drain(..) {
-                let window_id = wayland::make_wid(&touch_point.surface);
-                let window_handle = match winit_state.window_map.get(&window_id) {
-                    Some(w) => w,
-                    _ => return,
-                };
-
-                let scale_factor = window_handle.scale_factor();
-                let location = touch_point.position.to_physical(scale_factor);
-
-                event_sink.push_window_event(
-                    WindowEvent::Touch(crate::event::Touch {
-                        device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
-                            DeviceId,
-                        )),
-                        phase: TouchPhase::Cancelled,
-                        location,
-                        force: None, // TODO
-                        id: touch_point.id as u64,
-                    }),
-                    window_id,
-                );
-            }
-        }
-        _ => (),
-    }
-}

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

@@ -1,78 +0,0 @@
-//! Touch handling.
-
-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::Attached;
-
-use crate::dpi::LogicalPosition;
-
-use crate::platform_impl::wayland::event_loop::WinitState;
-
-mod handlers;
-
-/// Wrapper around touch to handle release.
-pub struct Touch {
-    /// Proxy to touch.
-    touch: WlTouch,
-}
-
-impl Touch {
-    pub fn new(seat: &Attached<WlSeat>) -> Self {
-        let touch = seat.get_touch();
-        let mut inner = TouchInner::new();
-
-        touch.quick_assign(move |_, event, mut dispatch_data| {
-            let winit_state = dispatch_data.get::<WinitState>().unwrap();
-            handlers::handle_touch(event, &mut inner, winit_state);
-        });
-
-        Self {
-            touch: touch.detach(),
-        }
-    }
-}
-
-impl Drop for Touch {
-    fn drop(&mut self) {
-        if self.touch.as_ref().version() >= 3 {
-            self.touch.release();
-        }
-    }
-}
-
-/// The data used by touch handlers.
-pub(super) struct TouchInner {
-    /// Current touch points.
-    touch_points: Vec<TouchPoint>,
-}
-
-impl TouchInner {
-    fn new() -> Self {
-        Self {
-            touch_points: Vec::new(),
-        }
-    }
-}
-
-/// Location of touch press.
-pub(super) struct TouchPoint {
-    /// A surface where the touch point is located.
-    surface: WlSurface,
-
-    /// Location of the touch point.
-    position: LogicalPosition<f64>,
-
-    /// Id.
-    id: i32,
-}
-
-impl TouchPoint {
-    pub fn new(surface: WlSurface, position: LogicalPosition<f64>, id: i32) -> Self {
-        Self {
-            surface,
-            position,
-            id,
-        }
-    }
-}

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

@@ -1,748 +0,0 @@
-use std::collections::VecDeque;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-
-use sctk::reexports::client::protocol::wl_surface::WlSurface;
-use sctk::reexports::client::Display;
-
-use sctk::reexports::calloop;
-
-use raw_window_handle::{
-    RawDisplayHandle, RawWindowHandle, WaylandDisplayHandle, WaylandWindowHandle,
-};
-use sctk::window::Decorations;
-use wayland_protocols::viewporter::client::wp_viewporter::WpViewporter;
-
-use crate::dpi::{LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
-use crate::error::{ExternalError, NotSupportedError, OsError as RootOsError};
-use crate::platform_impl::{
-    wayland::protocols::wp_fractional_scale_manager_v1::WpFractionalScaleManagerV1,
-    wayland::protocols::wp_fractional_scale_v1, Fullscreen, MonitorHandle as PlatformMonitorHandle,
-    OsError, PlatformSpecificWindowBuilderAttributes as PlatformAttributes,
-};
-use crate::window::{
-    CursorGrabMode, CursorIcon, ImePurpose, ResizeDirection, Theme, UserAttentionType,
-    WindowAttributes, WindowButtons,
-};
-
-use super::env::WindowingFeatures;
-use super::event_loop::WinitState;
-use super::output::{MonitorHandle, OutputManagerHandle};
-use super::{EventLoopWindowTarget, WindowId};
-
-pub mod shim;
-
-use shim::{
-    FractionalScalingState, WindowCompositorUpdate, WindowHandle, WindowRequest, WindowUserRequest,
-};
-
-#[cfg(feature = "sctk-adwaita")]
-pub type WinitFrame = sctk_adwaita::AdwaitaFrame;
-#[cfg(not(feature = "sctk-adwaita"))]
-pub type WinitFrame = sctk::window::FallbackFrame;
-
-#[cfg(feature = "sctk-adwaita")]
-const WAYLAND_CSD_THEME_ENV_VAR: &str = "WINIT_WAYLAND_CSD_THEME";
-
-pub struct Window {
-    /// Window id.
-    window_id: WindowId,
-
-    /// The Wayland display.
-    display: Display,
-
-    /// The underlying wl_surface.
-    surface: WlSurface,
-
-    /// The scale factor.
-    scale_factor: Arc<Mutex<f64>>,
-
-    /// The current window size.
-    size: Arc<Mutex<LogicalSize<u32>>>,
-
-    /// A handle to output manager.
-    output_manager_handle: OutputManagerHandle,
-
-    /// Event loop proxy to wake it up.
-    event_loop_awakener: calloop::ping::Ping,
-
-    /// Fullscreen state.
-    fullscreen: Arc<AtomicBool>,
-
-    /// Maximized state.
-    maximized: Arc<AtomicBool>,
-
-    /// Available windowing features.
-    windowing_features: WindowingFeatures,
-
-    /// Requests that SCTK window should perform.
-    window_requests: Arc<Mutex<Vec<WindowRequest>>>,
-
-    /// Whether the window is resizeable.
-    resizeable: AtomicBool,
-
-    /// Whether the window is decorated.
-    decorated: AtomicBool,
-
-    /// Grabbing mode.
-    cursor_grab_mode: Mutex<CursorGrabMode>,
-
-    /// Whether the window has keyboard focus.
-    has_focus: Arc<AtomicBool>,
-}
-
-impl Window {
-    pub(crate) fn new<T>(
-        event_loop_window_target: &EventLoopWindowTarget<T>,
-        attributes: WindowAttributes,
-        platform_attributes: PlatformAttributes,
-    ) -> Result<Self, RootOsError> {
-        let viewporter = event_loop_window_target.env.get_global::<WpViewporter>();
-        let fractional_scale_manager = event_loop_window_target
-            .env
-            .get_global::<WpFractionalScaleManagerV1>();
-
-        // Create surface and register callback for the scale factor changes.
-        let mut scale_factor = 1.;
-        let (surface, fractional_scaling_state) =
-            if let (Some(viewporter), Some(fractional_scale_manager)) =
-                (viewporter, fractional_scale_manager)
-            {
-                let surface = event_loop_window_target.env.create_surface().detach();
-                let fractional_scale = fractional_scale_manager.get_fractional_scale(&surface);
-
-                let window_id = super::make_wid(&surface);
-                fractional_scale.quick_assign(move |_, event, mut dispatch_data| {
-                    let wp_fractional_scale_v1::Event::PreferredScale { scale } = event;
-                    let winit_state = dispatch_data.get::<WinitState>().unwrap();
-                    apply_scale(window_id, scale as f64 / 120., winit_state);
-                });
-
-                let fractional_scale = fractional_scale.detach();
-                let viewport = viewporter.get_viewport(&surface).detach();
-                let fractional_scaling_state =
-                    FractionalScalingState::new(viewport, fractional_scale);
-
-                (surface, Some(fractional_scaling_state))
-            } else {
-                let surface = event_loop_window_target
-                    .env
-                    .create_surface_with_scale_callback(move |scale, surface, mut dispatch_data| {
-                        let winit_state = dispatch_data.get::<WinitState>().unwrap();
-
-                        // Get the window that received the event.
-                        let window_id = super::make_wid(&surface);
-                        apply_scale(window_id, scale as f64, winit_state);
-                        surface.set_buffer_scale(scale);
-                    })
-                    .detach();
-
-                scale_factor = sctk::get_surface_scale_factor(&surface) as _;
-
-                (surface, None)
-            };
-
-        let window_id = super::make_wid(&surface);
-        let maximized = Arc::new(AtomicBool::new(false));
-        let maximized_clone = maximized.clone();
-        let fullscreen = Arc::new(AtomicBool::new(false));
-        let fullscreen_clone = fullscreen.clone();
-
-        let (width, height) = attributes
-            .inner_size
-            .map(|size| size.to_logical::<f64>(scale_factor).into())
-            .unwrap_or((800, 600));
-
-        let theme_manager = event_loop_window_target.theme_manager.clone();
-        let mut window = event_loop_window_target
-            .env
-            .create_window::<WinitFrame, _>(
-                surface.clone(),
-                Some(theme_manager),
-                (width, height),
-                move |event, mut dispatch_data| {
-                    use sctk::window::{Event, State};
-
-                    let winit_state = dispatch_data.get::<WinitState>().unwrap();
-                    let mut window_compositor_update = winit_state
-                        .window_compositor_updates
-                        .get_mut(&window_id)
-                        .unwrap();
-
-                    let mut window_user_requests = winit_state
-                        .window_user_requests
-                        .get_mut(&window_id)
-                        .unwrap();
-
-                    match event {
-                        Event::Refresh => {
-                            window_user_requests.refresh_frame = true;
-                        }
-                        Event::Configure { new_size, states } => {
-                            let is_maximized = states.contains(&State::Maximized);
-                            maximized_clone.store(is_maximized, Ordering::Relaxed);
-                            let is_fullscreen = states.contains(&State::Fullscreen);
-                            fullscreen_clone.store(is_fullscreen, Ordering::Relaxed);
-
-                            window_user_requests.refresh_frame = true;
-                            if let Some((w, h)) = new_size {
-                                window_compositor_update.size = Some(LogicalSize::new(w, h));
-                            }
-                        }
-                        Event::Close => {
-                            window_compositor_update.close_window = true;
-                        }
-                    }
-                },
-            )
-            .map_err(|_| os_error!(OsError::WaylandMisc("failed to create window.")))?;
-
-        // Set CSD frame config from theme if specified,
-        // otherwise use upstream automatic selection.
-        #[cfg(feature = "sctk-adwaita")]
-        if let Some(theme) = attributes.preferred_theme.or_else(|| {
-            std::env::var(WAYLAND_CSD_THEME_ENV_VAR)
-                .ok()
-                .and_then(|s| s.as_str().try_into().ok())
-        }) {
-            window.set_frame_config(theme.into());
-        }
-
-        // Set decorations.
-        if attributes.decorations {
-            window.set_decorate(Decorations::FollowServer);
-        } else {
-            window.set_decorate(Decorations::None);
-        }
-
-        // Min dimensions.
-        let min_size = attributes
-            .min_inner_size
-            .map(|size| size.to_logical::<f64>(scale_factor).into());
-        window.set_min_size(min_size);
-
-        // Max dimensions.
-        let max_size = attributes
-            .max_inner_size
-            .map(|size| size.to_logical::<f64>(scale_factor).into());
-        window.set_max_size(max_size);
-
-        // Set Wayland specific window attributes.
-        if let Some(name) = platform_attributes.name {
-            window.set_app_id(name.general);
-        }
-
-        // Set common window attributes.
-        //
-        // We set resizable after other attributes, since it touches min and max size under
-        // the hood.
-        window.set_resizable(attributes.resizable);
-        window.set_title(attributes.title);
-
-        // Set fullscreen/maximized if so was requested.
-        match attributes.fullscreen.map(Into::into) {
-            Some(Fullscreen::Exclusive(_)) => {
-                warn!("`Fullscreen::Exclusive` is ignored on Wayland")
-            }
-            Some(Fullscreen::Borderless(monitor)) => {
-                let monitor = monitor.and_then(|monitor| match monitor {
-                    PlatformMonitorHandle::Wayland(monitor) => Some(monitor.proxy),
-                    #[cfg(x11_platform)]
-                    PlatformMonitorHandle::X(_) => None,
-                });
-
-                window.set_fullscreen(monitor.as_ref());
-            }
-            None => {
-                if attributes.maximized {
-                    window.set_maximized();
-                }
-            }
-        }
-
-        // Without this commit here at least on kwin 5.23.3 the initial configure
-        // will have a size (1,1), the second configure including the decoration
-        // mode will have the min_size as its size. With this commit the initial
-        // configure will have no size, the application will draw it's content
-        // with the initial size and everything works as expected afterwards.
-        //
-        // The window commit must be after setting on top level properties, but right before any
-        // buffer attachments commits.
-        window.surface().commit();
-
-        let size = Arc::new(Mutex::new(LogicalSize::new(width, height)));
-        let has_focus = Arc::new(AtomicBool::new(true));
-
-        // We should trigger redraw and commit the surface for the newly created window.
-        let mut window_user_request = WindowUserRequest::new();
-        window_user_request.refresh_frame = true;
-        window_user_request.redraw_requested = true;
-
-        let window_id = super::make_wid(&surface);
-        let window_requests = Arc::new(Mutex::new(Vec::with_capacity(64)));
-
-        // Create a handle that performs all the requests on underlying sctk a window.
-        let window_handle = WindowHandle::new(
-            &event_loop_window_target.env,
-            window,
-            size.clone(),
-            has_focus.clone(),
-            fractional_scaling_state,
-            scale_factor,
-            window_requests.clone(),
-        );
-
-        // Set opaque region.
-        window_handle.set_transparent(attributes.transparent);
-
-        // Set resizable state, so we can determine how to handle `Window::set_inner_size`.
-        window_handle.is_resizable.set(attributes.resizable);
-
-        let mut winit_state = event_loop_window_target.state.borrow_mut();
-
-        winit_state.window_map.insert(window_id, window_handle);
-
-        // On Wayland window doesn't have Focus by default and it'll get it later on. So be
-        // explicit here.
-        winit_state
-            .event_sink
-            .push_window_event(crate::event::WindowEvent::Focused(false), window_id);
-
-        // Add state for the window.
-        winit_state
-            .window_user_requests
-            .insert(window_id, window_user_request);
-        winit_state
-            .window_compositor_updates
-            .insert(window_id, WindowCompositorUpdate::new());
-
-        let windowing_features = event_loop_window_target.windowing_features;
-
-        // To make our window usable for drawing right away we must `ack` a `configure`
-        // from the server, the acking part here is done by SCTK window frame, so we just
-        // need to sync with server so it'll be done automatically for us.
-        {
-            let mut wayland_source = event_loop_window_target.wayland_dispatcher.as_source_mut();
-            let event_queue = wayland_source.queue();
-            let _ = event_queue.sync_roundtrip(&mut *winit_state, |_, _, _| unreachable!());
-        }
-
-        // We all praise GNOME for these 3 lines of pure magic. If we don't do that,
-        // GNOME will shrink our window a bit for the size of the decorations. I guess it
-        // happens because we haven't committed them with buffers to the server.
-        let window_handle = winit_state.window_map.get_mut(&window_id).unwrap();
-        window_handle.window.refresh();
-
-        let output_manager_handle = event_loop_window_target.output_manager.handle();
-
-        let window = Self {
-            window_id,
-            surface,
-            display: event_loop_window_target.display.clone(),
-            output_manager_handle,
-            size,
-            window_requests,
-            event_loop_awakener: event_loop_window_target.event_loop_awakener.clone(),
-            fullscreen,
-            maximized,
-            windowing_features,
-            resizeable: AtomicBool::new(attributes.resizable),
-            decorated: AtomicBool::new(attributes.decorations),
-            cursor_grab_mode: Mutex::new(CursorGrabMode::None),
-            has_focus,
-            scale_factor: window_handle.scale_factor.clone(),
-        };
-
-        Ok(window)
-    }
-}
-
-impl Window {
-    #[inline]
-    pub fn id(&self) -> WindowId {
-        self.window_id
-    }
-
-    #[inline]
-    pub fn set_title(&self, title: &str) {
-        self.send_request(WindowRequest::Title(title.to_owned()));
-    }
-
-    #[inline]
-    pub fn set_transparent(&self, transparent: bool) {
-        self.send_request(WindowRequest::Transparent(transparent));
-    }
-
-    #[inline]
-    pub fn set_visible(&self, _visible: bool) {
-        // Not possible on Wayland.
-    }
-
-    #[inline]
-    pub fn is_visible(&self) -> Option<bool> {
-        None
-    }
-
-    #[inline]
-    pub fn outer_position(&self) -> Result<PhysicalPosition<i32>, NotSupportedError> {
-        Err(NotSupportedError::new())
-    }
-
-    #[inline]
-    pub fn inner_position(&self) -> Result<PhysicalPosition<i32>, NotSupportedError> {
-        Err(NotSupportedError::new())
-    }
-
-    #[inline]
-    pub fn set_outer_position(&self, _: Position) {
-        // Not possible on Wayland.
-    }
-
-    pub fn inner_size(&self) -> PhysicalSize<u32> {
-        self.size.lock().unwrap().to_physical(self.scale_factor())
-    }
-
-    #[inline]
-    pub fn request_redraw(&self) {
-        self.send_request(WindowRequest::Redraw);
-    }
-
-    #[inline]
-    pub fn outer_size(&self) -> PhysicalSize<u32> {
-        self.size.lock().unwrap().to_physical(self.scale_factor())
-    }
-
-    #[inline]
-    pub fn set_inner_size(&self, size: Size) {
-        let scale_factor = self.scale_factor();
-
-        let size = size.to_logical::<u32>(scale_factor);
-        *self.size.lock().unwrap() = size;
-
-        self.send_request(WindowRequest::FrameSize(size));
-    }
-
-    #[inline]
-    pub fn set_min_inner_size(&self, dimensions: Option<Size>) {
-        let scale_factor = self.scale_factor();
-        let size = dimensions.map(|size| size.to_logical::<u32>(scale_factor));
-
-        self.send_request(WindowRequest::MinSize(size));
-    }
-
-    #[inline]
-    pub fn set_max_inner_size(&self, dimensions: Option<Size>) {
-        let scale_factor = self.scale_factor();
-        let size = dimensions.map(|size| size.to_logical::<u32>(scale_factor));
-
-        self.send_request(WindowRequest::MaxSize(size));
-    }
-
-    #[inline]
-    pub fn resize_increments(&self) -> Option<PhysicalSize<u32>> {
-        None
-    }
-
-    #[inline]
-    pub fn set_resize_increments(&self, _increments: Option<Size>) {
-        warn!("`set_resize_increments` is not implemented for Wayland");
-    }
-
-    #[inline]
-    pub fn set_resizable(&self, resizable: bool) {
-        self.resizeable.store(resizable, Ordering::Relaxed);
-        self.send_request(WindowRequest::Resizeable(resizable));
-    }
-
-    #[inline]
-    pub fn is_resizable(&self) -> bool {
-        self.resizeable.load(Ordering::Relaxed)
-    }
-
-    #[inline]
-    pub fn set_enabled_buttons(&self, _buttons: WindowButtons) {}
-
-    #[inline]
-    pub fn enabled_buttons(&self) -> WindowButtons {
-        WindowButtons::all()
-    }
-
-    #[inline]
-    pub fn scale_factor(&self) -> f64 {
-        *self.scale_factor.lock().unwrap()
-    }
-
-    #[inline]
-    pub fn set_decorations(&self, decorate: bool) {
-        self.decorated.store(decorate, Ordering::Relaxed);
-        self.send_request(WindowRequest::Decorate(decorate));
-    }
-
-    #[inline]
-    pub fn is_decorated(&self) -> bool {
-        self.decorated.load(Ordering::Relaxed)
-    }
-
-    #[inline]
-    pub fn is_minimized(&self) -> Option<bool> {
-        None
-    }
-
-    #[inline]
-    pub fn set_minimized(&self, minimized: bool) {
-        // You can't unminimize the window on Wayland.
-        if !minimized {
-            return;
-        }
-
-        self.send_request(WindowRequest::Minimize);
-    }
-
-    #[inline]
-    pub fn is_maximized(&self) -> bool {
-        self.maximized.load(Ordering::Relaxed)
-    }
-
-    #[inline]
-    pub fn set_maximized(&self, maximized: bool) {
-        self.send_request(WindowRequest::Maximize(maximized));
-    }
-
-    #[inline]
-    pub(crate) fn fullscreen(&self) -> Option<Fullscreen> {
-        if self.fullscreen.load(Ordering::Relaxed) {
-            let current_monitor = self.current_monitor().map(PlatformMonitorHandle::Wayland);
-
-            Some(Fullscreen::Borderless(current_monitor))
-        } else {
-            None
-        }
-    }
-
-    #[inline]
-    pub(crate) fn set_fullscreen(&self, fullscreen: Option<Fullscreen>) {
-        let fullscreen_request = match fullscreen {
-            Some(Fullscreen::Exclusive(_)) => {
-                warn!("`Fullscreen::Exclusive` is ignored on Wayland");
-                return;
-            }
-            Some(Fullscreen::Borderless(monitor)) => {
-                let monitor = monitor.and_then(|monitor| match monitor {
-                    PlatformMonitorHandle::Wayland(monitor) => Some(monitor.proxy),
-                    #[cfg(x11_platform)]
-                    PlatformMonitorHandle::X(_) => None,
-                });
-
-                WindowRequest::Fullscreen(monitor)
-            }
-            None => WindowRequest::UnsetFullscreen,
-        };
-
-        self.send_request(fullscreen_request);
-    }
-
-    #[inline]
-    pub fn set_cursor_icon(&self, cursor: CursorIcon) {
-        self.send_request(WindowRequest::NewCursorIcon(cursor));
-    }
-
-    #[inline]
-    pub fn set_cursor_visible(&self, visible: bool) {
-        self.send_request(WindowRequest::ShowCursor(visible));
-    }
-
-    #[inline]
-    pub fn set_cursor_grab(&self, mode: CursorGrabMode) -> Result<(), ExternalError> {
-        if !self.windowing_features.pointer_constraints() {
-            if mode == CursorGrabMode::None {
-                return Ok(());
-            }
-
-            return Err(ExternalError::NotSupported(NotSupportedError::new()));
-        }
-
-        *self.cursor_grab_mode.lock().unwrap() = mode;
-        self.send_request(WindowRequest::SetCursorGrabMode(mode));
-
-        Ok(())
-    }
-
-    pub fn request_user_attention(&self, request_type: Option<UserAttentionType>) {
-        if !self.windowing_features.xdg_activation() {
-            warn!("`request_user_attention` isn't supported");
-            return;
-        }
-
-        self.send_request(WindowRequest::Attention(request_type));
-    }
-
-    #[inline]
-    pub fn set_cursor_position(&self, position: Position) -> Result<(), ExternalError> {
-        // Positon can be set only for locked cursor.
-        if *self.cursor_grab_mode.lock().unwrap() != CursorGrabMode::Locked {
-            return Err(ExternalError::Os(os_error!(OsError::WaylandMisc(
-                "cursor position can be set only for locked cursor."
-            ))));
-        }
-
-        let scale_factor = self.scale_factor();
-        let position = position.to_logical(scale_factor);
-        self.send_request(WindowRequest::SetLockedCursorPosition(position));
-
-        Ok(())
-    }
-
-    #[inline]
-    pub fn drag_window(&self) -> Result<(), ExternalError> {
-        self.send_request(WindowRequest::DragWindow);
-
-        Ok(())
-    }
-
-    #[inline]
-    pub fn drag_resize_window(&self, _direction: ResizeDirection) -> Result<(), ExternalError> {
-        Err(ExternalError::NotSupported(NotSupportedError::new()))
-    }
-
-    #[inline]
-    pub fn set_cursor_hittest(&self, hittest: bool) -> Result<(), ExternalError> {
-        self.send_request(WindowRequest::PassthroughMouseInput(!hittest));
-
-        Ok(())
-    }
-
-    #[inline]
-    pub fn set_ime_position(&self, position: Position) {
-        let scale_factor = self.scale_factor();
-        let position = position.to_logical(scale_factor);
-        self.send_request(WindowRequest::ImePosition(position));
-    }
-
-    #[inline]
-    pub fn set_ime_allowed(&self, allowed: bool) {
-        self.send_request(WindowRequest::AllowIme(allowed));
-    }
-
-    #[inline]
-    pub fn set_ime_purpose(&self, purpose: ImePurpose) {
-        self.send_request(WindowRequest::ImePurpose(purpose));
-    }
-
-    #[inline]
-    pub fn display(&self) -> &Display {
-        &self.display
-    }
-
-    #[inline]
-    pub fn surface(&self) -> &WlSurface {
-        &self.surface
-    }
-
-    #[inline]
-    pub fn current_monitor(&self) -> Option<MonitorHandle> {
-        let output = sctk::get_surface_outputs(&self.surface).last()?.clone();
-        Some(MonitorHandle::new(output))
-    }
-
-    #[inline]
-    pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
-        self.output_manager_handle.available_outputs()
-    }
-
-    #[inline]
-    pub fn primary_monitor(&self) -> Option<PlatformMonitorHandle> {
-        None
-    }
-
-    #[inline]
-    pub fn raw_window_handle(&self) -> RawWindowHandle {
-        let mut window_handle = WaylandWindowHandle::empty();
-        window_handle.surface = self.surface.as_ref().c_ptr() as *mut _;
-        RawWindowHandle::Wayland(window_handle)
-    }
-
-    #[inline]
-    pub fn raw_display_handle(&self) -> RawDisplayHandle {
-        let mut display_handle = WaylandDisplayHandle::empty();
-        display_handle.display = self.display.get_display_ptr() as *mut _;
-        RawDisplayHandle::Wayland(display_handle)
-    }
-
-    #[inline]
-    fn send_request(&self, request: WindowRequest) {
-        self.window_requests.lock().unwrap().push(request);
-        self.event_loop_awakener.ping();
-    }
-
-    #[inline]
-    pub fn set_theme(&self, theme: Option<Theme>) {
-        self.send_request(WindowRequest::Theme(theme));
-    }
-
-    #[inline]
-    pub fn theme(&self) -> Option<Theme> {
-        None
-    }
-
-    #[inline]
-    pub fn has_focus(&self) -> bool {
-        self.has_focus.load(Ordering::Relaxed)
-    }
-
-    pub fn title(&self) -> String {
-        String::new()
-    }
-}
-
-impl Drop for Window {
-    fn drop(&mut self) {
-        self.send_request(WindowRequest::Close);
-    }
-}
-
-#[cfg(feature = "sctk-adwaita")]
-impl From<Theme> for sctk_adwaita::FrameConfig {
-    fn from(theme: Theme) -> Self {
-        match theme {
-            Theme::Light => sctk_adwaita::FrameConfig::light(),
-            Theme::Dark => sctk_adwaita::FrameConfig::dark(),
-        }
-    }
-}
-
-impl TryFrom<&str> for Theme {
-    type Error = ();
-
-    /// ```
-    /// use winit::window::Theme;
-    ///
-    /// assert_eq!("dark".try_into(), Ok(Theme::Dark));
-    /// assert_eq!("lIghT".try_into(), Ok(Theme::Light));
-    /// ```
-    fn try_from(theme: &str) -> Result<Self, Self::Error> {
-        if theme.eq_ignore_ascii_case("dark") {
-            Ok(Self::Dark)
-        } else if theme.eq_ignore_ascii_case("light") {
-            Ok(Self::Light)
-        } else {
-            Err(())
-        }
-    }
-}
-
-/// Set pending scale for the provided `window_id`.
-fn apply_scale(window_id: WindowId, scale: f64, winit_state: &mut WinitState) {
-    // Set pending scale factor.
-    winit_state
-        .window_compositor_updates
-        .get_mut(&window_id)
-        .unwrap()
-        .scale_factor = Some(scale);
-
-    // Mark that we need a frame refresh on the DPI change.
-    winit_state
-        .window_user_requests
-        .get_mut(&window_id)
-        .unwrap()
-        .refresh_frame = true;
-}

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

@@ -1,666 +0,0 @@
-use std::cell::Cell;
-use std::mem::ManuallyDrop;
-use std::sync::atomic::AtomicBool;
-use std::sync::{Arc, Mutex};
-
-use sctk::reexports::client::protocol::wl_compositor::WlCompositor;
-use sctk::reexports::client::protocol::wl_output::WlOutput;
-use sctk::reexports::client::Attached;
-use sctk::reexports::protocols::staging::xdg_activation::v1::client::xdg_activation_token_v1;
-use sctk::reexports::protocols::staging::xdg_activation::v1::client::xdg_activation_v1::XdgActivationV1;
-
-use sctk::environment::Environment;
-use sctk::window::{Decorations, Window};
-use wayland_protocols::viewporter::client::wp_viewport::WpViewport;
-
-use crate::dpi::{LogicalPosition, LogicalSize};
-
-use crate::event::{Ime, WindowEvent};
-use crate::platform_impl::wayland;
-use crate::platform_impl::wayland::env::WinitEnv;
-use crate::platform_impl::wayland::event_loop::{EventSink, WinitState};
-use crate::platform_impl::wayland::protocols::wp_fractional_scale_v1::WpFractionalScaleV1;
-use crate::platform_impl::wayland::seat::pointer::WinitPointer;
-use crate::platform_impl::wayland::seat::text_input::TextInputHandler;
-use crate::platform_impl::wayland::WindowId;
-use crate::window::{CursorGrabMode, CursorIcon, ImePurpose, Theme, UserAttentionType};
-
-use super::WinitFrame;
-
-/// A request to SCTK window from Winit window.
-#[derive(Debug, Clone)]
-pub enum WindowRequest {
-    /// Set fullscreen.
-    ///
-    /// Passing `None` will set it on the current monitor.
-    Fullscreen(Option<WlOutput>),
-
-    /// Unset fullscreen.
-    UnsetFullscreen,
-
-    /// Show cursor for the certain window or not.
-    ShowCursor(bool),
-
-    /// Change the cursor icon.
-    NewCursorIcon(CursorIcon),
-
-    /// Change cursor grabbing mode.
-    SetCursorGrabMode(CursorGrabMode),
-
-    /// Set cursor position.
-    SetLockedCursorPosition(LogicalPosition<u32>),
-
-    /// Drag window.
-    DragWindow,
-
-    /// Maximize the window.
-    Maximize(bool),
-
-    /// Minimize the window.
-    Minimize,
-
-    /// Request decorations change.
-    Decorate(bool),
-
-    /// Make the window resizeable.
-    Resizeable(bool),
-
-    /// Set the title for window.
-    Title(String),
-
-    /// Min size.
-    MinSize(Option<LogicalSize<u32>>),
-
-    /// Max size.
-    MaxSize(Option<LogicalSize<u32>>),
-
-    /// New frame size.
-    FrameSize(LogicalSize<u32>),
-
-    /// Set IME window position.
-    ImePosition(LogicalPosition<u32>),
-
-    /// Enable IME on the given window.
-    AllowIme(bool),
-
-    /// Set the IME purpose.
-    ImePurpose(ImePurpose),
-
-    /// Mark the window as opaque.
-    Transparent(bool),
-
-    /// Request Attention.
-    ///
-    /// `None` unsets the attention request.
-    Attention(Option<UserAttentionType>),
-
-    /// Passthrough mouse input to underlying windows.
-    PassthroughMouseInput(bool),
-
-    /// Redraw was requested.
-    Redraw,
-
-    /// Window should be closed.
-    Close,
-
-    /// Change window theme.
-    Theme(Option<Theme>),
-}
-
-// The window update comming from the compositor.
-#[derive(Default, Debug, Clone, Copy)]
-pub struct WindowCompositorUpdate {
-    /// New window size.
-    pub size: Option<LogicalSize<u32>>,
-
-    /// New scale factor.
-    pub scale_factor: Option<f64>,
-
-    /// Close the window.
-    pub close_window: bool,
-}
-
-impl WindowCompositorUpdate {
-    pub fn new() -> Self {
-        Default::default()
-    }
-}
-
-/// Pending update to a window requested by the user.
-#[derive(Default, Debug, Clone, Copy)]
-pub struct WindowUserRequest {
-    /// Whether `redraw` was requested.
-    pub redraw_requested: bool,
-
-    /// Wether the frame should be refreshed.
-    pub refresh_frame: bool,
-}
-
-impl WindowUserRequest {
-    pub fn new() -> Self {
-        Default::default()
-    }
-}
-
-/// A handle to perform operations on SCTK window
-/// and react to events.
-pub struct WindowHandle {
-    /// An actual window.
-    pub window: ManuallyDrop<Window<WinitFrame>>,
-
-    /// The state of the fractional scaling handlers for the window.
-    pub fractional_scaling_state: Option<FractionalScalingState>,
-
-    /// The scale factor of the window.
-    pub scale_factor: Arc<Mutex<f64>>,
-
-    /// The current size of the window.
-    pub size: Arc<Mutex<LogicalSize<u32>>>,
-
-    /// A pending requests to SCTK window.
-    pub pending_window_requests: Arc<Mutex<Vec<WindowRequest>>>,
-
-    /// Current cursor icon.
-    pub cursor_icon: Cell<CursorIcon>,
-
-    /// Whether the window is resizable.
-    pub is_resizable: Cell<bool>,
-
-    /// Whether the window has keyboard focus.
-    pub has_focus: Arc<AtomicBool>,
-
-    /// Allow IME events for that window.
-    pub ime_allowed: Cell<bool>,
-
-    /// IME purpose for that window.
-    pub ime_purpose: Cell<ImePurpose>,
-
-    /// Wether the window is transparent.
-    pub transparent: Cell<bool>,
-
-    /// Visible cursor or not.
-    cursor_visible: Cell<bool>,
-
-    /// Cursor confined to the surface.
-    cursor_grab_mode: Cell<CursorGrabMode>,
-
-    /// Pointers over the current surface.
-    pointers: Vec<WinitPointer>,
-
-    /// Text inputs on the current surface.
-    text_inputs: Vec<TextInputHandler>,
-
-    /// XdgActivation object.
-    xdg_activation: Option<Attached<XdgActivationV1>>,
-
-    /// Indicator whether user attention is requested.
-    attention_requested: Cell<bool>,
-
-    /// Compositor
-    compositor: Attached<WlCompositor>,
-}
-
-impl WindowHandle {
-    pub fn new(
-        env: &Environment<WinitEnv>,
-        window: Window<WinitFrame>,
-        size: Arc<Mutex<LogicalSize<u32>>>,
-        has_focus: Arc<AtomicBool>,
-        fractional_scaling_state: Option<FractionalScalingState>,
-        scale_factor: f64,
-        pending_window_requests: Arc<Mutex<Vec<WindowRequest>>>,
-    ) -> Self {
-        let xdg_activation = env.get_global::<XdgActivationV1>();
-        // Unwrap is safe, since we can't create window without compositor anyway and won't be
-        // here.
-        let compositor = env.get_global::<WlCompositor>().unwrap();
-
-        Self {
-            window: ManuallyDrop::new(window),
-            fractional_scaling_state,
-            scale_factor: Arc::new(Mutex::new(scale_factor)),
-            size,
-            pending_window_requests,
-            cursor_icon: Cell::new(CursorIcon::Default),
-            is_resizable: Cell::new(true),
-            transparent: Cell::new(false),
-            cursor_grab_mode: Cell::new(CursorGrabMode::None),
-            cursor_visible: Cell::new(true),
-            pointers: Vec::new(),
-            text_inputs: Vec::new(),
-            xdg_activation,
-            attention_requested: Cell::new(false),
-            compositor,
-            ime_allowed: Cell::new(false),
-            ime_purpose: Cell::new(ImePurpose::default()),
-            has_focus,
-        }
-    }
-
-    pub fn scale_factor(&self) -> f64 {
-        *self.scale_factor.lock().unwrap()
-    }
-
-    pub fn set_cursor_grab(&self, mode: CursorGrabMode) {
-        // The new requested state matches the current confine status, return.
-        let old_mode = self.cursor_grab_mode.replace(mode);
-        if old_mode == mode {
-            return;
-        }
-
-        // Clear old pointer data.
-        match old_mode {
-            CursorGrabMode::None => (),
-            CursorGrabMode::Confined => self.pointers.iter().for_each(|p| p.unconfine()),
-            CursorGrabMode::Locked => self.pointers.iter().for_each(|p| p.unlock()),
-        }
-
-        let surface = self.window.surface();
-        match mode {
-            CursorGrabMode::Locked => self.pointers.iter().for_each(|p| p.lock(surface)),
-            CursorGrabMode::Confined => self.pointers.iter().for_each(|p| p.confine(surface)),
-            CursorGrabMode::None => {
-                // Current lock/confine was already removed.
-            }
-        }
-    }
-
-    pub fn set_locked_cursor_position(&self, position: LogicalPosition<u32>) {
-        // XXX the cursor locking is ensured inside `Window`.
-        self.pointers
-            .iter()
-            .for_each(|p| p.set_cursor_position(position.x, position.y));
-    }
-
-    pub fn set_user_attention(&self, request_type: Option<UserAttentionType>) {
-        let xdg_activation = match self.xdg_activation.as_ref() {
-            None => return,
-            Some(xdg_activation) => xdg_activation,
-        };
-
-        //  Urgency is only removed by the compositor and there's no need to raise urgency when it
-        //  was already raised.
-        if request_type.is_none() || self.attention_requested.get() {
-            return;
-        }
-
-        let xdg_activation_token = xdg_activation.get_activation_token();
-        let surface = self.window.surface();
-        let window_id = wayland::make_wid(surface);
-        let xdg_activation = xdg_activation.clone();
-
-        xdg_activation_token.quick_assign(move |xdg_token, event, mut dispatch_data| {
-            let token = match event {
-                xdg_activation_token_v1::Event::Done { token } => token,
-                _ => return,
-            };
-
-            let winit_state = dispatch_data.get::<WinitState>().unwrap();
-            let window_handle = match winit_state.window_map.get_mut(&window_id) {
-                Some(window_handle) => window_handle,
-                None => return,
-            };
-
-            let surface = window_handle.window.surface();
-            xdg_activation.activate(token, surface);
-
-            // Mark that attention request was done and drop the token.
-            window_handle.attention_requested.replace(false);
-            xdg_token.destroy();
-        });
-
-        xdg_activation_token.set_surface(surface);
-        xdg_activation_token.commit();
-        self.attention_requested.replace(true);
-    }
-
-    /// Pointer appeared over the window.
-    pub fn pointer_entered(&mut self, pointer: WinitPointer) {
-        let position = self.pointers.iter().position(|p| *p == pointer);
-
-        if position.is_none() {
-            let surface = self.window.surface();
-            match self.cursor_grab_mode.get() {
-                CursorGrabMode::None => (),
-                CursorGrabMode::Locked => pointer.lock(surface),
-                CursorGrabMode::Confined => pointer.confine(surface),
-            }
-
-            self.pointers.push(pointer);
-        }
-
-        // Apply the current cursor style.
-        self.set_cursor_visible(self.cursor_visible.get());
-    }
-
-    /// Pointer left the window.
-    pub fn pointer_left(&mut self, pointer: WinitPointer) {
-        let position = self.pointers.iter().position(|p| *p == pointer);
-
-        if let Some(position) = position {
-            let pointer = self.pointers.remove(position);
-
-            // Drop the grabbing mode.
-            match self.cursor_grab_mode.get() {
-                CursorGrabMode::None => (),
-                CursorGrabMode::Locked => pointer.unlock(),
-                CursorGrabMode::Confined => pointer.unconfine(),
-            }
-        }
-    }
-
-    pub fn text_input_entered(&mut self, text_input: TextInputHandler) {
-        if !self.text_inputs.iter().any(|t| *t == text_input) {
-            self.text_inputs.push(text_input);
-        }
-    }
-
-    pub fn text_input_left(&mut self, text_input: TextInputHandler) {
-        if let Some(position) = self.text_inputs.iter().position(|t| *t == text_input) {
-            self.text_inputs.remove(position);
-        }
-    }
-
-    pub fn set_ime_position(&self, position: LogicalPosition<u32>) {
-        // XXX This won't fly unless user will have a way to request IME window per seat, since
-        // the ime windows will be overlapping, but winit doesn't expose API to specify for
-        // which seat we're setting IME position.
-        let (x, y) = (position.x as i32, position.y as i32);
-        for text_input in self.text_inputs.iter() {
-            text_input.set_ime_position(x, y);
-        }
-    }
-
-    pub fn passthrough_mouse_input(&self, passthrough_mouse_input: bool) {
-        if passthrough_mouse_input {
-            let region = self.compositor.create_region();
-            region.add(0, 0, 0, 0);
-            self.window
-                .surface()
-                .set_input_region(Some(&region.detach()));
-            region.destroy();
-        } else {
-            // Using `None` results in the entire window being clickable.
-            self.window.surface().set_input_region(None);
-        }
-    }
-
-    pub fn set_transparent(&self, transparent: bool) {
-        self.transparent.set(transparent);
-        let surface = self.window.surface();
-        if transparent {
-            surface.set_opaque_region(None);
-        } else {
-            let region = self.compositor.create_region();
-            region.add(0, 0, i32::MAX, i32::MAX);
-            surface.set_opaque_region(Some(&region.detach()));
-            region.destroy();
-        }
-    }
-
-    pub fn set_ime_allowed(&self, allowed: bool, event_sink: &mut EventSink) {
-        if self.ime_allowed.get() == allowed {
-            return;
-        }
-
-        self.ime_allowed.replace(allowed);
-        let window_id = wayland::make_wid(self.window.surface());
-
-        let purpose = allowed.then(|| self.ime_purpose.get());
-        for text_input in self.text_inputs.iter() {
-            text_input.set_input_allowed(purpose);
-        }
-
-        let event = if allowed {
-            WindowEvent::Ime(Ime::Enabled)
-        } else {
-            WindowEvent::Ime(Ime::Disabled)
-        };
-
-        event_sink.push_window_event(event, window_id);
-    }
-
-    pub fn set_ime_purpose(&self, purpose: ImePurpose) {
-        if self.ime_purpose.get() == purpose {
-            return;
-        }
-
-        self.ime_purpose.replace(purpose);
-
-        if self.ime_allowed.get() {
-            for text_input in self.text_inputs.iter() {
-                text_input.set_content_type_by_purpose(purpose);
-            }
-        }
-    }
-
-    pub fn set_cursor_visible(&self, visible: bool) {
-        self.cursor_visible.replace(visible);
-        let cursor_icon = match visible {
-            true => Some(self.cursor_icon.get()),
-            false => None,
-        };
-
-        for pointer in self.pointers.iter() {
-            pointer.set_cursor(cursor_icon)
-        }
-    }
-
-    pub fn set_cursor_icon(&self, cursor_icon: CursorIcon) {
-        self.cursor_icon.replace(cursor_icon);
-
-        if !self.cursor_visible.get() {
-            return;
-        }
-
-        for pointer in self.pointers.iter() {
-            pointer.set_cursor(Some(cursor_icon));
-        }
-    }
-
-    pub fn drag_window(&self) {
-        for pointer in self.pointers.iter() {
-            pointer.drag_window(&self.window);
-        }
-    }
-}
-
-#[inline]
-pub fn handle_window_requests(winit_state: &mut WinitState) {
-    let window_map = &mut winit_state.window_map;
-    let window_user_requests = &mut winit_state.window_user_requests;
-    let window_compositor_updates = &mut winit_state.window_compositor_updates;
-    let mut windows_to_close: Vec<WindowId> = Vec::new();
-
-    // Process the rest of the events.
-    for (window_id, window_handle) in window_map.iter_mut() {
-        let mut requests = window_handle.pending_window_requests.lock().unwrap();
-        let requests = requests.drain(..);
-        for request in requests {
-            match request {
-                WindowRequest::Fullscreen(fullscreen) => {
-                    window_handle.window.set_fullscreen(fullscreen.as_ref());
-                }
-                WindowRequest::UnsetFullscreen => {
-                    window_handle.window.unset_fullscreen();
-                }
-                WindowRequest::ShowCursor(show_cursor) => {
-                    window_handle.set_cursor_visible(show_cursor);
-                }
-                WindowRequest::NewCursorIcon(cursor_icon) => {
-                    window_handle.set_cursor_icon(cursor_icon);
-                }
-                WindowRequest::ImePosition(position) => {
-                    window_handle.set_ime_position(position);
-                }
-                WindowRequest::AllowIme(allow) => {
-                    let event_sink = &mut winit_state.event_sink;
-                    window_handle.set_ime_allowed(allow, event_sink);
-                }
-                WindowRequest::ImePurpose(purpose) => {
-                    window_handle.set_ime_purpose(purpose);
-                }
-                WindowRequest::SetCursorGrabMode(mode) => {
-                    window_handle.set_cursor_grab(mode);
-                }
-                WindowRequest::SetLockedCursorPosition(position) => {
-                    window_handle.set_locked_cursor_position(position);
-                }
-                WindowRequest::DragWindow => {
-                    window_handle.drag_window();
-                }
-                WindowRequest::Maximize(maximize) => {
-                    if maximize {
-                        window_handle.window.set_maximized();
-                    } else {
-                        window_handle.window.unset_maximized();
-                    }
-                }
-                WindowRequest::Minimize => {
-                    window_handle.window.set_minimized();
-                }
-                WindowRequest::Transparent(transparent) => {
-                    window_handle.set_transparent(transparent);
-
-                    // This requires surface commit.
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.redraw_requested = true;
-                }
-                WindowRequest::Decorate(decorate) => {
-                    let decorations = match decorate {
-                        true => Decorations::FollowServer,
-                        false => Decorations::None,
-                    };
-
-                    window_handle.window.set_decorate(decorations);
-
-                    // We should refresh the frame to apply decorations change.
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::Resizeable(resizeable) => {
-                    window_handle.window.set_resizable(resizeable);
-
-                    // We should refresh the frame to update button state.
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::Title(title) => {
-                    window_handle.window.set_title(title);
-
-                    // We should refresh the frame to draw new title.
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::MinSize(size) => {
-                    let size = size.map(|size| (size.width, size.height));
-                    window_handle.window.set_min_size(size);
-
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::MaxSize(size) => {
-                    let size = size.map(|size| (size.width, size.height));
-                    window_handle.window.set_max_size(size);
-
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::FrameSize(size) => {
-                    if !window_handle.is_resizable.get() {
-                        // On Wayland non-resizable window is achieved by setting both min and max
-                        // size of the window to the same value.
-                        let size = Some((size.width, size.height));
-                        window_handle.window.set_max_size(size);
-                        window_handle.window.set_min_size(size);
-                    }
-
-                    window_handle.window.resize(size.width, size.height);
-
-                    // We should refresh the frame after resize.
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::PassthroughMouseInput(passthrough) => {
-                    window_handle.passthrough_mouse_input(passthrough);
-
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.refresh_frame = true;
-                }
-                WindowRequest::Attention(request_type) => {
-                    window_handle.set_user_attention(request_type);
-                }
-                WindowRequest::Redraw => {
-                    let window_request = window_user_requests.get_mut(window_id).unwrap();
-                    window_request.redraw_requested = true;
-                }
-                WindowRequest::Close => {
-                    // The window was requested to be closed.
-                    windows_to_close.push(*window_id);
-
-                    // Send event that the window was destroyed.
-                    let event_sink = &mut winit_state.event_sink;
-                    event_sink.push_window_event(WindowEvent::Destroyed, *window_id);
-                }
-                WindowRequest::Theme(_theme) => {
-                    #[cfg(feature = "sctk-adwaita")]
-                    {
-                        window_handle.window.set_frame_config(match _theme {
-                            Some(theme) => theme.into(),
-                            None => sctk_adwaita::FrameConfig::auto(),
-                        });
-
-                        let window_requst = window_user_requests.get_mut(window_id).unwrap();
-                        window_requst.refresh_frame = true;
-                    }
-                }
-            };
-        }
-    }
-
-    // Close the windows.
-    for window in windows_to_close {
-        let _ = window_map.remove(&window);
-        let _ = window_user_requests.remove(&window);
-        let _ = window_compositor_updates.remove(&window);
-    }
-}
-
-impl Drop for WindowHandle {
-    fn drop(&mut self) {
-        // Drop the fractional scaling before the surface.
-        let _ = self.fractional_scaling_state.take();
-
-        unsafe {
-            let surface = self.window.surface().clone();
-            // The window must be destroyed before wl_surface.
-            ManuallyDrop::drop(&mut self.window);
-            surface.destroy();
-        }
-    }
-}
-
-/// Fractional scaling objects.
-pub struct FractionalScalingState {
-    /// The wp-viewport of the window.
-    pub viewport: WpViewport,
-
-    /// The wp-fractional-scale of the window surface.
-    pub fractional_scale: WpFractionalScaleV1,
-}
-
-impl FractionalScalingState {
-    pub fn new(viewport: WpViewport, fractional_scale: WpFractionalScaleV1) -> Self {
-        Self {
-            viewport,
-            fractional_scale,
-        }
-    }
-}
-
-impl Drop for FractionalScalingState {
-    fn drop(&mut self) {
-        self.viewport.destroy();
-        self.fractional_scale.destroy();
-    }
-}

src/platform_impl/linux/x11/ffi.rs

@@ -1,9 +0,0 @@
-use x11_dl::xmd::CARD32;
-pub use x11_dl::{
-    error::OpenError, keysym::*, xcursor::*, xinput::*, xinput2::*, xlib::*, xlib_xcb::*,
-    xrandr::*, xrender::*,
-};
-
-// Isn't defined by x11_dl
-#[allow(non_upper_case_globals)]
-pub const IconicState: CARD32 = 3;

src/platform_impl/linux/x11/mod.rs

@@ -1,812 +0,0 @@
-#![cfg(x11_platform)]
-
-mod dnd;
-mod event_processor;
-mod events;
-pub mod ffi;
-mod ime;
-mod monitor;
-pub mod util;
-mod window;
-mod xdisplay;
-
-pub(crate) use self::{
-    monitor::{MonitorHandle, VideoMode},
-    window::UnownedWindow,
-    xdisplay::XConnection,
-};
-
-pub use self::xdisplay::{XError, XNotSupported};
-
-use std::{
-    cell::{Cell, RefCell},
-    collections::{HashMap, HashSet},
-    ffi::CStr,
-    mem::{self, MaybeUninit},
-    ops::Deref,
-    os::raw::*,
-    ptr,
-    rc::Rc,
-    slice,
-    sync::mpsc::{Receiver, Sender, TryRecvError},
-    sync::{mpsc, Arc, Weak},
-    time::{Duration, Instant},
-};
-
-use libc::{self, setlocale, LC_CTYPE};
-
-use mio::{unix::SourceFd, Events, Interest, Poll, Token, Waker};
-use raw_window_handle::{RawDisplayHandle, XlibDisplayHandle};
-
-use self::{
-    dnd::{Dnd, DndState},
-    event_processor::EventProcessor,
-    ime::{Ime, ImeCreationError, ImeReceiver, ImeRequest, ImeSender},
-    util::modifiers::ModifierKeymap,
-};
-use crate::{
-    error::OsError as RootOsError,
-    event::{Event, StartCause},
-    event_loop::{
-        ControlFlow, DeviceEventFilter, EventLoopClosed, EventLoopWindowTarget as RootELW,
-    },
-    platform_impl::{
-        platform::{sticky_exit_callback, WindowId},
-        PlatformSpecificWindowBuilderAttributes,
-    },
-    window::WindowAttributes,
-};
-
-const X_TOKEN: Token = Token(0);
-const USER_REDRAW_TOKEN: Token = Token(1);
-
-struct WakeSender<T> {
-    sender: Sender<T>,
-    waker: Arc<Waker>,
-}
-
-struct PeekableReceiver<T> {
-    recv: Receiver<T>,
-    first: Option<T>,
-}
-
-impl<T> PeekableReceiver<T> {
-    pub fn from_recv(recv: 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(TryRecvError::Empty) => false,
-            Err(TryRecvError::Disconnected) => {
-                warn!("Channel was disconnected when checking incoming");
-                false
-            }
-        }
-    }
-    pub fn try_recv(&mut self) -> Result<T, TryRecvError> {
-        if let Some(first) = self.first.take() {
-            return Ok(first);
-        }
-        self.recv.try_recv()
-    }
-}
-
-pub struct EventLoopWindowTarget<T> {
-    xconn: Arc<XConnection>,
-    wm_delete_window: ffi::Atom,
-    net_wm_ping: ffi::Atom,
-    ime_sender: ImeSender,
-    root: ffi::Window,
-    ime: RefCell<Ime>,
-    windows: RefCell<HashMap<WindowId, Weak<UnownedWindow>>>,
-    redraw_sender: WakeSender<WindowId>,
-    device_event_filter: Cell<DeviceEventFilter>,
-    _marker: ::std::marker::PhantomData<T>,
-}
-
-pub struct EventLoop<T: 'static> {
-    poll: Poll,
-    waker: Arc<Waker>,
-    event_processor: EventProcessor<T>,
-    redraw_receiver: PeekableReceiver<WindowId>,
-    user_receiver: PeekableReceiver<T>, //waker.wake needs to be called whenever something gets sent
-    user_sender: Sender<T>,
-    target: Rc<RootELW<T>>,
-}
-
-pub struct EventLoopProxy<T: 'static> {
-    user_sender: Sender<T>,
-    waker: Arc<Waker>,
-}
-
-impl<T: 'static> Clone for EventLoopProxy<T> {
-    fn clone(&self) -> Self {
-        EventLoopProxy {
-            user_sender: self.user_sender.clone(),
-            waker: self.waker.clone(),
-        }
-    }
-}
-
-impl<T: 'static> EventLoop<T> {
-    pub(crate) fn new(xconn: Arc<XConnection>) -> EventLoop<T> {
-        let root = unsafe { (xconn.xlib.XDefaultRootWindow)(xconn.display) };
-
-        let wm_delete_window = unsafe { xconn.get_atom_unchecked(b"WM_DELETE_WINDOW\0") };
-
-        let net_wm_ping = unsafe { xconn.get_atom_unchecked(b"_NET_WM_PING\0") };
-
-        let dnd = Dnd::new(Arc::clone(&xconn))
-            .expect("Failed to call XInternAtoms when initializing drag and drop");
-
-        let (ime_sender, ime_receiver) = mpsc::channel();
-        let (ime_event_sender, ime_event_receiver) = mpsc::channel();
-        // Input methods will open successfully without setting the locale, but it won't be
-        // possible to actually commit pre-edit sequences.
-        unsafe {
-            // Remember default locale to restore it if target locale is unsupported
-            // by Xlib
-            let default_locale = setlocale(LC_CTYPE, ptr::null());
-            setlocale(LC_CTYPE, b"\0".as_ptr() as *const _);
-
-            // Check if set locale is supported by Xlib.
-            // If not, calls to some Xlib functions like `XSetLocaleModifiers`
-            // will fail.
-            let locale_supported = (xconn.xlib.XSupportsLocale)() == 1;
-            if !locale_supported {
-                let unsupported_locale = setlocale(LC_CTYPE, ptr::null());
-                warn!(
-                    "Unsupported locale \"{}\". Restoring default locale \"{}\".",
-                    CStr::from_ptr(unsupported_locale).to_string_lossy(),
-                    CStr::from_ptr(default_locale).to_string_lossy()
-                );
-                // Restore default locale
-                setlocale(LC_CTYPE, default_locale);
-            }
-        }
-        let ime = RefCell::new({
-            let result = Ime::new(Arc::clone(&xconn), ime_event_sender);
-            if let Err(ImeCreationError::OpenFailure(ref state)) = result {
-                panic!("Failed to open input method: {state:#?}");
-            }
-            result.expect("Failed to set input method destruction callback")
-        });
-
-        let randr_event_offset = xconn
-            .select_xrandr_input(root)
-            .expect("Failed to query XRandR extension");
-
-        let xi2ext = unsafe {
-            let mut ext = XExtension::default();
-
-            let res = (xconn.xlib.XQueryExtension)(
-                xconn.display,
-                b"XInputExtension\0".as_ptr() as *const c_char,
-                &mut ext.opcode,
-                &mut ext.first_event_id,
-                &mut ext.first_error_id,
-            );
-
-            if res == ffi::False {
-                panic!("X server missing XInput extension");
-            }
-
-            ext
-        };
-
-        unsafe {
-            let mut xinput_major_ver = ffi::XI_2_Major;
-            let mut xinput_minor_ver = ffi::XI_2_Minor;
-            if (xconn.xinput2.XIQueryVersion)(
-                xconn.display,
-                &mut xinput_major_ver,
-                &mut xinput_minor_ver,
-            ) != ffi::Success as libc::c_int
-            {
-                panic!(
-                    "X server has XInput extension {xinput_major_ver}.{xinput_minor_ver} but does not support XInput2",
-                );
-            }
-        }
-
-        xconn.update_cached_wm_info(root);
-
-        let mut mod_keymap = ModifierKeymap::new();
-        mod_keymap.reset_from_x_connection(&xconn);
-
-        let poll = Poll::new().unwrap();
-        let waker = Arc::new(Waker::new(poll.registry(), USER_REDRAW_TOKEN).unwrap());
-
-        poll.registry()
-            .register(&mut SourceFd(&xconn.x11_fd), X_TOKEN, Interest::READABLE)
-            .unwrap();
-
-        let (user_sender, user_channel) = std::sync::mpsc::channel();
-        let (redraw_sender, redraw_channel) = std::sync::mpsc::channel();
-
-        let window_target = EventLoopWindowTarget {
-            ime,
-            root,
-            windows: Default::default(),
-            _marker: ::std::marker::PhantomData,
-            ime_sender,
-            xconn,
-            wm_delete_window,
-            net_wm_ping,
-            redraw_sender: WakeSender {
-                sender: redraw_sender, // not used again so no clone
-                waker: waker.clone(),
-            },
-            device_event_filter: Default::default(),
-        };
-
-        // Set initial device event filter.
-        window_target.update_device_event_filter(true);
-
-        let target = Rc::new(RootELW {
-            p: super::EventLoopWindowTarget::X(window_target),
-            _marker: ::std::marker::PhantomData,
-        });
-
-        let event_processor = EventProcessor {
-            target: target.clone(),
-            dnd,
-            devices: Default::default(),
-            randr_event_offset,
-            ime_receiver,
-            ime_event_receiver,
-            xi2ext,
-            mod_keymap,
-            device_mod_state: Default::default(),
-            num_touch: 0,
-            first_touch: None,
-            active_window: None,
-            is_composing: false,
-        };
-
-        // Register for device hotplug events
-        // (The request buffer is flushed during `init_device`)
-        get_xtarget(&target)
-            .xconn
-            .select_xinput_events(root, ffi::XIAllDevices, ffi::XI_HierarchyChangedMask)
-            .queue();
-
-        event_processor.init_device(ffi::XIAllDevices);
-
-        EventLoop {
-            poll,
-            waker,
-            event_processor,
-            redraw_receiver: PeekableReceiver::from_recv(redraw_channel),
-            user_receiver: PeekableReceiver::from_recv(user_channel),
-            user_sender,
-            target,
-        }
-    }
-
-    pub fn create_proxy(&self) -> EventLoopProxy<T> {
-        EventLoopProxy {
-            user_sender: self.user_sender.clone(),
-            waker: self.waker.clone(),
-        }
-    }
-
-    pub(crate) fn window_target(&self) -> &RootELW<T> {
-        &self.target
-    }
-
-    pub fn run_return<F>(&mut self, mut callback: F) -> i32
-    where
-        F: FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
-    {
-        struct IterationResult {
-            deadline: Option<Instant>,
-            timeout: Option<Duration>,
-            wait_start: Instant,
-        }
-        fn single_iteration<T, F>(
-            this: &mut EventLoop<T>,
-            control_flow: &mut ControlFlow,
-            cause: &mut StartCause,
-            callback: &mut F,
-        ) -> IterationResult
-        where
-            F: FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
-        {
-            sticky_exit_callback(
-                crate::event::Event::NewEvents(*cause),
-                &this.target,
-                control_flow,
-                callback,
-            );
-
-            // 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 {
-                sticky_exit_callback(
-                    crate::event::Event::Resumed,
-                    &this.target,
-                    control_flow,
-                    callback,
-                );
-            }
-
-            // Process all pending events
-            this.drain_events(callback, control_flow);
-
-            // Empty the user event buffer
-            {
-                while let Ok(event) = this.user_receiver.try_recv() {
-                    sticky_exit_callback(
-                        crate::event::Event::UserEvent(event),
-                        &this.target,
-                        control_flow,
-                        callback,
-                    );
-                }
-            }
-            // send MainEventsCleared
-            {
-                sticky_exit_callback(
-                    crate::event::Event::MainEventsCleared,
-                    &this.target,
-                    control_flow,
-                    callback,
-                );
-            }
-            // Empty the redraw requests
-            {
-                let mut windows = HashSet::new();
-
-                while let Ok(window_id) = this.redraw_receiver.try_recv() {
-                    windows.insert(window_id);
-                }
-
-                for window_id in windows {
-                    let window_id = crate::window::WindowId(window_id);
-                    sticky_exit_callback(
-                        Event::RedrawRequested(window_id),
-                        &this.target,
-                        control_flow,
-                        callback,
-                    );
-                }
-            }
-            // send RedrawEventsCleared
-            {
-                sticky_exit_callback(
-                    crate::event::Event::RedrawEventsCleared,
-                    &this.target,
-                    control_flow,
-                    callback,
-                );
-            }
-
-            let start = Instant::now();
-            let (deadline, timeout);
-
-            match control_flow {
-                ControlFlow::ExitWithCode(_) => {
-                    return IterationResult {
-                        wait_start: start,
-                        deadline: None,
-                        timeout: None,
-                    };
-                }
-                ControlFlow::Poll => {
-                    *cause = StartCause::Poll;
-                    deadline = None;
-                    timeout = Some(Duration::from_millis(0));
-                }
-                ControlFlow::Wait => {
-                    *cause = StartCause::WaitCancelled {
-                        start,
-                        requested_resume: None,
-                    };
-                    deadline = None;
-                    timeout = None;
-                }
-                ControlFlow::WaitUntil(wait_deadline) => {
-                    *cause = StartCause::ResumeTimeReached {
-                        start,
-                        requested_resume: *wait_deadline,
-                    };
-                    timeout = if *wait_deadline > start {
-                        Some(*wait_deadline - start)
-                    } else {
-                        Some(Duration::from_millis(0))
-                    };
-                    deadline = Some(*wait_deadline);
-                }
-            }
-
-            IterationResult {
-                wait_start: start,
-                deadline,
-                timeout,
-            }
-        }
-
-        let mut control_flow = ControlFlow::default();
-        let mut events = Events::with_capacity(8);
-        let mut cause = StartCause::Init;
-
-        // run the initial loop iteration
-        let mut iter_result = single_iteration(self, &mut control_flow, &mut cause, &mut callback);
-
-        let exit_code = loop {
-            if let ControlFlow::ExitWithCode(code) = control_flow {
-                break code;
-            }
-            let has_pending = self.event_processor.poll()
-                || self.user_receiver.has_incoming()
-                || self.redraw_receiver.has_incoming();
-            if !has_pending {
-                // Wait until
-                if let Err(e) = self.poll.poll(&mut events, iter_result.timeout) {
-                    if e.raw_os_error() != Some(libc::EINTR) {
-                        panic!("epoll returned an error: {e:?}");
-                    }
-                }
-                events.clear();
-
-                if control_flow == ControlFlow::Wait {
-                    // We don't go straight into executing the event loop iteration, we instead go
-                    // to the start of this loop and check again if there's any pending event. We
-                    // must do this because during the execution of the iteration we sometimes wake
-                    // the mio waker, and if the waker is already awaken before we call poll(),
-                    // then poll doesn't block, but it returns immediately. This caused the event
-                    // loop to run continuously even if the control_flow was `Wait`
-                    continue;
-                }
-            }
-
-            let wait_cancelled = iter_result
-                .deadline
-                .map_or(false, |deadline| Instant::now() < deadline);
-
-            if wait_cancelled {
-                cause = StartCause::WaitCancelled {
-                    start: iter_result.wait_start,
-                    requested_resume: iter_result.deadline,
-                };
-            }
-
-            iter_result = single_iteration(self, &mut control_flow, &mut cause, &mut callback);
-        };
-
-        callback(
-            crate::event::Event::LoopDestroyed,
-            &self.target,
-            &mut control_flow,
-        );
-        exit_code
-    }
-
-    pub fn run<F>(mut self, callback: F) -> !
-    where
-        F: 'static + FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
-    {
-        let exit_code = self.run_return(callback);
-        ::std::process::exit(exit_code);
-    }
-
-    fn drain_events<F>(&mut self, callback: &mut F, control_flow: &mut ControlFlow)
-    where
-        F: FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
-    {
-        let target = &self.target;
-        let mut xev = MaybeUninit::uninit();
-        let wt = get_xtarget(&self.target);
-
-        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, |event| {
-                sticky_exit_callback(
-                    event,
-                    target,
-                    control_flow,
-                    &mut |event, window_target, control_flow| {
-                        if let Event::RedrawRequested(crate::window::WindowId(wid)) = event {
-                            wt.redraw_sender.sender.send(wid).unwrap();
-                            wt.redraw_sender.waker.wake().unwrap();
-                        } else {
-                            callback(event, window_target, control_flow);
-                        }
-                    },
-                );
-            });
-        }
-    }
-}
-
-pub(crate) fn get_xtarget<T>(target: &RootELW<T>) -> &EventLoopWindowTarget<T> {
-    match target.p {
-        super::EventLoopWindowTarget::X(ref target) => target,
-        #[cfg(wayland_platform)]
-        _ => unreachable!(),
-    }
-}
-
-impl<T> EventLoopWindowTarget<T> {
-    /// Returns the `XConnection` of this events loop.
-    #[inline]
-    pub(crate) fn x_connection(&self) -> &Arc<XConnection> {
-        &self.xconn
-    }
-
-    pub fn set_device_event_filter(&self, filter: DeviceEventFilter) {
-        self.device_event_filter.set(filter);
-    }
-
-    /// Update the device event filter based on window focus.
-    pub fn update_device_event_filter(&self, focus: bool) {
-        let filter_events = self.device_event_filter.get() == DeviceEventFilter::Never
-            || (self.device_event_filter.get() == DeviceEventFilter::Unfocused && !focus);
-
-        let mut mask = 0;
-        if !filter_events {
-            mask = ffi::XI_RawMotionMask
-                | ffi::XI_RawButtonPressMask
-                | ffi::XI_RawButtonReleaseMask
-                | ffi::XI_RawKeyPressMask
-                | ffi::XI_RawKeyReleaseMask;
-        }
-
-        self.xconn
-            .select_xinput_events(self.root, ffi::XIAllMasterDevices, mask)
-            .queue();
-    }
-
-    pub fn raw_display_handle(&self) -> raw_window_handle::RawDisplayHandle {
-        let mut display_handle = XlibDisplayHandle::empty();
-        display_handle.display = self.xconn.display as *mut _;
-        display_handle.screen =
-            unsafe { (self.xconn.xlib.XDefaultScreen)(self.xconn.display as *mut _) };
-        RawDisplayHandle::Xlib(display_handle)
-    }
-}
-
-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))
-            .map(|_| self.waker.wake().unwrap())
-    }
-}
-
-struct DeviceInfo<'a> {
-    xconn: &'a XConnection,
-    info: *const ffi::XIDeviceInfo,
-    count: usize,
-}
-
-impl<'a> DeviceInfo<'a> {
-    fn get(xconn: &'a XConnection, device: c_int) -> Option<Self> {
-        unsafe {
-            let mut count = 0;
-            let info = (xconn.xinput2.XIQueryDevice)(xconn.display, device, &mut count);
-            xconn.check_errors().ok()?;
-
-            if info.is_null() || count == 0 {
-                None
-            } else {
-                Some(DeviceInfo {
-                    xconn,
-                    info,
-                    count: count as usize,
-                })
-            }
-        }
-    }
-}
-
-impl<'a> Drop for DeviceInfo<'a> {
-    fn drop(&mut self) {
-        assert!(!self.info.is_null());
-        unsafe { (self.xconn.xinput2.XIFreeDeviceInfo)(self.info as *mut _) };
-    }
-}
-
-impl<'a> Deref for DeviceInfo<'a> {
-    type Target = [ffi::XIDeviceInfo];
-    fn deref(&self) -> &Self::Target {
-        unsafe { slice::from_raw_parts(self.info, self.count) }
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId(c_int);
-
-impl DeviceId {
-    #[allow(unused)]
-    pub const unsafe fn dummy() -> Self {
-        DeviceId(0)
-    }
-}
-
-pub(crate) struct Window(Arc<UnownedWindow>);
-
-impl Deref for Window {
-    type Target = UnownedWindow;
-    #[inline]
-    fn deref(&self) -> &UnownedWindow {
-        &self.0
-    }
-}
-
-impl Window {
-    pub(crate) fn new<T>(
-        event_loop: &EventLoopWindowTarget<T>,
-        attribs: WindowAttributes,
-        pl_attribs: PlatformSpecificWindowBuilderAttributes,
-    ) -> Result<Self, RootOsError> {
-        let window = Arc::new(UnownedWindow::new(event_loop, attribs, pl_attribs)?);
-        event_loop
-            .windows
-            .borrow_mut()
-            .insert(window.id(), Arc::downgrade(&window));
-        Ok(Window(window))
-    }
-}
-
-impl Drop for Window {
-    fn drop(&mut self) {
-        let window = self.deref();
-        let xconn = &window.xconn;
-        unsafe {
-            (xconn.xlib.XDestroyWindow)(xconn.display, window.id().0 as ffi::Window);
-            // If the window was somehow already destroyed, we'll get a `BadWindow` error, which we don't care about.
-            let _ = xconn.check_errors();
-        }
-    }
-}
-
-/// XEvents of type GenericEvent store their actual data in an XGenericEventCookie data structure. This is a wrapper to
-/// extract the cookie from a GenericEvent XEvent and release the cookie data once it has been processed
-struct GenericEventCookie<'a> {
-    xconn: &'a XConnection,
-    cookie: ffi::XGenericEventCookie,
-}
-
-impl<'a> GenericEventCookie<'a> {
-    fn from_event(xconn: &XConnection, event: ffi::XEvent) -> Option<GenericEventCookie<'_>> {
-        unsafe {
-            let mut cookie: ffi::XGenericEventCookie = From::from(event);
-            if (xconn.xlib.XGetEventData)(xconn.display, &mut cookie) == ffi::True {
-                Some(GenericEventCookie { xconn, cookie })
-            } else {
-                None
-            }
-        }
-    }
-}
-
-impl<'a> Drop for GenericEventCookie<'a> {
-    fn drop(&mut self) {
-        unsafe {
-            (self.xconn.xlib.XFreeEventData)(self.xconn.display, &mut self.cookie);
-        }
-    }
-}
-
-#[derive(Debug, Default, Copy, Clone)]
-struct XExtension {
-    opcode: c_int,
-    first_event_id: c_int,
-    first_error_id: c_int,
-}
-
-fn mkwid(w: ffi::Window) -> crate::window::WindowId {
-    crate::window::WindowId(crate::platform_impl::platform::WindowId(w as _))
-}
-fn mkdid(w: c_int) -> crate::event::DeviceId {
-    crate::event::DeviceId(crate::platform_impl::DeviceId::X(DeviceId(w)))
-}
-
-#[derive(Debug)]
-struct Device {
-    _name: String,
-    scroll_axes: Vec<(i32, ScrollAxis)>,
-    // For master devices, this is the paired device (pointer <-> keyboard).
-    // For slave devices, this is the master.
-    attachment: c_int,
-}
-
-#[derive(Debug, Copy, Clone)]
-struct ScrollAxis {
-    increment: f64,
-    orientation: ScrollOrientation,
-    position: f64,
-}
-
-#[derive(Debug, Copy, Clone)]
-enum ScrollOrientation {
-    Vertical,
-    Horizontal,
-}
-
-impl Device {
-    fn new(info: &ffi::XIDeviceInfo) -> Self {
-        let name = unsafe { CStr::from_ptr(info.name).to_string_lossy() };
-        let mut scroll_axes = Vec::new();
-
-        if Device::physical_device(info) {
-            // Identify scroll axes
-            for class_ptr in Device::classes(info) {
-                let class = unsafe { &**class_ptr };
-                if class._type == ffi::XIScrollClass {
-                    let info = unsafe {
-                        mem::transmute::<&ffi::XIAnyClassInfo, &ffi::XIScrollClassInfo>(class)
-                    };
-                    scroll_axes.push((
-                        info.number,
-                        ScrollAxis {
-                            increment: info.increment,
-                            orientation: match info.scroll_type {
-                                ffi::XIScrollTypeHorizontal => ScrollOrientation::Horizontal,
-                                ffi::XIScrollTypeVertical => ScrollOrientation::Vertical,
-                                _ => unreachable!(),
-                            },
-                            position: 0.0,
-                        },
-                    ));
-                }
-            }
-        }
-
-        let mut device = Device {
-            _name: name.into_owned(),
-            scroll_axes,
-            attachment: info.attachment,
-        };
-        device.reset_scroll_position(info);
-        device
-    }
-
-    fn reset_scroll_position(&mut self, info: &ffi::XIDeviceInfo) {
-        if Device::physical_device(info) {
-            for class_ptr in Device::classes(info) {
-                let class = unsafe { &**class_ptr };
-                if class._type == ffi::XIValuatorClass {
-                    let info = unsafe {
-                        mem::transmute::<&ffi::XIAnyClassInfo, &ffi::XIValuatorClassInfo>(class)
-                    };
-                    if let Some(&mut (_, ref mut axis)) = self
-                        .scroll_axes
-                        .iter_mut()
-                        .find(|&&mut (axis, _)| axis == info.number)
-                    {
-                        axis.position = info.value;
-                    }
-                }
-            }
-        }
-    }
-
-    #[inline]
-    fn physical_device(info: &ffi::XIDeviceInfo) -> bool {
-        info._use == ffi::XISlaveKeyboard
-            || info._use == ffi::XISlavePointer
-            || info._use == ffi::XIFloatingSlave
-    }
-
-    #[inline]
-    fn classes(info: &ffi::XIDeviceInfo) -> &[*const ffi::XIAnyClassInfo] {
-        unsafe {
-            slice::from_raw_parts(
-                info.classes as *const *const ffi::XIAnyClassInfo,
-                info.num_classes as usize,
-            )
-        }
-    }
-}

src/platform_impl/linux/x11/monitor.rs

@@ -1,341 +0,0 @@
-use std::os::raw::*;
-use std::slice;
-use std::sync::Mutex;
-
-use once_cell::sync::Lazy;
-
-use super::{
-    ffi::{
-        RRCrtc, RRCrtcChangeNotifyMask, RRMode, RROutputPropertyNotifyMask,
-        RRScreenChangeNotifyMask, True, Window, XRRCrtcInfo, XRRModeInfo, XRRScreenResources,
-    },
-    util, XConnection, XError,
-};
-use crate::{
-    dpi::{PhysicalPosition, PhysicalSize},
-    platform_impl::{MonitorHandle as PlatformMonitorHandle, VideoMode as PlatformVideoMode},
-};
-
-// Used for testing. This should always be committed as false.
-const DISABLE_MONITOR_LIST_CACHING: bool = false;
-
-static MONITORS: Lazy<Mutex<Option<Vec<MonitorHandle>>>> = Lazy::new(Mutex::default);
-
-pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorHandle>> {
-    // We update this lazily.
-    (*MONITORS.lock().unwrap()).take()
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct VideoMode {
-    pub(crate) size: (u32, u32),
-    pub(crate) bit_depth: u16,
-    pub(crate) refresh_rate_millihertz: u32,
-    pub(crate) native_mode: RRMode,
-    pub(crate) monitor: Option<MonitorHandle>,
-}
-
-impl VideoMode {
-    #[inline]
-    pub fn size(&self) -> PhysicalSize<u32> {
-        self.size.into()
-    }
-
-    #[inline]
-    pub fn bit_depth(&self) -> u16 {
-        self.bit_depth
-    }
-
-    #[inline]
-    pub fn refresh_rate_millihertz(&self) -> u32 {
-        self.refresh_rate_millihertz
-    }
-
-    #[inline]
-    pub fn monitor(&self) -> PlatformMonitorHandle {
-        PlatformMonitorHandle::X(self.monitor.clone().unwrap())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct MonitorHandle {
-    /// The actual id
-    pub(crate) id: RRCrtc,
-    /// 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
-    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
-    pub(crate) rect: util::AaRect,
-    /// Supported video modes on this monitor
-    video_modes: Vec<VideoMode>,
-}
-
-impl PartialEq for MonitorHandle {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl Eq for MonitorHandle {}
-
-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 {
-        self.id.cmp(&other.id)
-    }
-}
-
-impl std::hash::Hash for MonitorHandle {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-#[inline]
-pub fn mode_refresh_rate_millihertz(mode: &XRRModeInfo) -> Option<u32> {
-    if mode.dotClock > 0 && mode.hTotal > 0 && mode.vTotal > 0 {
-        #[allow(clippy::unnecessary_cast)]
-        Some((mode.dotClock as u64 * 1000 / (mode.hTotal as u64 * mode.vTotal as u64)) as u32)
-    } else {
-        None
-    }
-}
-
-impl MonitorHandle {
-    fn new(
-        xconn: &XConnection,
-        resources: *mut XRRScreenResources,
-        id: RRCrtc,
-        crtc: *mut XRRCrtcInfo,
-        primary: bool,
-    ) -> Option<Self> {
-        let (name, scale_factor, video_modes) = unsafe { xconn.get_output_info(resources, crtc)? };
-        let dimensions = unsafe { ((*crtc).width, (*crtc).height) };
-        let position = unsafe { ((*crtc).x, (*crtc).y) };
-
-        // Get the refresh rate of the current video mode.
-        let current_mode = unsafe { (*crtc).mode };
-        let screen_modes =
-            unsafe { slice::from_raw_parts((*resources).modes, (*resources).nmode as usize) };
-        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,
-            refresh_rate_millihertz,
-            scale_factor,
-            dimensions,
-            position,
-            primary,
-            rect,
-            video_modes,
-        })
-    }
-
-    pub fn dummy() -> Self {
-        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(),
-        }
-    }
-
-    pub(crate) fn is_dummy(&self) -> bool {
-        // Zero is an invalid XID value; no real monitor will have it
-        self.id == 0
-    }
-
-    pub fn name(&self) -> Option<String> {
-        Some(self.name.clone())
-    }
-
-    #[inline]
-    pub fn native_identifier(&self) -> u32 {
-        self.id as _
-    }
-
-    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]
-    pub fn scale_factor(&self) -> f64 {
-        self.scale_factor
-    }
-
-    #[inline]
-    pub fn video_modes(&self) -> impl Iterator<Item = PlatformVideoMode> {
-        let monitor = self.clone();
-        self.video_modes.clone().into_iter().map(move |mut x| {
-            x.monitor = Some(monitor.clone());
-            PlatformVideoMode::X(x)
-        })
-    }
-}
-
-impl XConnection {
-    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorHandle {
-        let monitors = self.available_monitors();
-
-        if monitors.is_empty() {
-            // Return a dummy monitor to avoid panicking
-            return MonitorHandle::dummy();
-        }
-
-        let default = monitors.get(0).unwrap();
-
-        let window_rect = match window_rect {
-            Some(rect) => rect,
-            None => return default.to_owned(),
-        };
-
-        let mut largest_overlap = 0;
-        let mut matched_monitor = default;
-        for monitor in &monitors {
-            let overlapping_area = window_rect.get_overlapping_area(&monitor.rect);
-            if overlapping_area > largest_overlap {
-                largest_overlap = overlapping_area;
-                matched_monitor = monitor;
-            }
-        }
-
-        matched_monitor.to_owned()
-    }
-
-    fn query_monitor_list(&self) -> Vec<MonitorHandle> {
-        unsafe {
-            let mut major = 0;
-            let mut minor = 0;
-            (self.xrandr.XRRQueryVersion)(self.display, &mut major, &mut minor);
-
-            let root = (self.xlib.XDefaultRootWindow)(self.display);
-            let resources = if (major == 1 && minor >= 3) || major > 1 {
-                (self.xrandr.XRRGetScreenResourcesCurrent)(self.display, root)
-            } else {
-                // WARNING: this function is supposedly very slow, on the order of hundreds of ms.
-                // Upon failure, `resources` will be null.
-                (self.xrandr.XRRGetScreenResources)(self.display, root)
-            };
-
-            if resources.is_null() {
-                panic!("[winit] `XRRGetScreenResources` returned NULL. That should only happen if the root window doesn't exist.");
-            }
-
-            let mut has_primary = false;
-
-            let primary = (self.xrandr.XRRGetOutputPrimary)(self.display, root);
-            let mut available = Vec::with_capacity((*resources).ncrtc as usize);
-
-            for crtc_index in 0..(*resources).ncrtc {
-                let crtc_id = *((*resources).crtcs.offset(crtc_index as isize));
-                let crtc = (self.xrandr.XRRGetCrtcInfo)(self.display, resources, crtc_id);
-                let is_active = (*crtc).width > 0 && (*crtc).height > 0 && (*crtc).noutput > 0;
-                if is_active {
-                    let is_primary = *(*crtc).outputs.offset(0) == primary;
-                    has_primary |= is_primary;
-                    if let Some(monitor_id) =
-                        MonitorHandle::new(self, resources, crtc_id, crtc, is_primary)
-                    {
-                        available.push(monitor_id)
-                    }
-                }
-                (self.xrandr.XRRFreeCrtcInfo)(crtc);
-            }
-
-            // If no monitors were detected as being primary, we just pick one ourselves!
-            if !has_primary {
-                if let Some(ref mut fallback) = available.first_mut() {
-                    // Setting this here will come in handy if we ever add an `is_primary` method.
-                    fallback.primary = true;
-                }
-            }
-
-            (self.xrandr.XRRFreeScreenResources)(resources);
-            available
-        }
-    }
-
-    pub fn available_monitors(&self) -> Vec<MonitorHandle> {
-        let mut monitors_lock = MONITORS.lock().unwrap();
-        (*monitors_lock)
-            .as_ref()
-            .cloned()
-            .or_else(|| {
-                let monitors = Some(self.query_monitor_list());
-                if !DISABLE_MONITOR_LIST_CACHING {
-                    (*monitors_lock) = monitors.clone();
-                }
-                monitors
-            })
-            .unwrap()
-    }
-
-    #[inline]
-    pub fn primary_monitor(&self) -> MonitorHandle {
-        self.available_monitors()
-            .into_iter()
-            .find(|monitor| monitor.primary)
-            .unwrap_or_else(MonitorHandle::dummy)
-    }
-
-    pub fn select_xrandr_input(&self, root: Window) -> Result<c_int, XError> {
-        let has_xrandr = unsafe {
-            let mut major = 0;
-            let mut minor = 0;
-            (self.xrandr.XRRQueryVersion)(self.display, &mut major, &mut minor)
-        };
-        assert!(
-            has_xrandr == True,
-            "[winit] XRandR extension not available."
-        );
-
-        let mut event_offset = 0;
-        let mut error_offset = 0;
-        let status = unsafe {
-            (self.xrandr.XRRQueryExtension)(self.display, &mut event_offset, &mut error_offset)
-        };
-
-        if status != True {
-            self.check_errors()?;
-            unreachable!("[winit] `XRRQueryExtension` failed but no error was received.");
-        }
-
-        let mask = RRCrtcChangeNotifyMask | RROutputPropertyNotifyMask | RRScreenChangeNotifyMask;
-        unsafe { (self.xrandr.XRRSelectInput)(self.display, root, mask) };
-
-        Ok(event_offset)
-    }
-}

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

@@ -1,70 +0,0 @@
-use std::{
-    collections::HashMap,
-    ffi::{CStr, CString},
-    fmt::Debug,
-    os::raw::*,
-    sync::Mutex,
-};
-
-use once_cell::sync::Lazy;
-
-use super::*;
-
-type AtomCache = HashMap<CString, ffi::Atom>;
-
-static ATOM_CACHE: Lazy<Mutex<AtomCache>> = Lazy::new(|| Mutex::new(HashMap::with_capacity(2048)));
-
-impl XConnection {
-    pub fn get_atom<T: AsRef<CStr> + Debug>(&self, name: T) -> ffi::Atom {
-        let name = name.as_ref();
-        let mut atom_cache_lock = ATOM_CACHE.lock().unwrap();
-        let cached_atom = (*atom_cache_lock).get(name).cloned();
-        if let Some(atom) = cached_atom {
-            atom
-        } else {
-            let atom = unsafe {
-                (self.xlib.XInternAtom)(self.display, name.as_ptr() as *const c_char, ffi::False)
-            };
-            if atom == 0 {
-                panic!(
-                    "`XInternAtom` failed, which really shouldn't happen. Atom: {:?}, Error: {:#?}",
-                    name,
-                    self.check_errors(),
-                );
-            }
-            /*println!(
-                "XInternAtom name:{:?} atom:{:?}",
-                name,
-                atom,
-            );*/
-            (*atom_cache_lock).insert(name.to_owned(), atom);
-            atom
-        }
-    }
-
-    pub unsafe fn get_atom_unchecked(&self, name: &[u8]) -> ffi::Atom {
-        debug_assert!(CStr::from_bytes_with_nul(name).is_ok());
-        let name = CStr::from_bytes_with_nul_unchecked(name);
-        self.get_atom(name)
-    }
-
-    // Note: this doesn't use caching, for the sake of simplicity.
-    // If you're dealing with this many atoms, you'll usually want to cache them locally anyway.
-    pub unsafe fn get_atoms(&self, names: &[*mut c_char]) -> Result<Vec<ffi::Atom>, XError> {
-        let mut atoms = Vec::with_capacity(names.len());
-        (self.xlib.XInternAtoms)(
-            self.display,
-            names.as_ptr() as *mut _,
-            names.len() as c_int,
-            ffi::False,
-            atoms.as_mut_ptr(),
-        );
-        self.check_errors()?;
-        atoms.set_len(names.len());
-        /*println!(
-            "XInternAtoms atoms:{:?}",
-            atoms,
-        );*/
-        Ok(atoms)
-    }
-}

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

@@ -1,46 +0,0 @@
-use super::*;
-
-pub type ClientMsgPayload = [c_long; 5];
-
-impl XConnection {
-    pub fn send_event<T: Into<ffi::XEvent>>(
-        &self,
-        target_window: c_ulong,
-        event_mask: Option<c_long>,
-        event: T,
-    ) -> Flusher<'_> {
-        let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
-        unsafe {
-            (self.xlib.XSendEvent)(
-                self.display,
-                target_window,
-                ffi::False,
-                event_mask,
-                &mut event.into(),
-            );
-        }
-        Flusher::new(self)
-    }
-
-    pub fn send_client_msg(
-        &self,
-        window: c_ulong, // The window this is "about"; not necessarily this window
-        target_window: c_ulong, // The window we're sending to
-        message_type: ffi::Atom,
-        event_mask: Option<c_long>,
-        data: ClientMsgPayload,
-    ) -> Flusher<'_> {
-        let event = ffi::XClientMessageEvent {
-            type_: ffi::ClientMessage,
-            display: self.display,
-            window,
-            message_type,
-            format: c_long::FORMAT as c_int,
-            data: unsafe { mem::transmute(data) },
-            // These fields are ignored by `XSendEvent`
-            serial: 0,
-            send_event: 0,
-        };
-        self.send_event(target_window, event_mask, event)
-    }
-}

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

@@ -1,130 +0,0 @@
-use crate::window::CursorIcon;
-
-use super::*;
-
-impl XConnection {
-    pub fn set_cursor_icon(&self, window: ffi::Window, cursor: Option<CursorIcon>) {
-        let cursor = *self
-            .cursor_cache
-            .lock()
-            .unwrap()
-            .entry(cursor)
-            .or_insert_with(|| self.get_cursor(cursor));
-
-        self.update_cursor(window, cursor);
-    }
-
-    fn create_empty_cursor(&self) -> ffi::Cursor {
-        let data = 0;
-        let pixmap = unsafe {
-            let screen = (self.xlib.XDefaultScreen)(self.display);
-            let window = (self.xlib.XRootWindow)(self.display, screen);
-            (self.xlib.XCreateBitmapFromData)(self.display, window, &data, 1, 1)
-        };
-
-        if pixmap == 0 {
-            panic!("failed to allocate pixmap for cursor");
-        }
-
-        unsafe {
-            // We don't care about this color, since it only fills bytes
-            // in the pixmap which are not 0 in the mask.
-            let mut dummy_color = MaybeUninit::uninit();
-            let cursor = (self.xlib.XCreatePixmapCursor)(
-                self.display,
-                pixmap,
-                pixmap,
-                dummy_color.as_mut_ptr(),
-                dummy_color.as_mut_ptr(),
-                0,
-                0,
-            );
-            (self.xlib.XFreePixmap)(self.display, pixmap);
-
-            cursor
-        }
-    }
-
-    fn load_cursor(&self, name: &[u8]) -> ffi::Cursor {
-        unsafe {
-            (self.xcursor.XcursorLibraryLoadCursor)(self.display, name.as_ptr() as *const c_char)
-        }
-    }
-
-    fn load_first_existing_cursor(&self, names: &[&[u8]]) -> ffi::Cursor {
-        for name in names.iter() {
-            let xcursor = self.load_cursor(name);
-            if xcursor != 0 {
-                return xcursor;
-            }
-        }
-        0
-    }
-
-    fn get_cursor(&self, cursor: Option<CursorIcon>) -> ffi::Cursor {
-        let cursor = match cursor {
-            Some(cursor) => cursor,
-            None => return self.create_empty_cursor(),
-        };
-
-        let load = |name: &[u8]| self.load_cursor(name);
-
-        let loadn = |names: &[&[u8]]| self.load_first_existing_cursor(names);
-
-        // Try multiple names in some cases where the name
-        // differs on the desktop environments or themes.
-        //
-        // Try the better looking (or more suiting) names first.
-        match cursor {
-            CursorIcon::Alias => load(b"link\0"),
-            CursorIcon::Arrow => load(b"arrow\0"),
-            CursorIcon::Cell => load(b"plus\0"),
-            CursorIcon::Copy => load(b"copy\0"),
-            CursorIcon::Crosshair => load(b"crosshair\0"),
-            CursorIcon::Default => load(b"left_ptr\0"),
-            CursorIcon::Hand => loadn(&[b"hand2\0", b"hand1\0"]),
-            CursorIcon::Help => load(b"question_arrow\0"),
-            CursorIcon::Move => load(b"move\0"),
-            CursorIcon::Grab => loadn(&[b"openhand\0", b"grab\0"]),
-            CursorIcon::Grabbing => loadn(&[b"closedhand\0", b"grabbing\0"]),
-            CursorIcon::Progress => load(b"left_ptr_watch\0"),
-            CursorIcon::AllScroll => load(b"all-scroll\0"),
-            CursorIcon::ContextMenu => load(b"context-menu\0"),
-
-            CursorIcon::NoDrop => loadn(&[b"no-drop\0", b"circle\0"]),
-            CursorIcon::NotAllowed => load(b"crossed_circle\0"),
-
-            // Resize cursors
-            CursorIcon::EResize => load(b"right_side\0"),
-            CursorIcon::NResize => load(b"top_side\0"),
-            CursorIcon::NeResize => load(b"top_right_corner\0"),
-            CursorIcon::NwResize => load(b"top_left_corner\0"),
-            CursorIcon::SResize => load(b"bottom_side\0"),
-            CursorIcon::SeResize => load(b"bottom_right_corner\0"),
-            CursorIcon::SwResize => load(b"bottom_left_corner\0"),
-            CursorIcon::WResize => load(b"left_side\0"),
-            CursorIcon::EwResize => load(b"h_double_arrow\0"),
-            CursorIcon::NsResize => load(b"v_double_arrow\0"),
-            CursorIcon::NwseResize => loadn(&[b"bd_double_arrow\0", b"size_fdiag\0"]),
-            CursorIcon::NeswResize => loadn(&[b"fd_double_arrow\0", b"size_bdiag\0"]),
-            CursorIcon::ColResize => loadn(&[b"split_h\0", b"h_double_arrow\0"]),
-            CursorIcon::RowResize => loadn(&[b"split_v\0", b"v_double_arrow\0"]),
-
-            CursorIcon::Text => loadn(&[b"text\0", b"xterm\0"]),
-            CursorIcon::VerticalText => load(b"vertical-text\0"),
-
-            CursorIcon::Wait => load(b"watch\0"),
-
-            CursorIcon::ZoomIn => load(b"zoom-in\0"),
-            CursorIcon::ZoomOut => load(b"zoom-out\0"),
-        }
-    }
-
-    fn update_cursor(&self, window: ffi::Window, cursor: ffi::Cursor) {
-        unsafe {
-            (self.xlib.XDefineCursor)(self.display, window, cursor);
-
-            self.flush_requests().expect("Failed to set the cursor");
-        }
-    }
-}

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

@@ -1,55 +0,0 @@
-use std::{fmt::Debug, mem, os::raw::*};
-
-// This isn't actually the number of the bits in the format.
-// X11 does a match on this value to determine which type to call sizeof on.
-// Thus, we use 32 for c_long, since 32 maps to c_long which maps to 64.
-// ...if that sounds confusing, then you know why this enum is here.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub enum Format {
-    Char = 8,
-    Short = 16,
-    Long = 32,
-}
-
-impl Format {
-    pub fn from_format(format: usize) -> Option<Self> {
-        match format {
-            8 => Some(Format::Char),
-            16 => Some(Format::Short),
-            32 => Some(Format::Long),
-            _ => None,
-        }
-    }
-
-    pub fn get_actual_size(&self) -> usize {
-        match self {
-            Format::Char => mem::size_of::<c_char>(),
-            Format::Short => mem::size_of::<c_short>(),
-            Format::Long => mem::size_of::<c_long>(),
-        }
-    }
-}
-
-pub trait Formattable: Debug + Clone + Copy + PartialEq + PartialOrd {
-    const FORMAT: Format;
-}
-
-// You might be surprised by the absence of c_int, but not as surprised as X11 would be by the presence of it.
-impl Formattable for c_schar {
-    const FORMAT: Format = Format::Char;
-}
-impl Formattable for c_uchar {
-    const FORMAT: Format = Format::Char;
-}
-impl Formattable for c_short {
-    const FORMAT: Format = Format::Short;
-}
-impl Formattable for c_ushort {
-    const FORMAT: Format = Format::Short;
-}
-impl Formattable for c_long {
-    const FORMAT: Format = Format::Long;
-}
-impl Formattable for c_ulong {
-    const FORMAT: Format = Format::Long;
-}

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

@@ -1,348 +0,0 @@
-use std::slice;
-use std::sync::Arc;
-
-use super::*;
-
-#[derive(Debug)]
-#[allow(dead_code)]
-pub enum StateOperation {
-    Remove = 0, // _NET_WM_STATE_REMOVE
-    Add = 1,    // _NET_WM_STATE_ADD
-    Toggle = 2, // _NET_WM_STATE_TOGGLE
-}
-
-impl From<bool> for StateOperation {
-    fn from(op: bool) -> Self {
-        if op {
-            StateOperation::Add
-        } else {
-            StateOperation::Remove
-        }
-    }
-}
-
-/// X window type. Maps directly to
-/// [`_NET_WM_WINDOW_TYPE`](https://specifications.freedesktop.org/wm-spec/wm-spec-1.5.html).
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum WindowType {
-    /// A desktop feature. This can include a single window containing desktop icons with the same dimensions as the
-    /// screen, allowing the desktop environment to have full control of the desktop, without the need for proxying
-    /// root window clicks.
-    Desktop,
-    /// A dock or panel feature. Typically a Window Manager would keep such windows on top of all other windows.
-    Dock,
-    /// Toolbar windows. "Torn off" from the main application.
-    Toolbar,
-    /// Pinnable menu windows. "Torn off" from the main application.
-    Menu,
-    /// A small persistent utility window, such as a palette or toolbox.
-    Utility,
-    /// The window is a splash screen displayed as an application is starting up.
-    Splash,
-    /// This is a dialog window.
-    Dialog,
-    /// A dropdown menu that usually appears when the user clicks on an item in a menu bar.
-    /// This property is typically used on override-redirect windows.
-    DropdownMenu,
-    /// A popup menu that usually appears when the user right clicks on an object.
-    /// This property is typically used on override-redirect windows.
-    PopupMenu,
-    /// A tooltip window. Usually used to show additional information when hovering over an object with the cursor.
-    /// This property is typically used on override-redirect windows.
-    Tooltip,
-    /// The window is a notification.
-    /// This property is typically used on override-redirect windows.
-    Notification,
-    /// This should be used on the windows that are popped up by combo boxes.
-    /// This property is typically used on override-redirect windows.
-    Combo,
-    /// This indicates the the window is being dragged.
-    /// This property is typically used on override-redirect windows.
-    Dnd,
-    /// This is a normal, top-level window.
-    Normal,
-}
-
-impl Default for WindowType {
-    fn default() -> Self {
-        WindowType::Normal
-    }
-}
-
-impl WindowType {
-    pub(crate) fn as_atom(&self, xconn: &Arc<XConnection>) -> ffi::Atom {
-        use self::WindowType::*;
-        let atom_name: &[u8] = match *self {
-            Desktop => b"_NET_WM_WINDOW_TYPE_DESKTOP\0",
-            Dock => b"_NET_WM_WINDOW_TYPE_DOCK\0",
-            Toolbar => b"_NET_WM_WINDOW_TYPE_TOOLBAR\0",
-            Menu => b"_NET_WM_WINDOW_TYPE_MENU\0",
-            Utility => b"_NET_WM_WINDOW_TYPE_UTILITY\0",
-            Splash => b"_NET_WM_WINDOW_TYPE_SPLASH\0",
-            Dialog => b"_NET_WM_WINDOW_TYPE_DIALOG\0",
-            DropdownMenu => b"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0",
-            PopupMenu => b"_NET_WM_WINDOW_TYPE_POPUP_MENU\0",
-            Tooltip => b"_NET_WM_WINDOW_TYPE_TOOLTIP\0",
-            Notification => b"_NET_WM_WINDOW_TYPE_NOTIFICATION\0",
-            Combo => b"_NET_WM_WINDOW_TYPE_COMBO\0",
-            Dnd => b"_NET_WM_WINDOW_TYPE_DND\0",
-            Normal => b"_NET_WM_WINDOW_TYPE_NORMAL\0",
-        };
-        unsafe { xconn.get_atom_unchecked(atom_name) }
-    }
-}
-
-pub struct MotifHints {
-    hints: MwmHints,
-}
-
-#[repr(C)]
-struct MwmHints {
-    flags: c_ulong,
-    functions: c_ulong,
-    decorations: c_ulong,
-    input_mode: c_long,
-    status: c_ulong,
-}
-
-#[allow(dead_code)]
-mod mwm {
-    use libc::c_ulong;
-
-    // Motif WM hints are obsolete, but still widely supported.
-    // https://stackoverflow.com/a/1909708
-    pub const MWM_HINTS_FUNCTIONS: c_ulong = 1 << 0;
-    pub const MWM_HINTS_DECORATIONS: c_ulong = 1 << 1;
-
-    pub const MWM_FUNC_ALL: c_ulong = 1 << 0;
-    pub const MWM_FUNC_RESIZE: c_ulong = 1 << 1;
-    pub const MWM_FUNC_MOVE: c_ulong = 1 << 2;
-    pub const MWM_FUNC_MINIMIZE: c_ulong = 1 << 3;
-    pub const MWM_FUNC_MAXIMIZE: c_ulong = 1 << 4;
-    pub const MWM_FUNC_CLOSE: c_ulong = 1 << 5;
-}
-
-impl MotifHints {
-    pub fn new() -> MotifHints {
-        MotifHints {
-            hints: MwmHints {
-                flags: 0,
-                functions: 0,
-                decorations: 0,
-                input_mode: 0,
-                status: 0,
-            },
-        }
-    }
-
-    pub fn set_decorations(&mut self, decorations: bool) {
-        self.hints.flags |= mwm::MWM_HINTS_DECORATIONS;
-        self.hints.decorations = decorations as c_ulong;
-    }
-
-    pub fn set_maximizable(&mut self, maximizable: bool) {
-        if maximizable {
-            self.add_func(mwm::MWM_FUNC_MAXIMIZE);
-        } else {
-            self.remove_func(mwm::MWM_FUNC_MAXIMIZE);
-        }
-    }
-
-    fn add_func(&mut self, func: c_ulong) {
-        if self.hints.flags & mwm::MWM_HINTS_FUNCTIONS != 0 {
-            if self.hints.functions & mwm::MWM_FUNC_ALL != 0 {
-                self.hints.functions &= !func;
-            } else {
-                self.hints.functions |= func;
-            }
-        }
-    }
-
-    fn remove_func(&mut self, func: c_ulong) {
-        if self.hints.flags & mwm::MWM_HINTS_FUNCTIONS == 0 {
-            self.hints.flags |= mwm::MWM_HINTS_FUNCTIONS;
-            self.hints.functions = mwm::MWM_FUNC_ALL;
-        }
-
-        if self.hints.functions & mwm::MWM_FUNC_ALL != 0 {
-            self.hints.functions |= func;
-        } else {
-            self.hints.functions &= !func;
-        }
-    }
-}
-
-impl Default for MotifHints {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl MwmHints {
-    fn as_slice(&self) -> &[c_ulong] {
-        unsafe { slice::from_raw_parts(self as *const _ as *const c_ulong, 5) }
-    }
-}
-
-pub(crate) struct NormalHints<'a> {
-    size_hints: XSmartPointer<'a, ffi::XSizeHints>,
-}
-
-impl<'a> NormalHints<'a> {
-    pub fn new(xconn: &'a XConnection) -> Self {
-        NormalHints {
-            size_hints: xconn.alloc_size_hints(),
-        }
-    }
-
-    pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
-        has_flag(self.size_hints.flags, ffi::PResizeInc).then(|| {
-            (
-                self.size_hints.width_inc as u32,
-                self.size_hints.height_inc as u32,
-            )
-        })
-    }
-
-    pub fn set_position(&mut self, position: Option<(i32, i32)>) {
-        if let Some((x, y)) = position {
-            self.size_hints.flags |= ffi::PPosition;
-            self.size_hints.x = x as c_int;
-            self.size_hints.y = y as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PPosition;
-        }
-    }
-
-    // WARNING: This hint is obsolete
-    pub fn set_size(&mut self, size: Option<(u32, u32)>) {
-        if let Some((width, height)) = size {
-            self.size_hints.flags |= ffi::PSize;
-            self.size_hints.width = width as c_int;
-            self.size_hints.height = height as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PSize;
-        }
-    }
-
-    pub fn set_max_size(&mut self, max_size: Option<(u32, u32)>) {
-        if let Some((max_width, max_height)) = max_size {
-            self.size_hints.flags |= ffi::PMaxSize;
-            self.size_hints.max_width = max_width as c_int;
-            self.size_hints.max_height = max_height as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PMaxSize;
-        }
-    }
-
-    pub fn set_min_size(&mut self, min_size: Option<(u32, u32)>) {
-        if let Some((min_width, min_height)) = min_size {
-            self.size_hints.flags |= ffi::PMinSize;
-            self.size_hints.min_width = min_width as c_int;
-            self.size_hints.min_height = min_height as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PMinSize;
-        }
-    }
-
-    pub fn set_resize_increments(&mut self, resize_increments: Option<(u32, u32)>) {
-        if let Some((width_inc, height_inc)) = resize_increments {
-            self.size_hints.flags |= ffi::PResizeInc;
-            self.size_hints.width_inc = width_inc as c_int;
-            self.size_hints.height_inc = height_inc as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PResizeInc;
-        }
-    }
-
-    pub fn set_base_size(&mut self, base_size: Option<(u32, u32)>) {
-        if let Some((base_width, base_height)) = base_size {
-            self.size_hints.flags |= ffi::PBaseSize;
-            self.size_hints.base_width = base_width as c_int;
-            self.size_hints.base_height = base_height as c_int;
-        } else {
-            self.size_hints.flags &= !ffi::PBaseSize;
-        }
-    }
-}
-
-impl XConnection {
-    pub fn get_wm_hints(
-        &self,
-        window: ffi::Window,
-    ) -> Result<XSmartPointer<'_, ffi::XWMHints>, XError> {
-        let wm_hints = unsafe { (self.xlib.XGetWMHints)(self.display, window) };
-        self.check_errors()?;
-        let wm_hints = if wm_hints.is_null() {
-            self.alloc_wm_hints()
-        } else {
-            XSmartPointer::new(self, wm_hints).unwrap()
-        };
-        Ok(wm_hints)
-    }
-
-    pub fn set_wm_hints(
-        &self,
-        window: ffi::Window,
-        wm_hints: XSmartPointer<'_, ffi::XWMHints>,
-    ) -> Flusher<'_> {
-        unsafe {
-            (self.xlib.XSetWMHints)(self.display, window, wm_hints.ptr);
-        }
-        Flusher::new(self)
-    }
-
-    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints<'_>, XError> {
-        let size_hints = self.alloc_size_hints();
-        let mut supplied_by_user = MaybeUninit::uninit();
-        unsafe {
-            (self.xlib.XGetWMNormalHints)(
-                self.display,
-                window,
-                size_hints.ptr,
-                supplied_by_user.as_mut_ptr(),
-            );
-        }
-        self.check_errors().map(|_| NormalHints { size_hints })
-    }
-
-    pub fn set_normal_hints(
-        &self,
-        window: ffi::Window,
-        normal_hints: NormalHints<'_>,
-    ) -> Flusher<'_> {
-        unsafe {
-            (self.xlib.XSetWMNormalHints)(self.display, window, normal_hints.size_hints.ptr);
-        }
-        Flusher::new(self)
-    }
-
-    pub fn get_motif_hints(&self, window: ffi::Window) -> MotifHints {
-        let motif_hints = unsafe { self.get_atom_unchecked(b"_MOTIF_WM_HINTS\0") };
-
-        let mut hints = MotifHints::new();
-
-        if let Ok(props) = self.get_property::<c_ulong>(window, motif_hints, motif_hints) {
-            hints.hints.flags = props.first().cloned().unwrap_or(0);
-            hints.hints.functions = props.get(1).cloned().unwrap_or(0);
-            hints.hints.decorations = props.get(2).cloned().unwrap_or(0);
-            hints.hints.input_mode = props.get(3).cloned().unwrap_or(0) as c_long;
-            hints.hints.status = props.get(4).cloned().unwrap_or(0);
-        }
-
-        hints
-    }
-
-    pub fn set_motif_hints(&self, window: ffi::Window, hints: &MotifHints) -> Flusher<'_> {
-        let motif_hints = unsafe { self.get_atom_unchecked(b"_MOTIF_WM_HINTS\0") };
-
-        self.change_property(
-            window,
-            motif_hints,
-            motif_hints,
-            PropMode::Replace,
-            hints.hints.as_slice(),
-        )
-    }
-}

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

@@ -1,190 +0,0 @@
-use std::{slice, str};
-
-use super::*;
-use crate::event::ModifiersState;
-
-pub const VIRTUAL_CORE_POINTER: c_int = 2;
-pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
-
-// A base buffer size of 1kB uses a negligible amount of RAM while preventing us from having to
-// re-allocate (and make another round-trip) in the *vast* majority of cases.
-// To test if `lookup_utf8` works correctly, set this to 1.
-const TEXT_BUFFER_SIZE: usize = 1024;
-
-impl ModifiersState {
-    pub(crate) fn from_x11(state: &ffi::XIModifierState) -> Self {
-        ModifiersState::from_x11_mask(state.effective as c_uint)
-    }
-
-    pub(crate) fn from_x11_mask(mask: c_uint) -> Self {
-        let mut m = ModifiersState::empty();
-        m.set(ModifiersState::ALT, mask & ffi::Mod1Mask != 0);
-        m.set(ModifiersState::SHIFT, mask & ffi::ShiftMask != 0);
-        m.set(ModifiersState::CTRL, mask & ffi::ControlMask != 0);
-        m.set(ModifiersState::LOGO, mask & ffi::Mod4Mask != 0);
-        m
-    }
-}
-
-// NOTE: Some of these fields are not used, but may be of use in the future.
-pub struct PointerState<'a> {
-    xconn: &'a XConnection,
-    pub root: ffi::Window,
-    pub child: ffi::Window,
-    pub root_x: c_double,
-    pub root_y: c_double,
-    pub win_x: c_double,
-    pub win_y: c_double,
-    buttons: ffi::XIButtonState,
-    modifiers: ffi::XIModifierState,
-    pub group: ffi::XIGroupState,
-    pub relative_to_window: bool,
-}
-
-impl<'a> PointerState<'a> {
-    pub fn get_modifier_state(&self) -> ModifiersState {
-        ModifiersState::from_x11(&self.modifiers)
-    }
-}
-
-impl<'a> Drop for PointerState<'a> {
-    fn drop(&mut self) {
-        if !self.buttons.mask.is_null() {
-            unsafe {
-                // This is why you need to read the docs carefully...
-                (self.xconn.xlib.XFree)(self.buttons.mask as _);
-            }
-        }
-    }
-}
-
-impl XConnection {
-    pub fn select_xinput_events(
-        &self,
-        window: c_ulong,
-        device_id: c_int,
-        mask: i32,
-    ) -> Flusher<'_> {
-        let mut event_mask = ffi::XIEventMask {
-            deviceid: device_id,
-            mask: &mask as *const _ as *mut c_uchar,
-            mask_len: mem::size_of_val(&mask) as c_int,
-        };
-        unsafe {
-            (self.xinput2.XISelectEvents)(
-                self.display,
-                window,
-                &mut event_mask as *mut ffi::XIEventMask,
-                1, // number of masks to read from pointer above
-            );
-        }
-        Flusher::new(self)
-    }
-
-    #[allow(dead_code)]
-    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher<'_>> {
-        let status = unsafe { (self.xlib.XkbSelectEvents)(self.display, device_id, mask, mask) };
-        if status == ffi::True {
-            Some(Flusher::new(self))
-        } else {
-            None
-        }
-    }
-
-    pub fn query_pointer(
-        &self,
-        window: ffi::Window,
-        device_id: c_int,
-    ) -> Result<PointerState<'_>, XError> {
-        unsafe {
-            let mut root = 0;
-            let mut child = 0;
-            let mut root_x = 0.0;
-            let mut root_y = 0.0;
-            let mut win_x = 0.0;
-            let mut win_y = 0.0;
-            let mut buttons = Default::default();
-            let mut modifiers = Default::default();
-            let mut group = Default::default();
-
-            let relative_to_window = (self.xinput2.XIQueryPointer)(
-                self.display,
-                device_id,
-                window,
-                &mut root,
-                &mut child,
-                &mut root_x,
-                &mut root_y,
-                &mut win_x,
-                &mut win_y,
-                &mut buttons,
-                &mut modifiers,
-                &mut group,
-            ) == ffi::True;
-
-            self.check_errors()?;
-
-            Ok(PointerState {
-                xconn: self,
-                root,
-                child,
-                root_x,
-                root_y,
-                win_x,
-                win_y,
-                buttons,
-                modifiers,
-                group,
-                relative_to_window,
-            })
-        }
-    }
-
-    fn lookup_utf8_inner(
-        &self,
-        ic: ffi::XIC,
-        key_event: &mut ffi::XKeyEvent,
-        buffer: *mut u8,
-        size: usize,
-    ) -> (ffi::KeySym, ffi::Status, c_int) {
-        let mut keysym: ffi::KeySym = 0;
-        let mut status: ffi::Status = 0;
-        let count = unsafe {
-            (self.xlib.Xutf8LookupString)(
-                ic,
-                key_event,
-                buffer as *mut c_char,
-                size as c_int,
-                &mut keysym,
-                &mut status,
-            )
-        };
-        (keysym, status, count)
-    }
-
-    pub fn lookup_utf8(&self, ic: ffi::XIC, key_event: &mut ffi::XKeyEvent) -> String {
-        // `assume_init` is safe here because the array consists of `MaybeUninit` values,
-        // which do not require initialization.
-        let mut buffer: [MaybeUninit<u8>; TEXT_BUFFER_SIZE] =
-            unsafe { MaybeUninit::uninit().assume_init() };
-        // If the buffer overflows, we'll make a new one on the heap.
-        let mut vec;
-
-        let (_, status, count) =
-            self.lookup_utf8_inner(ic, key_event, buffer.as_mut_ptr() as *mut u8, buffer.len());
-
-        let bytes = if status == ffi::XBufferOverflow {
-            vec = Vec::with_capacity(count as usize);
-            let (_, _, new_count) =
-                self.lookup_utf8_inner(ic, key_event, vec.as_mut_ptr(), vec.capacity());
-            debug_assert_eq!(count, new_count);
-
-            unsafe { vec.set_len(count as usize) };
-            &vec[..count as usize]
-        } else {
-            unsafe { slice::from_raw_parts(buffer.as_ptr() as *const u8, count as usize) }
-        };
-
-        str::from_utf8(bytes).unwrap_or("").to_string()
-    }
-}

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

@@ -1,214 +0,0 @@
-use std::{env, slice, str::FromStr};
-
-use super::{
-    ffi::{CurrentTime, RRCrtc, RRMode, Success, XRRCrtcInfo, XRRScreenResources},
-    *,
-};
-use crate::platform_impl::platform::x11::monitor;
-use crate::{dpi::validate_scale_factor, platform_impl::platform::x11::VideoMode};
-
-/// Represents values of `WINIT_HIDPI_FACTOR`.
-pub enum EnvVarDPI {
-    Randr,
-    Scale(f64),
-    NotSet,
-}
-
-pub fn calc_dpi_factor(
-    (width_px, height_px): (u32, u32),
-    (width_mm, height_mm): (u64, u64),
-) -> f64 {
-    // See http://xpra.org/trac/ticket/728 for more information.
-    if width_mm == 0 || height_mm == 0 {
-        warn!("XRandR reported that the display's 0mm in size, which is certifiably insane");
-        return 1.0;
-    }
-
-    let ppmm = ((width_px as f64 * height_px as f64) / (width_mm as f64 * height_mm as f64)).sqrt();
-    // Quantize 1/12 step size
-    let dpi_factor = ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0);
-    assert!(validate_scale_factor(dpi_factor));
-    if dpi_factor <= 20. {
-        dpi_factor
-    } else {
-        1.
-    }
-}
-
-impl XConnection {
-    // Retrieve DPI from Xft.dpi property
-    pub unsafe fn get_xft_dpi(&self) -> Option<f64> {
-        (self.xlib.XrmInitialize)();
-        let resource_manager_str = (self.xlib.XResourceManagerString)(self.display);
-        if resource_manager_str.is_null() {
-            return None;
-        }
-        if let Ok(res) = ::std::ffi::CStr::from_ptr(resource_manager_str).to_str() {
-            let name: &str = "Xft.dpi:\t";
-            for pair in res.split('\n') {
-                if let Some(stripped) = pair.strip_prefix(name) {
-                    return f64::from_str(stripped).ok();
-                }
-            }
-        }
-        None
-    }
-    pub unsafe fn get_output_info(
-        &self,
-        resources: *mut XRRScreenResources,
-        crtc: *mut XRRCrtcInfo,
-    ) -> Option<(String, f64, Vec<VideoMode>)> {
-        let output_info =
-            (self.xrandr.XRRGetOutputInfo)(self.display, resources, *(*crtc).outputs.offset(0));
-        if output_info.is_null() {
-            // When calling `XRRGetOutputInfo` on a virtual monitor (versus a physical display)
-            // it's possible for it to return null.
-            // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816596
-            let _ = self.check_errors(); // discard `BadRROutput` error
-            return None;
-        }
-
-        let screen = (self.xlib.XDefaultScreen)(self.display);
-        let bit_depth = (self.xlib.XDefaultDepth)(self.display, screen);
-
-        let output_modes =
-            slice::from_raw_parts((*output_info).modes, (*output_info).nmode as usize);
-        let resource_modes = slice::from_raw_parts((*resources).modes, (*resources).nmode as usize);
-
-        let modes = resource_modes
-            .iter()
-            // XRROutputInfo contains an array of mode ids that correspond to
-            // modes in the array in XRRScreenResources
-            .filter(|x| output_modes.iter().any(|id| x.id == *id))
-            .map(|mode| {
-                VideoMode {
-                    size: (mode.width, mode.height),
-                    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
-                    monitor: None,
-                }
-            })
-            .collect();
-
-        let name_slice = slice::from_raw_parts(
-            (*output_info).name as *mut u8,
-            (*output_info).nameLen as usize,
-        );
-        let name = String::from_utf8_lossy(name_slice).into();
-        // Override DPI if `WINIT_X11_SCALE_FACTOR` variable is set
-        let deprecated_dpi_override = env::var("WINIT_HIDPI_FACTOR").ok();
-        if deprecated_dpi_override.is_some() {
-            warn!(
-	            "The WINIT_HIDPI_FACTOR environment variable is deprecated; use WINIT_X11_SCALE_FACTOR"
-	        )
-        }
-        let dpi_env = env::var("WINIT_X11_SCALE_FACTOR").ok().map_or_else(
-            || EnvVarDPI::NotSet,
-            |var| {
-                if var.to_lowercase() == "randr" {
-                    EnvVarDPI::Randr
-                } else if let Ok(dpi) = f64::from_str(&var) {
-                    EnvVarDPI::Scale(dpi)
-                } else if var.is_empty() {
-                    EnvVarDPI::NotSet
-                } else {
-                    panic!(
-                        "`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{var}`"
-                    );
-                }
-            },
-        );
-
-        let scale_factor = match dpi_env {
-            EnvVarDPI::Randr => calc_dpi_factor(
-                ((*crtc).width, (*crtc).height),
-                ((*output_info).mm_width as _, (*output_info).mm_height as _),
-            ),
-            EnvVarDPI::Scale(dpi_override) => {
-                if !validate_scale_factor(dpi_override) {
-                    panic!(
-                        "`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{dpi_override}`",
-                    );
-                }
-                dpi_override
-            }
-            EnvVarDPI::NotSet => {
-                if let Some(dpi) = self.get_xft_dpi() {
-                    dpi / 96.
-                } else {
-                    calc_dpi_factor(
-                        ((*crtc).width, (*crtc).height),
-                        ((*output_info).mm_width as _, (*output_info).mm_height as _),
-                    )
-                }
-            }
-        };
-
-        (self.xrandr.XRRFreeOutputInfo)(output_info);
-        Some((name, scale_factor, modes))
-    }
-
-    #[must_use]
-    pub fn set_crtc_config(&self, crtc_id: RRCrtc, mode_id: RRMode) -> Option<()> {
-        unsafe {
-            let mut major = 0;
-            let mut minor = 0;
-            (self.xrandr.XRRQueryVersion)(self.display, &mut major, &mut minor);
-
-            let root = (self.xlib.XDefaultRootWindow)(self.display);
-            let resources = if (major == 1 && minor >= 3) || major > 1 {
-                (self.xrandr.XRRGetScreenResourcesCurrent)(self.display, root)
-            } else {
-                (self.xrandr.XRRGetScreenResources)(self.display, root)
-            };
-
-            let crtc = (self.xrandr.XRRGetCrtcInfo)(self.display, resources, crtc_id);
-            let status = (self.xrandr.XRRSetCrtcConfig)(
-                self.display,
-                resources,
-                crtc_id,
-                CurrentTime,
-                (*crtc).x,
-                (*crtc).y,
-                mode_id,
-                (*crtc).rotation,
-                (*crtc).outputs.offset(0),
-                1,
-            );
-
-            (self.xrandr.XRRFreeCrtcInfo)(crtc);
-            (self.xrandr.XRRFreeScreenResources)(resources);
-
-            if status == Success as i32 {
-                Some(())
-            } else {
-                None
-            }
-        }
-    }
-
-    pub fn get_crtc_mode(&self, crtc_id: RRCrtc) -> RRMode {
-        unsafe {
-            let mut major = 0;
-            let mut minor = 0;
-            (self.xrandr.XRRQueryVersion)(self.display, &mut major, &mut minor);
-
-            let root = (self.xlib.XDefaultRootWindow)(self.display);
-            let resources = if (major == 1 && minor >= 3) || major > 1 {
-                (self.xrandr.XRRGetScreenResourcesCurrent)(self.display, root)
-            } else {
-                (self.xrandr.XRRGetScreenResources)(self.display, root)
-            };
-
-            let crtc = (self.xrandr.XRRGetCrtcInfo)(self.display, resources, crtc_id);
-            let mode = (*crtc).mode;
-            (self.xrandr.XRRFreeCrtcInfo)(crtc);
-            (self.xrandr.XRRFreeScreenResources)(resources);
-            mode
-        }
-    }
-}

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

@@ -1,142 +0,0 @@
-use super::*;
-
-pub type Cardinal = c_long;
-pub const CARDINAL_SIZE: usize = mem::size_of::<c_long>();
-
-#[derive(Debug, Clone)]
-pub enum GetPropertyError {
-    XError(XError),
-    TypeMismatch(ffi::Atom),
-    FormatMismatch(c_int),
-    NothingAllocated,
-}
-
-impl GetPropertyError {
-    pub fn is_actual_property_type(&self, t: ffi::Atom) -> bool {
-        if let GetPropertyError::TypeMismatch(actual_type) = *self {
-            actual_type == t
-        } else {
-            false
-        }
-    }
-}
-
-// Number of 32-bit chunks to retrieve per iteration of get_property's inner loop.
-// To test if `get_property` works correctly, set this to 1.
-const PROPERTY_BUFFER_SIZE: c_long = 1024; // 4k of RAM ought to be enough for anyone!
-
-#[derive(Debug)]
-#[allow(dead_code)]
-pub enum PropMode {
-    Replace = ffi::PropModeReplace as isize,
-    Prepend = ffi::PropModePrepend as isize,
-    Append = ffi::PropModeAppend as isize,
-}
-
-impl XConnection {
-    pub fn get_property<T: Formattable>(
-        &self,
-        window: c_ulong,
-        property: ffi::Atom,
-        property_type: ffi::Atom,
-    ) -> Result<Vec<T>, GetPropertyError> {
-        let mut data = Vec::new();
-        let mut offset = 0;
-
-        let mut done = false;
-        let mut actual_type = 0;
-        let mut actual_format = 0;
-        let mut quantity_returned = 0;
-        let mut bytes_after = 0;
-        let mut buf: *mut c_uchar = ptr::null_mut();
-
-        while !done {
-            unsafe {
-                (self.xlib.XGetWindowProperty)(
-                    self.display,
-                    window,
-                    property,
-                    // This offset is in terms of 32-bit chunks.
-                    offset,
-                    // This is the quantity of 32-bit chunks to receive at once.
-                    PROPERTY_BUFFER_SIZE,
-                    ffi::False,
-                    property_type,
-                    &mut actual_type,
-                    &mut actual_format,
-                    // This is the quantity of items we retrieved in our format, NOT of 32-bit chunks!
-                    &mut quantity_returned,
-                    // ...and this is a quantity of bytes. So, this function deals in 3 different units.
-                    &mut bytes_after,
-                    &mut buf,
-                );
-
-                if let Err(e) = self.check_errors() {
-                    return Err(GetPropertyError::XError(e));
-                }
-
-                if actual_type != property_type {
-                    return Err(GetPropertyError::TypeMismatch(actual_type));
-                }
-
-                let format_mismatch = Format::from_format(actual_format as _) != Some(T::FORMAT);
-                if format_mismatch {
-                    return Err(GetPropertyError::FormatMismatch(actual_format));
-                }
-
-                if !buf.is_null() {
-                    offset += PROPERTY_BUFFER_SIZE;
-                    let new_data =
-                        std::slice::from_raw_parts(buf as *mut T, quantity_returned as usize);
-                    /*println!(
-                        "XGetWindowProperty prop:{:?} fmt:{:02} len:{:02} off:{:02} out:{:02}, buf:{:?}",
-                        property,
-                        mem::size_of::<T>() * 8,
-                        data.len(),
-                        offset,
-                        quantity_returned,
-                        new_data,
-                    );*/
-                    data.extend_from_slice(new_data);
-                    // Fun fact: XGetWindowProperty allocates one extra byte at the end.
-                    (self.xlib.XFree)(buf as _); // Don't try to access new_data after this.
-                } else {
-                    return Err(GetPropertyError::NothingAllocated);
-                }
-
-                done = bytes_after == 0;
-            }
-        }
-
-        Ok(data)
-    }
-
-    pub fn change_property<'a, T: Formattable>(
-        &'a self,
-        window: c_ulong,
-        property: ffi::Atom,
-        property_type: ffi::Atom,
-        mode: PropMode,
-        new_value: &[T],
-    ) -> Flusher<'a> {
-        debug_assert_eq!(mem::size_of::<T>(), T::FORMAT.get_actual_size());
-        unsafe {
-            (self.xlib.XChangeProperty)(
-                self.display,
-                window,
-                property,
-                property_type,
-                T::FORMAT as c_int,
-                mode as c_int,
-                new_value.as_ptr() as *const c_uchar,
-                new_value.len() as c_int,
-            );
-        }
-        /*println!(
-            "XChangeProperty prop:{:?} val:{:?}",
-            property,
-            new_value,
-        );*/
-        Flusher::new(self)
-    }
-}

src/platform_impl/linux/x11/xdisplay.rs

@@ -1,149 +0,0 @@
-use std::{collections::HashMap, error::Error, fmt, os::raw::c_int, ptr, sync::Mutex};
-
-use crate::window::CursorIcon;
-
-use super::ffi;
-
-/// A connection to an X server.
-pub(crate) struct XConnection {
-    pub xlib: ffi::Xlib,
-    /// Exposes XRandR functions from version < 1.5
-    pub xrandr: ffi::Xrandr_2_2_0,
-    pub xcursor: ffi::Xcursor,
-    pub xinput2: ffi::XInput2,
-    pub xlib_xcb: ffi::Xlib_xcb,
-    pub display: *mut ffi::Display,
-    pub x11_fd: c_int,
-    pub latest_error: Mutex<Option<XError>>,
-    pub cursor_cache: Mutex<HashMap<Option<CursorIcon>, ffi::Cursor>>,
-}
-
-unsafe impl Send for XConnection {}
-unsafe impl Sync for XConnection {}
-
-pub type XErrorHandler =
-    Option<unsafe extern "C" fn(*mut ffi::Display, *mut ffi::XErrorEvent) -> libc::c_int>;
-
-impl XConnection {
-    pub fn new(error_handler: XErrorHandler) -> Result<XConnection, XNotSupported> {
-        // opening the libraries
-        let xlib = ffi::Xlib::open()?;
-        let xcursor = ffi::Xcursor::open()?;
-        let xrandr = ffi::Xrandr_2_2_0::open()?;
-        let xinput2 = ffi::XInput2::open()?;
-        let xlib_xcb = ffi::Xlib_xcb::open()?;
-
-        unsafe { (xlib.XInitThreads)() };
-        unsafe { (xlib.XSetErrorHandler)(error_handler) };
-
-        // calling XOpenDisplay
-        let display = unsafe {
-            let display = (xlib.XOpenDisplay)(ptr::null());
-            if display.is_null() {
-                return Err(XNotSupported::XOpenDisplayFailed);
-            }
-            display
-        };
-
-        // Get X11 socket file descriptor
-        let fd = unsafe { (xlib.XConnectionNumber)(display) };
-
-        Ok(XConnection {
-            xlib,
-            xrandr,
-            xcursor,
-            xinput2,
-            xlib_xcb,
-            display,
-            x11_fd: fd,
-            latest_error: Mutex::new(None),
-            cursor_cache: Default::default(),
-        })
-    }
-
-    /// Checks whether an error has been triggered by the previous function calls.
-    #[inline]
-    pub fn check_errors(&self) -> Result<(), XError> {
-        let error = self.latest_error.lock().unwrap().take();
-        if let Some(error) = error {
-            Err(error)
-        } else {
-            Ok(())
-        }
-    }
-}
-
-impl fmt::Debug for XConnection {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.display.fmt(f)
-    }
-}
-
-impl Drop for XConnection {
-    #[inline]
-    fn drop(&mut self) {
-        unsafe { (self.xlib.XCloseDisplay)(self.display) };
-    }
-}
-
-/// Error triggered by xlib.
-#[derive(Debug, Clone)]
-pub struct XError {
-    pub description: String,
-    pub error_code: u8,
-    pub request_code: u8,
-    pub minor_code: u8,
-}
-
-impl Error for XError {}
-
-impl fmt::Display for XError {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            formatter,
-            "X error: {} (code: {}, request code: {}, minor code: {})",
-            self.description, self.error_code, self.request_code, self.minor_code
-        )
-    }
-}
-
-/// Error returned if this system doesn't have XLib or can't create an X connection.
-#[derive(Clone, Debug)]
-pub enum XNotSupported {
-    /// Failed to load one or several shared libraries.
-    LibraryOpenError(ffi::OpenError),
-    /// Connecting to the X server with `XOpenDisplay` failed.
-    XOpenDisplayFailed, // TODO: add better message
-}
-
-impl From<ffi::OpenError> for XNotSupported {
-    #[inline]
-    fn from(err: ffi::OpenError) -> XNotSupported {
-        XNotSupported::LibraryOpenError(err)
-    }
-}
-
-impl XNotSupported {
-    fn description(&self) -> &'static str {
-        match self {
-            XNotSupported::LibraryOpenError(_) => "Failed to load one of xlib's shared libraries",
-            XNotSupported::XOpenDisplayFailed => "Failed to open connection to X server",
-        }
-    }
-}
-
-impl Error for XNotSupported {
-    #[inline]
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match *self {
-            XNotSupported::LibraryOpenError(ref err) => Some(err),
-            _ => None,
-        }
-    }
-}
-
-impl fmt::Display for XNotSupported {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        formatter.write_str(self.description())
-    }
-}

src/platform_impl/macos/app.rs

@@ -1,98 +0,0 @@
-#![allow(clippy::unnecessary_cast)]
-
-use objc2::foundation::NSObject;
-use objc2::{declare_class, msg_send, ClassType};
-
-use super::appkit::{NSApplication, NSEvent, NSEventModifierFlags, NSEventType, NSResponder};
-use super::{app_state::AppState, event::EventWrapper, DEVICE_ID};
-use crate::event::{DeviceEvent, ElementState, Event};
-
-declare_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(super) struct WinitApplication {}
-
-    unsafe impl ClassType for WinitApplication {
-        #[inherits(NSResponder, NSObject)]
-        type Super = NSApplication;
-    }
-
-    unsafe impl WinitApplication {
-        // Normally, holding Cmd + any key never sends us a `keyUp` event for that key.
-        // Overriding `sendEvent:` like this fixes that. (https://stackoverflow.com/a/15294196)
-        // Fun fact: Firefox still has this bug! (https://bugzilla.mozilla.org/show_bug.cgi?id=1299553)
-        #[sel(sendEvent:)]
-        fn send_event(&self, event: &NSEvent) {
-            // For posterity, there are some undocumented event types
-            // (https://github.com/servo/cocoa-rs/issues/155)
-            // but that doesn't really matter here.
-            let event_type = event.type_();
-            let modifier_flags = event.modifierFlags();
-            if event_type == NSEventType::NSKeyUp
-                && modifier_flags.contains(NSEventModifierFlags::NSCommandKeyMask)
-            {
-                if let Some(key_window) = self.keyWindow() {
-                    unsafe { key_window.sendEvent(event) };
-                }
-            } else {
-                maybe_dispatch_device_event(event);
-                unsafe { msg_send![super(self), sendEvent: event] }
-            }
-        }
-    }
-);
-
-fn maybe_dispatch_device_event(event: &NSEvent) {
-    let event_type = event.type_();
-    match event_type {
-        NSEventType::NSMouseMoved
-        | NSEventType::NSLeftMouseDragged
-        | NSEventType::NSOtherMouseDragged
-        | NSEventType::NSRightMouseDragged => {
-            let delta_x = event.deltaX() as f64;
-            let delta_y = event.deltaY() as f64;
-
-            if delta_x != 0.0 {
-                queue_device_event(DeviceEvent::Motion {
-                    axis: 0,
-                    value: delta_x,
-                });
-            }
-
-            if delta_y != 0.0 {
-                queue_device_event(DeviceEvent::Motion {
-                    axis: 1,
-                    value: delta_y,
-                })
-            }
-
-            if delta_x != 0.0 || delta_y != 0.0 {
-                queue_device_event(DeviceEvent::MouseMotion {
-                    delta: (delta_x, delta_y),
-                });
-            }
-        }
-        NSEventType::NSLeftMouseDown
-        | NSEventType::NSRightMouseDown
-        | NSEventType::NSOtherMouseDown => {
-            queue_device_event(DeviceEvent::Button {
-                button: event.buttonNumber() as u32,
-                state: ElementState::Pressed,
-            });
-        }
-        NSEventType::NSLeftMouseUp | NSEventType::NSRightMouseUp | NSEventType::NSOtherMouseUp => {
-            queue_device_event(DeviceEvent::Button {
-                button: event.buttonNumber() as u32,
-                state: ElementState::Released,
-            });
-        }
-        _ => (),
-    }
-}
-
-fn queue_device_event(event: DeviceEvent) {
-    let event = Event::DeviceEvent {
-        device_id: DEVICE_ID,
-        event,
-    };
-    AppState::queue_event(EventWrapper::StaticEvent(event));
-}

src/platform_impl/macos/app_delegate.rs

@@ -1,73 +0,0 @@
-use objc2::foundation::NSObject;
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Object;
-use objc2::{declare_class, msg_send, msg_send_id, ClassType};
-
-use super::app_state::AppState;
-use super::appkit::NSApplicationActivationPolicy;
-
-declare_class!(
-    #[derive(Debug)]
-    pub(super) struct ApplicationDelegate {
-        activation_policy: NSApplicationActivationPolicy,
-        default_menu: bool,
-        activate_ignoring_other_apps: bool,
-    }
-
-    unsafe impl ClassType for ApplicationDelegate {
-        type Super = NSObject;
-        const NAME: &'static str = "WinitApplicationDelegate";
-    }
-
-    unsafe impl ApplicationDelegate {
-        #[sel(initWithActivationPolicy:defaultMenu:activateIgnoringOtherApps:)]
-        fn init(
-            &mut self,
-            activation_policy: NSApplicationActivationPolicy,
-            default_menu: bool,
-            activate_ignoring_other_apps: bool,
-        ) -> Option<&mut Self> {
-            let this: Option<&mut Self> = unsafe { msg_send![super(self), init] };
-            this.map(|this| {
-                *this.activation_policy = activation_policy;
-                *this.default_menu = default_menu;
-                *this.activate_ignoring_other_apps = activate_ignoring_other_apps;
-                this
-            })
-        }
-
-        #[sel(applicationDidFinishLaunching:)]
-        fn did_finish_launching(&self, _sender: *const Object) {
-            trace_scope!("applicationDidFinishLaunching:");
-            AppState::launched(
-                *self.activation_policy,
-                *self.default_menu,
-                *self.activate_ignoring_other_apps,
-            );
-        }
-
-        #[sel(applicationWillTerminate:)]
-        fn will_terminate(&self, _sender: *const Object) {
-            trace_scope!("applicationWillTerminate:");
-            // TODO: Notify every window that it will be destroyed, like done in iOS?
-            AppState::exit();
-        }
-    }
-);
-
-impl ApplicationDelegate {
-    pub(super) fn new(
-        activation_policy: NSApplicationActivationPolicy,
-        default_menu: bool,
-        activate_ignoring_other_apps: bool,
-    ) -> Id<Self, Shared> {
-        unsafe {
-            msg_send_id![
-                msg_send_id![Self::class(), alloc],
-                initWithActivationPolicy: activation_policy,
-                defaultMenu: default_menu,
-                activateIgnoringOtherApps: activate_ignoring_other_apps,
-            ]
-        }
-    }
-}

src/platform_impl/macos/app_state.rs

@@ -1,434 +0,0 @@
-use std::{
-    cell::{RefCell, RefMut},
-    collections::VecDeque,
-    fmt::{self, Debug},
-    mem,
-    rc::{Rc, Weak},
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Mutex, MutexGuard,
-    },
-    time::Instant,
-};
-
-use core_foundation::runloop::{CFRunLoopGetMain, CFRunLoopWakeUp};
-use objc2::foundation::{is_main_thread, NSSize};
-use objc2::rc::autoreleasepool;
-use once_cell::sync::Lazy;
-
-use super::appkit::{NSApp, NSApplication, NSApplicationActivationPolicy, NSEvent};
-use crate::{
-    dpi::LogicalSize,
-    event::{Event, StartCause, WindowEvent},
-    event_loop::{ControlFlow, EventLoopWindowTarget as RootWindowTarget},
-    platform_impl::platform::{
-        event::{EventProxy, EventWrapper},
-        event_loop::PanicInfo,
-        menu,
-        observer::EventLoopWaker,
-        util::Never,
-        window::WinitWindow,
-    },
-    window::WindowId,
-};
-
-static HANDLER: Lazy<Handler> = Lazy::new(Default::default);
-
-impl<'a, Never> Event<'a, Never> {
-    fn userify<T: 'static>(self) -> Event<'a, T> {
-        self.map_nonuser_event()
-            // `Never` can't be constructed, so the `UserEvent` variant can't
-            // be present here.
-            .unwrap_or_else(|_| unreachable!())
-    }
-}
-
-pub trait EventHandler: Debug {
-    // Not sure probably it should accept Event<'static, Never>
-    fn handle_nonuser_event(&mut self, event: Event<'_, Never>, control_flow: &mut ControlFlow);
-    fn handle_user_events(&mut self, control_flow: &mut ControlFlow);
-}
-
-pub(crate) type Callback<T> =
-    RefCell<dyn FnMut(Event<'_, T>, &RootWindowTarget<T>, &mut ControlFlow)>;
-
-struct EventLoopHandler<T: 'static> {
-    callback: Weak<Callback<T>>,
-    window_target: Rc<RootWindowTarget<T>>,
-}
-
-impl<T> EventLoopHandler<T> {
-    fn with_callback<F>(&mut self, f: F)
-    where
-        F: FnOnce(
-            &mut EventLoopHandler<T>,
-            RefMut<'_, dyn FnMut(Event<'_, T>, &RootWindowTarget<T>, &mut ControlFlow)>,
-        ),
-    {
-        if let Some(callback) = self.callback.upgrade() {
-            let callback = callback.borrow_mut();
-            (f)(self, callback);
-        } else {
-            panic!(
-                "Tried to dispatch an event, but the event loop that \
-                owned the event handler callback seems to be destroyed"
-            );
-        }
-    }
-}
-
-impl<T> Debug for EventLoopHandler<T> {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter
-            .debug_struct("EventLoopHandler")
-            .field("window_target", &self.window_target)
-            .finish()
-    }
-}
-
-impl<T> EventHandler for EventLoopHandler<T> {
-    fn handle_nonuser_event(&mut self, event: Event<'_, Never>, control_flow: &mut ControlFlow) {
-        self.with_callback(|this, mut callback| {
-            if let ControlFlow::ExitWithCode(code) = *control_flow {
-                let dummy = &mut ControlFlow::ExitWithCode(code);
-                (callback)(event.userify(), &this.window_target, dummy);
-            } else {
-                (callback)(event.userify(), &this.window_target, control_flow);
-            }
-        });
-    }
-
-    fn handle_user_events(&mut self, control_flow: &mut ControlFlow) {
-        self.with_callback(|this, mut callback| {
-            for event in this.window_target.p.receiver.try_iter() {
-                if let ControlFlow::ExitWithCode(code) = *control_flow {
-                    let dummy = &mut ControlFlow::ExitWithCode(code);
-                    (callback)(Event::UserEvent(event), &this.window_target, dummy);
-                } else {
-                    (callback)(Event::UserEvent(event), &this.window_target, control_flow);
-                }
-            }
-        });
-    }
-}
-
-#[derive(Default)]
-struct Handler {
-    ready: AtomicBool,
-    in_callback: AtomicBool,
-    control_flow: Mutex<ControlFlow>,
-    control_flow_prev: Mutex<ControlFlow>,
-    start_time: Mutex<Option<Instant>>,
-    callback: Mutex<Option<Box<dyn EventHandler>>>,
-    pending_events: Mutex<VecDeque<EventWrapper>>,
-    pending_redraw: Mutex<Vec<WindowId>>,
-    waker: Mutex<EventLoopWaker>,
-}
-
-unsafe impl Send for Handler {}
-unsafe impl Sync for Handler {}
-
-impl Handler {
-    fn events(&self) -> MutexGuard<'_, VecDeque<EventWrapper>> {
-        self.pending_events.lock().unwrap()
-    }
-
-    fn redraw(&self) -> MutexGuard<'_, Vec<WindowId>> {
-        self.pending_redraw.lock().unwrap()
-    }
-
-    fn waker(&self) -> MutexGuard<'_, EventLoopWaker> {
-        self.waker.lock().unwrap()
-    }
-
-    fn is_ready(&self) -> bool {
-        self.ready.load(Ordering::Acquire)
-    }
-
-    fn set_ready(&self) {
-        self.ready.store(true, Ordering::Release);
-    }
-
-    fn should_exit(&self) -> bool {
-        matches!(
-            *self.control_flow.lock().unwrap(),
-            ControlFlow::ExitWithCode(_)
-        )
-    }
-
-    fn get_control_flow_and_update_prev(&self) -> ControlFlow {
-        let control_flow = self.control_flow.lock().unwrap();
-        *self.control_flow_prev.lock().unwrap() = *control_flow;
-        *control_flow
-    }
-
-    fn get_old_and_new_control_flow(&self) -> (ControlFlow, ControlFlow) {
-        let old = *self.control_flow_prev.lock().unwrap();
-        let new = *self.control_flow.lock().unwrap();
-        (old, new)
-    }
-
-    fn get_start_time(&self) -> Option<Instant> {
-        *self.start_time.lock().unwrap()
-    }
-
-    fn update_start_time(&self) {
-        *self.start_time.lock().unwrap() = Some(Instant::now());
-    }
-
-    fn take_events(&self) -> VecDeque<EventWrapper> {
-        mem::take(&mut *self.events())
-    }
-
-    fn should_redraw(&self) -> Vec<WindowId> {
-        mem::take(&mut *self.redraw())
-    }
-
-    fn get_in_callback(&self) -> bool {
-        self.in_callback.load(Ordering::Acquire)
-    }
-
-    fn set_in_callback(&self, in_callback: bool) {
-        self.in_callback.store(in_callback, Ordering::Release);
-    }
-
-    fn handle_nonuser_event(&self, wrapper: EventWrapper) {
-        if let Some(ref mut callback) = *self.callback.lock().unwrap() {
-            match wrapper {
-                EventWrapper::StaticEvent(event) => {
-                    callback.handle_nonuser_event(event, &mut self.control_flow.lock().unwrap())
-                }
-                EventWrapper::EventProxy(proxy) => self.handle_proxy(proxy, callback),
-            }
-        }
-    }
-
-    fn handle_user_events(&self) {
-        if let Some(ref mut callback) = *self.callback.lock().unwrap() {
-            callback.handle_user_events(&mut self.control_flow.lock().unwrap());
-        }
-    }
-
-    fn handle_scale_factor_changed_event(
-        &self,
-        callback: &mut Box<dyn EventHandler + 'static>,
-        window: &WinitWindow,
-        suggested_size: LogicalSize<f64>,
-        scale_factor: f64,
-    ) {
-        let mut size = suggested_size.to_physical(scale_factor);
-        let new_inner_size = &mut size;
-        let event = Event::WindowEvent {
-            window_id: WindowId(window.id()),
-            event: WindowEvent::ScaleFactorChanged {
-                scale_factor,
-                new_inner_size,
-            },
-        };
-
-        callback.handle_nonuser_event(event, &mut self.control_flow.lock().unwrap());
-
-        let physical_size = *new_inner_size;
-        let logical_size = physical_size.to_logical(scale_factor);
-        let size = NSSize::new(logical_size.width, logical_size.height);
-        window.setContentSize(size);
-    }
-
-    fn handle_proxy(&self, proxy: EventProxy, callback: &mut Box<dyn EventHandler + 'static>) {
-        match proxy {
-            EventProxy::DpiChangedProxy {
-                window,
-                suggested_size,
-                scale_factor,
-            } => self.handle_scale_factor_changed_event(
-                callback,
-                &window,
-                suggested_size,
-                scale_factor,
-            ),
-        }
-    }
-}
-
-pub(crate) enum AppState {}
-
-impl AppState {
-    pub fn set_callback<T>(callback: Weak<Callback<T>>, window_target: Rc<RootWindowTarget<T>>) {
-        *HANDLER.callback.lock().unwrap() = Some(Box::new(EventLoopHandler {
-            callback,
-            window_target,
-        }));
-    }
-
-    pub fn exit() -> i32 {
-        HANDLER.set_in_callback(true);
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::LoopDestroyed));
-        HANDLER.set_in_callback(false);
-        HANDLER.callback.lock().unwrap().take();
-        if let ControlFlow::ExitWithCode(code) = HANDLER.get_old_and_new_control_flow().1 {
-            code
-        } else {
-            0
-        }
-    }
-
-    pub fn launched(
-        activation_policy: NSApplicationActivationPolicy,
-        create_default_menu: bool,
-        activate_ignoring_other_apps: bool,
-    ) {
-        let app = NSApp();
-        // We need to delay setting the activation policy and activating the app
-        // until `applicationDidFinishLaunching` has been called. Otherwise the
-        // menu bar is initially unresponsive on macOS 10.15.
-        app.setActivationPolicy(activation_policy);
-
-        window_activation_hack(&app);
-        app.activateIgnoringOtherApps(activate_ignoring_other_apps);
-
-        HANDLER.set_ready();
-        HANDLER.waker().start();
-        if create_default_menu {
-            // The menubar initialization should be before the `NewEvents` event, to allow
-            // overriding of the default menu even if it's created
-            menu::initialize();
-        }
-        HANDLER.set_in_callback(true);
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::NewEvents(
-            StartCause::Init,
-        )));
-        // NB: For consistency all platforms must emit a 'resumed' event even though macOS
-        // applications don't themselves have a formal suspend/resume lifecycle.
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::Resumed));
-        HANDLER.set_in_callback(false);
-    }
-
-    pub fn wakeup(panic_info: Weak<PanicInfo>) {
-        let panic_info = panic_info
-            .upgrade()
-            .expect("The panic info must exist here. This failure indicates a developer error.");
-
-        // Return when in callback due to https://github.com/rust-windowing/winit/issues/1779
-        if panic_info.is_panicking() || !HANDLER.is_ready() || HANDLER.get_in_callback() {
-            return;
-        }
-        let start = HANDLER.get_start_time().unwrap();
-        let cause = match HANDLER.get_control_flow_and_update_prev() {
-            ControlFlow::Poll => StartCause::Poll,
-            ControlFlow::Wait => StartCause::WaitCancelled {
-                start,
-                requested_resume: None,
-            },
-            ControlFlow::WaitUntil(requested_resume) => {
-                if Instant::now() >= requested_resume {
-                    StartCause::ResumeTimeReached {
-                        start,
-                        requested_resume,
-                    }
-                } else {
-                    StartCause::WaitCancelled {
-                        start,
-                        requested_resume: Some(requested_resume),
-                    }
-                }
-            }
-            ControlFlow::ExitWithCode(_) => StartCause::Poll, //panic!("unexpected `ControlFlow::Exit`"),
-        };
-        HANDLER.set_in_callback(true);
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::NewEvents(cause)));
-        HANDLER.set_in_callback(false);
-    }
-
-    // This is called from multiple threads at present
-    pub fn queue_redraw(window_id: WindowId) {
-        let mut pending_redraw = HANDLER.redraw();
-        if !pending_redraw.contains(&window_id) {
-            pending_redraw.push(window_id);
-        }
-        unsafe {
-            let rl = CFRunLoopGetMain();
-            CFRunLoopWakeUp(rl);
-        }
-    }
-
-    pub fn handle_redraw(window_id: WindowId) {
-        // Redraw request might come out of order from the OS.
-        // -> Don't go back into the callback when our callstack originates from there
-        if !HANDLER.in_callback.swap(true, Ordering::AcqRel) {
-            HANDLER
-                .handle_nonuser_event(EventWrapper::StaticEvent(Event::RedrawRequested(window_id)));
-            HANDLER.set_in_callback(false);
-        }
-    }
-
-    pub fn queue_event(wrapper: EventWrapper) {
-        if !is_main_thread() {
-            panic!("Event queued from different thread: {wrapper:#?}");
-        }
-        HANDLER.events().push_back(wrapper);
-    }
-
-    pub fn cleared(panic_info: Weak<PanicInfo>) {
-        let panic_info = panic_info
-            .upgrade()
-            .expect("The panic info must exist here. This failure indicates a developer error.");
-
-        // Return when in callback due to https://github.com/rust-windowing/winit/issues/1779
-        if panic_info.is_panicking() || !HANDLER.is_ready() || HANDLER.get_in_callback() {
-            return;
-        }
-
-        HANDLER.set_in_callback(true);
-        HANDLER.handle_user_events();
-        for event in HANDLER.take_events() {
-            HANDLER.handle_nonuser_event(event);
-        }
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::MainEventsCleared));
-        for window_id in HANDLER.should_redraw() {
-            HANDLER
-                .handle_nonuser_event(EventWrapper::StaticEvent(Event::RedrawRequested(window_id)));
-        }
-        HANDLER.handle_nonuser_event(EventWrapper::StaticEvent(Event::RedrawEventsCleared));
-        HANDLER.set_in_callback(false);
-
-        if HANDLER.should_exit() {
-            let app = NSApp();
-            autoreleasepool(|_| {
-                app.stop(None);
-                // To stop event loop immediately, we need to post some event here.
-                app.postEvent_atStart(&NSEvent::dummy(), true);
-            });
-        }
-        HANDLER.update_start_time();
-        match HANDLER.get_old_and_new_control_flow() {
-            (ControlFlow::ExitWithCode(_), _) | (_, ControlFlow::ExitWithCode(_)) => (),
-            (old, new) if old == new => (),
-            (_, ControlFlow::Wait) => HANDLER.waker().stop(),
-            (_, ControlFlow::WaitUntil(instant)) => HANDLER.waker().start_at(instant),
-            (_, ControlFlow::Poll) => HANDLER.waker().start(),
-        }
-    }
-}
-
-/// A hack to make activation of multiple windows work when creating them before
-/// `applicationDidFinishLaunching:` / `Event::Event::NewEvents(StartCause::Init)`.
-///
-/// Alternative to this would be the user calling `window.set_visible(true)` in
-/// `StartCause::Init`.
-///
-/// If this becomes too bothersome to maintain, it can probably be removed
-/// without too much damage.
-fn window_activation_hack(app: &NSApplication) {
-    // TODO: Proper ordering of the windows
-    app.windows().into_iter().for_each(|window| {
-        // Call `makeKeyAndOrderFront` if it was called on the window in `WinitWindow::new`
-        // This way we preserve the user's desired initial visiblity status
-        // TODO: Also filter on the type/"level" of the window, and maybe other things?
-        if window.isVisible() {
-            trace!("Activating visible window");
-            window.makeKeyAndOrderFront(None);
-        } else {
-            trace!("Skipping activating invisible window");
-        }
-    })
-}

src/platform_impl/macos/appkit/appearance.rs

@@ -1,29 +0,0 @@
-use objc2::foundation::{NSArray, NSObject, NSString};
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSAppearance;
-
-    unsafe impl ClassType for NSAppearance {
-        type Super = NSObject;
-    }
-);
-
-type NSAppearanceName = NSString;
-
-extern_methods!(
-    unsafe impl NSAppearance {
-        pub fn appearanceNamed(name: &NSAppearanceName) -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), appearanceNamed: name] }
-        }
-
-        pub fn bestMatchFromAppearancesWithNames(
-            &self,
-            appearances: &NSArray<NSAppearanceName>,
-        ) -> Id<NSAppearanceName, Shared> {
-            unsafe { msg_send_id![self, bestMatchFromAppearancesWithNames: appearances,] }
-        }
-    }
-);

src/platform_impl/macos/appkit/application.rs

@@ -1,142 +0,0 @@
-use objc2::foundation::{MainThreadMarker, NSArray, NSInteger, NSObject, NSUInteger};
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Object;
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-use objc2::{Encode, Encoding};
-
-use super::{NSAppearance, NSEvent, NSMenu, NSResponder, NSWindow};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSApplication;
-
-    unsafe impl ClassType for NSApplication {
-        #[inherits(NSObject)]
-        type Super = NSResponder;
-    }
-);
-
-pub(crate) fn NSApp() -> Id<NSApplication, Shared> {
-    // TODO: Only allow access from main thread
-    NSApplication::shared(unsafe { MainThreadMarker::new_unchecked() })
-}
-
-extern_methods!(
-    unsafe impl NSApplication {
-        /// This can only be called on the main thread since it may initialize
-        /// the application and since it's parameters may be changed by the main
-        /// thread at any time (hence it is only safe to access on the main thread).
-        pub fn shared(_mtm: MainThreadMarker) -> Id<Self, Shared> {
-            let app: Option<_> = unsafe { msg_send_id![Self::class(), sharedApplication] };
-            // SAFETY: `sharedApplication` always initializes the app if it isn't already
-            unsafe { app.unwrap_unchecked() }
-        }
-
-        pub fn currentEvent(&self) -> Option<Id<NSEvent, Shared>> {
-            unsafe { msg_send_id![self, currentEvent] }
-        }
-
-        #[sel(postEvent:atStart:)]
-        pub fn postEvent_atStart(&self, event: &NSEvent, front_of_queue: bool);
-
-        #[sel(presentationOptions)]
-        pub fn presentationOptions(&self) -> NSApplicationPresentationOptions;
-
-        pub fn windows(&self) -> Id<NSArray<NSWindow, Shared>, Shared> {
-            unsafe { msg_send_id![self, windows] }
-        }
-
-        pub fn keyWindow(&self) -> Option<Id<NSWindow, Shared>> {
-            unsafe { msg_send_id![self, keyWindow] }
-        }
-
-        // TODO: NSApplicationDelegate
-        #[sel(setDelegate:)]
-        pub fn setDelegate(&self, delegate: &Object);
-
-        #[sel(setPresentationOptions:)]
-        pub fn setPresentationOptions(&self, options: NSApplicationPresentationOptions);
-
-        #[sel(hide:)]
-        pub fn hide(&self, sender: Option<&Object>);
-
-        #[sel(orderFrontCharacterPalette:)]
-        #[allow(dead_code)]
-        pub fn orderFrontCharacterPalette(&self, sender: Option<&Object>);
-
-        #[sel(hideOtherApplications:)]
-        pub fn hideOtherApplications(&self, sender: Option<&Object>);
-
-        #[sel(stop:)]
-        pub fn stop(&self, sender: Option<&Object>);
-
-        #[sel(activateIgnoringOtherApps:)]
-        pub fn activateIgnoringOtherApps(&self, ignore: bool);
-
-        #[sel(requestUserAttention:)]
-        pub fn requestUserAttention(&self, type_: NSRequestUserAttentionType) -> NSInteger;
-
-        #[sel(setActivationPolicy:)]
-        pub fn setActivationPolicy(&self, policy: NSApplicationActivationPolicy) -> bool;
-
-        #[sel(setMainMenu:)]
-        pub fn setMainMenu(&self, menu: &NSMenu);
-
-        pub fn effectiveAppearance(&self) -> Id<NSAppearance, Shared> {
-            unsafe { msg_send_id![self, effectiveAppearance] }
-        }
-
-        #[sel(setAppearance:)]
-        pub fn setAppearance(&self, appearance: Option<&NSAppearance>);
-
-        #[sel(run)]
-        pub unsafe fn run(&self);
-    }
-);
-
-#[allow(dead_code)]
-#[repr(isize)] // NSInteger
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum NSApplicationActivationPolicy {
-    NSApplicationActivationPolicyRegular = 0,
-    NSApplicationActivationPolicyAccessory = 1,
-    NSApplicationActivationPolicyProhibited = 2,
-    NSApplicationActivationPolicyERROR = -1,
-}
-
-unsafe impl Encode for NSApplicationActivationPolicy {
-    const ENCODING: Encoding = NSInteger::ENCODING;
-}
-
-bitflags! {
-    pub struct NSApplicationPresentationOptions: NSUInteger {
-        const NSApplicationPresentationDefault = 0;
-        const NSApplicationPresentationAutoHideDock = 1 << 0;
-        const NSApplicationPresentationHideDock = 1 << 1;
-        const NSApplicationPresentationAutoHideMenuBar = 1 << 2;
-        const NSApplicationPresentationHideMenuBar = 1 << 3;
-        const NSApplicationPresentationDisableAppleMenu = 1 << 4;
-        const NSApplicationPresentationDisableProcessSwitching = 1 << 5;
-        const NSApplicationPresentationDisableForceQuit = 1 << 6;
-        const NSApplicationPresentationDisableSessionTermination = 1 << 7;
-        const NSApplicationPresentationDisableHideApplication = 1 << 8;
-        const NSApplicationPresentationDisableMenuBarTransparency = 1 << 9;
-        const NSApplicationPresentationFullScreen = 1 << 10;
-        const NSApplicationPresentationAutoHideToolbar = 1 << 11;
-    }
-}
-
-unsafe impl Encode for NSApplicationPresentationOptions {
-    const ENCODING: Encoding = NSUInteger::ENCODING;
-}
-
-#[repr(usize)] // NSUInteger
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum NSRequestUserAttentionType {
-    NSCriticalRequest = 0,
-    NSInformationalRequest = 10,
-}
-
-unsafe impl Encode for NSRequestUserAttentionType {
-    const ENCODING: Encoding = NSUInteger::ENCODING;
-}

src/platform_impl/macos/appkit/button.rs

@@ -1,14 +0,0 @@
-use objc2::foundation::NSObject;
-use objc2::{extern_class, ClassType};
-
-use super::{NSControl, NSResponder, NSView};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSButton;
-
-    unsafe impl ClassType for NSButton {
-        #[inherits(NSView, NSResponder, NSObject)]
-        type Super = NSControl;
-    }
-);

src/platform_impl/macos/appkit/color.rs

@@ -1,28 +0,0 @@
-use objc2::foundation::NSObject;
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-extern_class!(
-    /// An object that stores color data and sometimes opacity (alpha value).
-    ///
-    /// <https://developer.apple.com/documentation/appkit/nscolor?language=objc>
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSColor;
-
-    unsafe impl ClassType for NSColor {
-        type Super = NSObject;
-    }
-);
-
-// SAFETY: Documentation clearly states:
-// > Color objects are immutable and thread-safe
-unsafe impl Send for NSColor {}
-unsafe impl Sync for NSColor {}
-
-extern_methods!(
-    unsafe impl NSColor {
-        pub fn clear() -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), clearColor] }
-        }
-    }
-);

src/platform_impl/macos/appkit/control.rs

@@ -1,24 +0,0 @@
-use objc2::foundation::NSObject;
-use objc2::{extern_class, extern_methods, ClassType};
-
-use super::{NSResponder, NSView};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSControl;
-
-    unsafe impl ClassType for NSControl {
-        #[inherits(NSResponder, NSObject)]
-        type Super = NSView;
-    }
-);
-
-extern_methods!(
-    unsafe impl NSControl {
-        #[sel(setEnabled:)]
-        pub fn setEnabled(&self, enabled: bool);
-
-        #[sel(isEnabled)]
-        pub fn isEnabled(&self) -> bool;
-    }
-);

src/platform_impl/macos/appkit/cursor.rs

@@ -1,241 +0,0 @@
-use once_cell::sync::Lazy;
-
-use objc2::foundation::{NSData, NSDictionary, NSNumber, NSObject, NSPoint, NSString};
-use objc2::rc::{DefaultId, Id, Shared};
-use objc2::runtime::Sel;
-use objc2::{extern_class, extern_methods, msg_send_id, ns_string, sel, ClassType};
-
-use super::NSImage;
-use crate::window::CursorIcon;
-
-extern_class!(
-    /// <https://developer.apple.com/documentation/appkit/nscursor?language=objc>
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSCursor;
-
-    unsafe impl ClassType for NSCursor {
-        type Super = NSObject;
-    }
-);
-
-// SAFETY: NSCursor is immutable, stated here:
-// https://developer.apple.com/documentation/appkit/nscursor/1527062-image?language=objc
-unsafe impl Send for NSCursor {}
-unsafe impl Sync for NSCursor {}
-
-macro_rules! def_cursor {
-    {$(
-        $(#[$($m:meta)*])*
-        pub fn $name:ident();
-    )*} => {$(
-        $(#[$($m)*])*
-        pub fn $name() -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), $name] }
-        }
-    )*};
-}
-
-macro_rules! def_undocumented_cursor {
-    {$(
-        $(#[$($m:meta)*])*
-        pub fn $name:ident();
-    )*} => {$(
-        $(#[$($m)*])*
-        pub fn $name() -> Id<Self, Shared> {
-            unsafe { Self::from_selector(sel!($name)).unwrap_or_else(|| Default::default()) }
-        }
-    )*};
-}
-
-extern_methods!(
-    /// Documented cursors
-    unsafe impl NSCursor {
-        def_cursor!(
-            pub fn arrowCursor();
-            pub fn pointingHandCursor();
-            pub fn openHandCursor();
-            pub fn closedHandCursor();
-            pub fn IBeamCursor();
-            pub fn IBeamCursorForVerticalLayout();
-            pub fn dragCopyCursor();
-            pub fn dragLinkCursor();
-            pub fn operationNotAllowedCursor();
-            pub fn contextualMenuCursor();
-            pub fn crosshairCursor();
-            pub fn resizeRightCursor();
-            pub fn resizeUpCursor();
-            pub fn resizeLeftCursor();
-            pub fn resizeDownCursor();
-            pub fn resizeLeftRightCursor();
-            pub fn resizeUpDownCursor();
-        );
-
-        // Creating cursors should be thread-safe, though using them for anything probably isn't.
-        pub fn new(image: &NSImage, hotSpot: NSPoint) -> Id<Self, Shared> {
-            let this = unsafe { msg_send_id![Self::class(), alloc] };
-            unsafe { msg_send_id![this, initWithImage: image, hotSpot: hotSpot] }
-        }
-
-        pub fn invisible() -> Id<Self, Shared> {
-            // 16x16 GIF data for invisible cursor
-            // You can reproduce this via ImageMagick.
-            // $ convert -size 16x16 xc:none cursor.gif
-            static CURSOR_BYTES: &[u8] = &[
-                0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x10, 0x00, 0x10, 0x00, 0xF0, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xF9, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2C,
-                0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x02, 0x0E, 0x84, 0x8F, 0xA9,
-                0xCB, 0xED, 0x0F, 0xA3, 0x9C, 0xB4, 0xDA, 0x8B, 0xB3, 0x3E, 0x05, 0x00, 0x3B,
-            ];
-
-            static CURSOR: Lazy<Id<NSCursor, Shared>> = Lazy::new(|| {
-                // TODO: Consider using `dataWithBytesNoCopy:`
-                let data = NSData::with_bytes(CURSOR_BYTES);
-                let image = NSImage::new_with_data(&data);
-                NSCursor::new(&image, NSPoint::new(0.0, 0.0))
-            });
-
-            CURSOR.clone()
-        }
-    }
-
-    /// Undocumented cursors
-    unsafe impl NSCursor {
-        #[sel(respondsToSelector:)]
-        fn class_responds_to(sel: Sel) -> bool;
-
-        unsafe fn from_selector_unchecked(sel: Sel) -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), performSelector: sel] }
-        }
-
-        unsafe fn from_selector(sel: Sel) -> Option<Id<Self, Shared>> {
-            if Self::class_responds_to(sel) {
-                Some(unsafe { Self::from_selector_unchecked(sel) })
-            } else {
-                warn!("Cursor `{:?}` appears to be invalid", sel);
-                None
-            }
-        }
-
-        def_undocumented_cursor!(
-            // Undocumented cursors: https://stackoverflow.com/a/46635398/5435443
-            pub fn _helpCursor();
-            pub fn _zoomInCursor();
-            pub fn _zoomOutCursor();
-            pub fn _windowResizeNorthEastCursor();
-            pub fn _windowResizeNorthWestCursor();
-            pub fn _windowResizeSouthEastCursor();
-            pub fn _windowResizeSouthWestCursor();
-            pub fn _windowResizeNorthEastSouthWestCursor();
-            pub fn _windowResizeNorthWestSouthEastCursor();
-
-            // While these two are available, the former just loads a white arrow,
-            // and the latter loads an ugly deflated beachball!
-            // pub fn _moveCursor();
-            // pub fn _waitCursor();
-
-            // An even more undocumented cursor...
-            // https://bugs.eclipse.org/bugs/show_bug.cgi?id=522349
-            pub fn busyButClickableCursor();
-        );
-    }
-
-    /// Webkit cursors
-    unsafe impl NSCursor {
-        // Note that loading `busybutclickable` with this code won't animate
-        // the frames; instead you'll just get them all in a column.
-        unsafe fn load_webkit_cursor(name: &NSString) -> Id<Self, Shared> {
-            // Snatch a cursor from WebKit; They fit the style of the native
-            // cursors, and will seem completely standard to macOS users.
-            //
-            // https://stackoverflow.com/a/21786835/5435443
-            let root = ns_string!("/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Resources/cursors");
-            let cursor_path = root.join_path(name);
-
-            let pdf_path = cursor_path.join_path(ns_string!("cursor.pdf"));
-            let image = NSImage::new_by_referencing_file(&pdf_path);
-
-            // TODO: Handle PLists better
-            let info_path = cursor_path.join_path(ns_string!("info.plist"));
-            let info: Id<NSDictionary<NSObject, NSObject>, Shared> = unsafe {
-                msg_send_id![
-                    <NSDictionary<NSObject, NSObject>>::class(),
-                    dictionaryWithContentsOfFile: &*info_path,
-                ]
-            };
-            let mut x = 0.0;
-            if let Some(n) = info.get(&*ns_string!("hotx")) {
-                if n.is_kind_of::<NSNumber>() {
-                    let ptr: *const NSObject = n;
-                    let ptr: *const NSNumber = ptr.cast();
-                    x = unsafe { &*ptr }.as_cgfloat()
-                }
-            }
-            let mut y = 0.0;
-            if let Some(n) = info.get(&*ns_string!("hotx")) {
-                if n.is_kind_of::<NSNumber>() {
-                    let ptr: *const NSObject = n;
-                    let ptr: *const NSNumber = ptr.cast();
-                    y = unsafe { &*ptr }.as_cgfloat()
-                }
-            }
-
-            let hotspot = NSPoint::new(x, y);
-            Self::new(&image, hotspot)
-        }
-
-        pub fn moveCursor() -> Id<Self, Shared> {
-            unsafe { Self::load_webkit_cursor(ns_string!("move")) }
-        }
-
-        pub fn cellCursor() -> Id<Self, Shared> {
-            unsafe { Self::load_webkit_cursor(ns_string!("cell")) }
-        }
-    }
-);
-
-impl NSCursor {
-    pub fn from_icon(icon: CursorIcon) -> Id<Self, Shared> {
-        match icon {
-            CursorIcon::Default => Default::default(),
-            CursorIcon::Arrow => Self::arrowCursor(),
-            CursorIcon::Hand => Self::pointingHandCursor(),
-            CursorIcon::Grab => Self::openHandCursor(),
-            CursorIcon::Grabbing => Self::closedHandCursor(),
-            CursorIcon::Text => Self::IBeamCursor(),
-            CursorIcon::VerticalText => Self::IBeamCursorForVerticalLayout(),
-            CursorIcon::Copy => Self::dragCopyCursor(),
-            CursorIcon::Alias => Self::dragLinkCursor(),
-            CursorIcon::NotAllowed | CursorIcon::NoDrop => Self::operationNotAllowedCursor(),
-            CursorIcon::ContextMenu => Self::contextualMenuCursor(),
-            CursorIcon::Crosshair => Self::crosshairCursor(),
-            CursorIcon::EResize => Self::resizeRightCursor(),
-            CursorIcon::NResize => Self::resizeUpCursor(),
-            CursorIcon::WResize => Self::resizeLeftCursor(),
-            CursorIcon::SResize => Self::resizeDownCursor(),
-            CursorIcon::EwResize | CursorIcon::ColResize => Self::resizeLeftRightCursor(),
-            CursorIcon::NsResize | CursorIcon::RowResize => Self::resizeUpDownCursor(),
-            CursorIcon::Help => Self::_helpCursor(),
-            CursorIcon::ZoomIn => Self::_zoomInCursor(),
-            CursorIcon::ZoomOut => Self::_zoomOutCursor(),
-            CursorIcon::NeResize => Self::_windowResizeNorthEastCursor(),
-            CursorIcon::NwResize => Self::_windowResizeNorthWestCursor(),
-            CursorIcon::SeResize => Self::_windowResizeSouthEastCursor(),
-            CursorIcon::SwResize => Self::_windowResizeSouthWestCursor(),
-            CursorIcon::NeswResize => Self::_windowResizeNorthEastSouthWestCursor(),
-            CursorIcon::NwseResize => Self::_windowResizeNorthWestSouthEastCursor(),
-            // This is the wrong semantics for `Wait`, but it's the same as
-            // what's used in Safari and Chrome.
-            CursorIcon::Wait | CursorIcon::Progress => Self::busyButClickableCursor(),
-            CursorIcon::Move | CursorIcon::AllScroll => Self::moveCursor(),
-            CursorIcon::Cell => Self::cellCursor(),
-        }
-    }
-}
-
-impl DefaultId for NSCursor {
-    type Ownership = Shared;
-
-    fn default_id() -> Id<Self, Shared> {
-        Self::arrowCursor()
-    }
-}

src/platform_impl/macos/appkit/event.rs

@@ -1,285 +0,0 @@
-use std::os::raw::c_ushort;
-
-use objc2::encode::{Encode, Encoding};
-use objc2::foundation::{
-    CGFloat, NSCopying, NSInteger, NSObject, NSPoint, NSString, NSTimeInterval, NSUInteger,
-};
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-pub const NX_DEVICELALTKEYMASK: u32 = 0x00000020;
-pub const NX_DEVICERALTKEYMASK: u32 = 0x00000040;
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSEvent;
-
-    unsafe impl ClassType for NSEvent {
-        type Super = NSObject;
-    }
-);
-
-// > Safely handled only on the same thread, whether that be the main thread
-// > or a secondary thread; otherwise you run the risk of having events get
-// > out of sequence.
-// <https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/CocoaFundamentals/AddingBehaviortoaCocoaProgram/AddingBehaviorCocoa.html#//apple_ref/doc/uid/TP40002974-CH5-SW47>
-// <https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/ThreadSafetySummary/ThreadSafetySummary.html#//apple_ref/doc/uid/10000057i-CH12-123383>
-
-extern_methods!(
-    unsafe impl NSEvent {
-        unsafe fn otherEventWithType(
-            type_: NSEventType,
-            location: NSPoint,
-            flags: NSEventModifierFlags,
-            time: NSTimeInterval,
-            window_num: NSInteger,
-            context: Option<&NSObject>, // NSGraphicsContext
-            subtype: NSEventSubtype,
-            data1: NSInteger,
-            data2: NSInteger,
-        ) -> Id<Self, Shared> {
-            unsafe {
-                msg_send_id![
-                    Self::class(),
-                    otherEventWithType: type_,
-                    location: location,
-                    modifierFlags: flags,
-                    timestamp: time,
-                    windowNumber: window_num,
-                    context: context,
-                    subtype: subtype,
-                    data1: data1,
-                    data2: data2,
-                ]
-            }
-        }
-
-        pub fn dummy() -> Id<Self, Shared> {
-            unsafe {
-                Self::otherEventWithType(
-                    NSEventType::NSApplicationDefined,
-                    NSPoint::new(0.0, 0.0),
-                    NSEventModifierFlags::empty(),
-                    0.0,
-                    0,
-                    None,
-                    NSEventSubtype::NSWindowExposedEventType,
-                    0,
-                    0,
-                )
-            }
-        }
-
-        pub fn keyEventWithType(
-            type_: NSEventType,
-            location: NSPoint,
-            modifier_flags: NSEventModifierFlags,
-            timestamp: NSTimeInterval,
-            window_num: NSInteger,
-            context: Option<&NSObject>,
-            characters: &NSString,
-            characters_ignoring_modifiers: &NSString,
-            is_a_repeat: bool,
-            scancode: c_ushort,
-        ) -> Id<Self, Shared> {
-            unsafe {
-                msg_send_id![
-                    Self::class(),
-                    keyEventWithType: type_,
-                    location: location,
-                    modifierFlags: modifier_flags,
-                    timestamp: timestamp,
-                    windowNumber: window_num,
-                    context: context,
-                    characters: characters,
-                    charactersIgnoringModifiers: characters_ignoring_modifiers,
-                    isARepeat: is_a_repeat,
-                    keyCode: scancode,
-                ]
-            }
-        }
-
-        #[sel(locationInWindow)]
-        pub fn locationInWindow(&self) -> NSPoint;
-
-        // TODO: MainThreadMarker
-        #[sel(pressedMouseButtons)]
-        pub fn pressedMouseButtons() -> NSUInteger;
-
-        #[sel(modifierFlags)]
-        pub fn modifierFlags(&self) -> NSEventModifierFlags;
-
-        #[sel(type)]
-        pub fn type_(&self) -> NSEventType;
-
-        // In AppKit, `keyCode` refers to the position (scancode) of a key rather than its character,
-        // and there is no easy way to navtively retrieve the layout-dependent character.
-        // In winit, we use keycode to refer to the key's character, and so this function aligns
-        // AppKit's terminology with ours.
-        #[sel(keyCode)]
-        pub fn scancode(&self) -> c_ushort;
-
-        #[sel(magnification)]
-        pub fn magnification(&self) -> CGFloat;
-
-        #[sel(phase)]
-        pub fn phase(&self) -> NSEventPhase;
-
-        #[sel(momentumPhase)]
-        pub fn momentumPhase(&self) -> NSEventPhase;
-
-        #[sel(deltaX)]
-        pub fn deltaX(&self) -> CGFloat;
-
-        #[sel(deltaY)]
-        pub fn deltaY(&self) -> CGFloat;
-
-        #[sel(buttonNumber)]
-        pub fn buttonNumber(&self) -> NSInteger;
-
-        #[sel(scrollingDeltaX)]
-        pub fn scrollingDeltaX(&self) -> CGFloat;
-
-        #[sel(scrollingDeltaY)]
-        pub fn scrollingDeltaY(&self) -> CGFloat;
-
-        #[sel(hasPreciseScrollingDeltas)]
-        pub fn hasPreciseScrollingDeltas(&self) -> bool;
-
-        #[sel(rotation)]
-        pub fn rotation(&self) -> f32;
-
-        #[sel(pressure)]
-        pub fn pressure(&self) -> f32;
-
-        #[sel(stage)]
-        pub fn stage(&self) -> NSInteger;
-
-        #[sel(isARepeat)]
-        pub fn is_a_repeat(&self) -> bool;
-
-        #[sel(windowNumber)]
-        pub fn window_number(&self) -> NSInteger;
-
-        #[sel(timestamp)]
-        pub fn timestamp(&self) -> NSTimeInterval;
-
-        pub fn characters(&self) -> Option<Id<NSString, Shared>> {
-            unsafe { msg_send_id![self, characters] }
-        }
-
-        pub fn charactersIgnoringModifiers(&self) -> Option<Id<NSString, Shared>> {
-            unsafe { msg_send_id![self, charactersIgnoringModifiers] }
-        }
-
-        pub fn lalt_pressed(&self) -> bool {
-            let raw_modifiers = self.modifierFlags().bits() as u32;
-            raw_modifiers & NX_DEVICELALTKEYMASK != 0
-        }
-
-        pub fn ralt_pressed(&self) -> bool {
-            let raw_modifiers = self.modifierFlags().bits() as u32;
-            raw_modifiers & NX_DEVICERALTKEYMASK != 0
-        }
-    }
-);
-
-unsafe impl NSCopying for NSEvent {
-    type Ownership = Shared;
-    type Output = NSEvent;
-}
-
-bitflags! {
-    pub struct NSEventModifierFlags: NSUInteger {
-        const NSAlphaShiftKeyMask                     = 1 << 16;
-        const NSShiftKeyMask                          = 1 << 17;
-        const NSControlKeyMask                        = 1 << 18;
-        const NSAlternateKeyMask                      = 1 << 19;
-        const NSCommandKeyMask                        = 1 << 20;
-        const NSNumericPadKeyMask                     = 1 << 21;
-        const NSHelpKeyMask                           = 1 << 22;
-        const NSFunctionKeyMask                       = 1 << 23;
-        const NSDeviceIndependentModifierFlagsMask    = 0xffff0000;
-    }
-}
-
-unsafe impl Encode for NSEventModifierFlags {
-    const ENCODING: Encoding = NSUInteger::ENCODING;
-}
-
-bitflags! {
-    pub struct NSEventPhase: NSUInteger {
-       const NSEventPhaseNone        = 0;
-       const NSEventPhaseBegan       = 0x1 << 0;
-       const NSEventPhaseStationary  = 0x1 << 1;
-       const NSEventPhaseChanged     = 0x1 << 2;
-       const NSEventPhaseEnded       = 0x1 << 3;
-       const NSEventPhaseCancelled   = 0x1 << 4;
-       const NSEventPhaseMayBegin    = 0x1 << 5;
-    }
-}
-
-unsafe impl Encode for NSEventPhase {
-    const ENCODING: Encoding = NSUInteger::ENCODING;
-}
-
-#[allow(dead_code)]
-#[repr(i16)] // short
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum NSEventSubtype {
-    // TODO: Not sure what these values are
-    // NSMouseEventSubtype           = NX_SUBTYPE_DEFAULT,
-    // NSTabletPointEventSubtype     = NX_SUBTYPE_TABLET_POINT,
-    // NSTabletProximityEventSubtype = NX_SUBTYPE_TABLET_PROXIMITY
-    // NSTouchEventSubtype           = NX_SUBTYPE_MOUSE_TOUCH,
-    NSWindowExposedEventType = 0,
-    NSApplicationActivatedEventType = 1,
-    NSApplicationDeactivatedEventType = 2,
-    NSWindowMovedEventType = 4,
-    NSScreenChangedEventType = 8,
-    NSAWTEventType = 16,
-}
-
-unsafe impl Encode for NSEventSubtype {
-    const ENCODING: Encoding = i16::ENCODING;
-}
-
-#[allow(dead_code)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-#[repr(usize)] // NSUInteger
-pub enum NSEventType {
-    NSLeftMouseDown = 1,
-    NSLeftMouseUp = 2,
-    NSRightMouseDown = 3,
-    NSRightMouseUp = 4,
-    NSMouseMoved = 5,
-    NSLeftMouseDragged = 6,
-    NSRightMouseDragged = 7,
-    NSMouseEntered = 8,
-    NSMouseExited = 9,
-    NSKeyDown = 10,
-    NSKeyUp = 11,
-    NSFlagsChanged = 12,
-    NSAppKitDefined = 13,
-    NSSystemDefined = 14,
-    NSApplicationDefined = 15,
-    NSPeriodic = 16,
-    NSCursorUpdate = 17,
-    NSScrollWheel = 22,
-    NSTabletPoint = 23,
-    NSTabletProximity = 24,
-    NSOtherMouseDown = 25,
-    NSOtherMouseUp = 26,
-    NSOtherMouseDragged = 27,
-    NSEventTypeGesture = 29,
-    NSEventTypeMagnify = 30,
-    NSEventTypeSwipe = 31,
-    NSEventTypeRotate = 18,
-    NSEventTypeBeginGesture = 19,
-    NSEventTypeEndGesture = 20,
-    NSEventTypePressure = 34,
-}
-
-unsafe impl Encode for NSEventType {
-    const ENCODING: Encoding = NSUInteger::ENCODING;
-}

src/platform_impl/macos/appkit/image.rs

@@ -1,37 +0,0 @@
-use objc2::foundation::{NSData, NSObject, NSString};
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-extern_class!(
-    // TODO: Can this be mutable?
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSImage;
-
-    unsafe impl ClassType for NSImage {
-        type Super = NSObject;
-    }
-);
-
-// Documented Thread-Unsafe, but:
-// > One thread can create an NSImage object, draw to the image buffer,
-// > and pass it off to the main thread for drawing. The underlying image
-// > cache is shared among all threads.
-// <https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Multithreading/ThreadSafetySummary/ThreadSafetySummary.html#//apple_ref/doc/uid/10000057i-CH12-126728>
-//
-// So really only unsafe to mutate on several threads.
-unsafe impl Send for NSImage {}
-unsafe impl Sync for NSImage {}
-
-extern_methods!(
-    unsafe impl NSImage {
-        pub fn new_by_referencing_file(path: &NSString) -> Id<Self, Shared> {
-            let this = unsafe { msg_send_id![Self::class(), alloc] };
-            unsafe { msg_send_id![this, initByReferencingFile: path] }
-        }
-
-        pub fn new_with_data(data: &NSData) -> Id<Self, Shared> {
-            let this = unsafe { msg_send_id![Self::class(), alloc] };
-            unsafe { msg_send_id![this, initWithData: data] }
-        }
-    }
-);

src/platform_impl/macos/appkit/menu.rs

@@ -1,25 +0,0 @@
-use objc2::foundation::NSObject;
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-use super::NSMenuItem;
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSMenu;
-
-    unsafe impl ClassType for NSMenu {
-        type Super = NSObject;
-    }
-);
-
-extern_methods!(
-    unsafe impl NSMenu {
-        pub fn new() -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), new] }
-        }
-
-        #[sel(addItem:)]
-        pub fn addItem(&self, item: &NSMenuItem);
-    }
-);

src/platform_impl/macos/appkit/menu_item.rs

@@ -1,48 +0,0 @@
-use objc2::foundation::{NSObject, NSString};
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Sel;
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-use super::{NSEventModifierFlags, NSMenu};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSMenuItem;
-
-    unsafe impl ClassType for NSMenuItem {
-        type Super = NSObject;
-    }
-);
-
-extern_methods!(
-    unsafe impl NSMenuItem {
-        pub fn new() -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), new] }
-        }
-
-        pub fn newWithTitle(
-            title: &NSString,
-            action: Sel,
-            key_equivalent: &NSString,
-        ) -> Id<Self, Shared> {
-            unsafe {
-                msg_send_id![
-                    msg_send_id![Self::class(), alloc],
-                    initWithTitle: title,
-                    action: action,
-                    keyEquivalent: key_equivalent,
-                ]
-            }
-        }
-
-        pub fn separatorItem() -> Id<Self, Shared> {
-            unsafe { msg_send_id![Self::class(), separatorItem] }
-        }
-
-        #[sel(setKeyEquivalentModifierMask:)]
-        pub fn setKeyEquivalentModifierMask(&self, mask: NSEventModifierFlags);
-
-        #[sel(setSubmenu:)]
-        pub fn setSubmenu(&self, submenu: &NSMenu);
-    }
-);

src/platform_impl/macos/appkit/mod.rs

@@ -1,61 +0,0 @@
-//! Safe bindings for the AppKit framework.
-//!
-//! These are split out from the rest of `winit` to make safety easier to review.
-//! In the future, these should probably live in another crate like `cacao`.
-//!
-//! TODO: Main thread safety.
-// Objective-C methods have different conventions, and it's much easier to
-// understand if we just use the same names
-#![allow(non_snake_case)]
-#![allow(clippy::too_many_arguments)]
-#![allow(clippy::enum_variant_names)]
-#![allow(non_upper_case_globals)]
-
-mod appearance;
-mod application;
-mod button;
-mod color;
-mod control;
-mod cursor;
-mod event;
-mod image;
-mod menu;
-mod menu_item;
-mod pasteboard;
-mod responder;
-mod screen;
-mod text_input_context;
-mod version;
-mod view;
-mod window;
-
-pub(crate) use self::appearance::NSAppearance;
-pub(crate) use self::application::{
-    NSApp, NSApplication, NSApplicationActivationPolicy, NSApplicationPresentationOptions,
-    NSRequestUserAttentionType,
-};
-pub(crate) use self::button::NSButton;
-pub(crate) use self::color::NSColor;
-pub(crate) use self::control::NSControl;
-pub(crate) use self::cursor::NSCursor;
-#[allow(unused_imports)]
-pub(crate) use self::event::{
-    NSEvent, NSEventModifierFlags, NSEventPhase, NSEventSubtype, NSEventType,
-};
-pub(crate) use self::image::NSImage;
-pub(crate) use self::menu::NSMenu;
-pub(crate) use self::menu_item::NSMenuItem;
-pub(crate) use self::pasteboard::{NSFilenamesPboardType, NSPasteboard, NSPasteboardType};
-pub(crate) use self::responder::NSResponder;
-#[allow(unused_imports)]
-pub(crate) use self::screen::{NSDeviceDescriptionKey, NSScreen};
-pub(crate) use self::text_input_context::NSTextInputContext;
-pub(crate) use self::version::NSAppKitVersion;
-pub(crate) use self::view::{NSTrackingRectTag, NSView};
-pub(crate) use self::window::{
-    NSBackingStoreType, NSWindow, NSWindowButton, NSWindowLevel, NSWindowOcclusionState,
-    NSWindowOrderingMode, NSWindowSharingType, NSWindowStyleMask, NSWindowTitleVisibility,
-};
-
-#[link(name = "AppKit", kind = "framework")]
-extern "C" {}

src/platform_impl/macos/appkit/pasteboard.rs

@@ -1,26 +0,0 @@
-use objc2::foundation::{NSObject, NSString};
-use objc2::rc::{Id, Shared};
-use objc2::{extern_class, extern_methods, msg_send_id, ClassType};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSPasteboard;
-
-    unsafe impl ClassType for NSPasteboard {
-        type Super = NSObject;
-    }
-);
-
-extern_methods!(
-    unsafe impl NSPasteboard {
-        pub fn propertyListForType(&self, type_: &NSPasteboardType) -> Id<NSObject, Shared> {
-            unsafe { msg_send_id![self, propertyListForType: type_] }
-        }
-    }
-);
-
-pub type NSPasteboardType = NSString;
-
-extern "C" {
-    pub static NSFilenamesPboardType: &'static NSPasteboardType;
-}

src/platform_impl/macos/appkit/responder.rs

@@ -1,24 +0,0 @@
-use objc2::foundation::{NSArray, NSObject};
-use objc2::rc::Shared;
-use objc2::{extern_class, extern_methods, ClassType};
-
-use super::NSEvent;
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSResponder;
-
-    unsafe impl ClassType for NSResponder {
-        type Super = NSObject;
-    }
-);
-
-// Documented as "Thread-Unsafe".
-
-extern_methods!(
-    unsafe impl NSResponder {
-        // TODO: Allow "immutably" on main thread
-        #[sel(interpretKeyEvents:)]
-        pub unsafe fn interpretKeyEvents(&mut self, events: &NSArray<NSEvent, Shared>);
-    }
-);

src/platform_impl/macos/appkit/screen.rs

@@ -1,64 +0,0 @@
-use objc2::foundation::{CGFloat, NSArray, NSDictionary, NSNumber, NSObject, NSRect, NSString};
-use objc2::rc::{Id, Shared};
-use objc2::runtime::Object;
-use objc2::{extern_class, extern_methods, msg_send_id, ns_string, ClassType};
-
-extern_class!(
-    #[derive(Debug, PartialEq, Eq, Hash)]
-    pub(crate) struct NSScreen;
-
-    unsafe impl ClassType for NSScreen {
-        type Super = NSObject;
-    }
-);
-
-// TODO: Main thread marker!
-
-extern_methods!(
-    unsafe impl NSScreen {
-        /// The application object must have been created.
-        pub fn main() -> Option<Id<Self, Shared>> {
-            unsafe { msg_send_id![Self::class(), mainScreen] }
-        }
-
-        /// The application object must have been created.
-        pub fn screens() -> Id<NSArray<Self, Shared>, Shared> {
-            unsafe { msg_send_id![Self::class(), screens] }
-        }
-
-        #[sel(frame)]
-        pub fn frame(&self) -> NSRect;
-
-        #[sel(visibleFrame)]
-        pub fn visibleFrame(&self) -> NSRect;
-
-        pub fn deviceDescription(
-            &self,
-        ) -> Id<NSDictionary<NSDeviceDescriptionKey, Object>, Shared> {
-            unsafe { msg_send_id![self, deviceDescription] }
-        }
-
-        pub fn display_id(&self) -> u32 {
-            let device_description = self.deviceDescription();
-
-            // Retrieve the CGDirectDisplayID associated with this screen
-            //
-            // SAFETY: The value from @"NSScreenNumber" in deviceDescription is guaranteed
-            // to be an NSNumber. See documentation for `deviceDescription` for details:
-            // <https://developer.apple.com/documentation/appkit/nsscreen/1388360-devicedescription?language=objc>
-            let obj = device_description
-                .get(ns_string!("NSScreenNumber"))
-                .expect("failed getting screen display id from device description");
-            let obj: *const Object = obj;
-            let obj: *const NSNumber = obj.cast();
-            let obj: &NSNumber = unsafe { &*obj };
-
-            obj.as_u32()
-        }
-
-        #[sel(backingScaleFactor)]
-        pub fn backingScaleFactor(&self) -> CGFloat;
-    }
-);
-
-pub type NSDeviceDescriptionKey = NSString;