Fix docs link

Change docs on WaitUntil to not suggest Poll
2026-06-26 22:53:15 -04:00 · 2024-09-11 10:15:42 +02:00 · 2024-09-10 16:16:13 +02:00
85 changed files with 2889 additions and 3938 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ version = "0.30.5"

 [package.metadata.docs.rs]
 features = [
+    "rwh_06",
    "serde",
    "mint",
    # Enabled to get docs to compile
@@ -54,8 +55,9 @@ targets = [
 [features]
 android-game-activity = ["android-activity/game-activity"]
 android-native-activity = ["android-activity/native-activity"]
-default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
+default = ["rwh_06", "x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
 mint = ["dpi/mint"]
+rwh_06 = ["dep:rwh_06", "ndk/rwh_06"]
 serde = ["dep:serde", "cursor-icon/serde", "smol_str/serde", "dpi/serde", "bitflags/serde"]
 wayland = [
    "wayland-client",
@@ -79,7 +81,7 @@ cfg_aliases = "0.2.1"
 bitflags = "2"
 cursor-icon = "1.1.0"
 dpi = { version = "0.1.1", path = "dpi" }
-rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"] }
+rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"], optional = true }
 serde = { workspace = true, optional = true }
 smol_str = "0.2.0"
 tracing = { version = "0.1.40", default-features = false }
@@ -89,8 +91,8 @@ image = { version = "0.25.0", default-features = false, features = ["png"] }
 tracing = { version = "0.1.40", default-features = false, features = ["log"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

-[target.'cfg(not(target_os = "android"))'.dev-dependencies]
-softbuffer = { version = "0.4.6", default-features = false, features = [
+[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dev-dependencies]
+softbuffer = { version = "0.4.0", default-features = false, features = [
    "x11",
    "x11-dlopen",
    "wayland",
@@ -100,7 +102,7 @@ softbuffer = { version = "0.4.6", default-features = false, features = [
 # Android
 [target.'cfg(target_os = "android")'.dependencies]
 android-activity = "0.6.0"
-ndk = { version = "0.9.0", features = ["rwh_06"], default-features = false }
+ndk = { version = "0.9.0", default-features = false }

 # AppKit or UIKit
 [target.'cfg(target_vendor = "apple")'.dependencies]
@@ -134,7 +136,6 @@ objc2-app-kit = { version = "0.2.2", features = [
    "NSScreen",
    "NSTextInputClient",
    "NSTextInputContext",
-    "NSToolbar",
    "NSView",
    "NSWindow",
    "NSWindowScripting",
@@ -149,7 +150,6 @@ objc2-foundation = { version = "0.2.2", features = [
    "NSDictionary",
    "NSDistributedNotificationCenter",
    "NSEnumerator",
-    "NSGeometry",
    "NSKeyValueObserving",
    "NSNotification",
    "NSObjCRuntime",
@@ -212,10 +212,8 @@ windows-sys = { version = "0.52.0", features = [
    "Win32_Media",
    "Win32_System_Com_StructuredStorage",
    "Win32_System_Com",
-    "Win32_System_Diagnostics_ToolHelp",
    "Win32_System_LibraryLoader",
    "Win32_System_Ole",
-    "Win32_Security",
    "Win32_System_SystemInformation",
    "Win32_System_SystemServices",
    "Win32_System_Threading",
@@ -272,7 +270,7 @@ xkbcommon-dl = "0.4.2"
 # Orbital
 [target.'cfg(target_os = "redox")'.dependencies]
 orbclient = { version = "0.3.47", default-features = false }
-redox_syscall = "0.5.7"
+redox_syscall = "0.4.1"

 # Web
 [target.'cfg(target_family = "wasm")'.dependencies]
@@ -298,7 +296,6 @@ web_sys = { package = "web-sys", version = "0.3.70", features = [
    "FocusEvent",
    "HtmlCanvasElement",
    "HtmlElement",
-    "HtmlHtmlElement",
    "HtmlImageElement",
    "ImageBitmap",
    "ImageBitmapOptions",
@@ -346,9 +343,11 @@ wasm-bindgen-test = "0.3"
 [[example]]
 doc-scrape-examples = true
 name = "window"
+required-features = ["rwh_06"]

 [[example]]
 name = "child_window"
+required-features = ["rwh_06"]

 [workspace]
 members = ["dpi"]
--- a/deny.toml
+++ b/deny.toml
@@ -26,12 +26,12 @@ targets = [

 [licenses]
 allow = [
-    "Apache-2.0",   # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
-    "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
-    "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
-    "ISC",          # https://tldrlegal.com/license/isc-license
-    "MIT",          # https://tldrlegal.com/license/mit-license
-    "Unicode-3.0",  # https://spdx.org/licenses/Unicode-3.0.html
+    "Apache-2.0",       # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)
+    "BSD-2-Clause",     # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd)
+    "BSD-3-Clause",     # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
+    "ISC",              # https://tldrlegal.com/license/-isc-license
+    "MIT",              # https://tldrlegal.com/license/mit-license
+    "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html
 ]
 confidence-threshold = 1.0
 private = { ignore = true }
--- a/docs/coordinate-systems.drawio
+++ b/docs/coordinate-systems.drawio
@@ -1,130 +0,0 @@
-<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:132.0) Gecko/20100101 Firefox/132.0" version="24.8.6" pages="2">
-  <diagram name="desktop" id="3DDum1nDijUk3y7wIDRm">
-    <mxGraphModel dx="1080" dy="707" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1000" pageHeight="500" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E8E8E8;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="200" y="80" width="480" height="360" as="geometry" />
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-4" value="" style="rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#d5e8d4;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="260" y="340" width="360" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-2" value="" style="rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#dae8fc;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="260" y="140" width="360" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#DBDBDB;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1">
-          <mxGeometry x="200" y="60" width="480" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-5" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=none;fillColor=#d5e8d4;" parent="1" vertex="1">
-          <mxGeometry x="260" y="180" width="360" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-6" value="" style="endArrow=none;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-4" target="cRYnzpdCW-J0f_YpP3mc-2" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="10" y="310" as="sourcePoint" />
-            <mxPoint x="60" y="260" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-7" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#666666;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-4" target="cRYnzpdCW-J0f_YpP3mc-2" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="770" y="570" as="sourcePoint" />
-            <mxPoint x="770" y="210" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-8" value="" style="endArrow=none;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0;entryDx=0;entryDy=0;strokeColor=#666666;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-2" target="cRYnzpdCW-J0f_YpP3mc-5" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="220.00000000000023" y="179.69" as="sourcePoint" />
-            <mxPoint x="740.0000000000002" y="179.69" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-9" value="&lt;font&gt;outer_position&lt;/font&gt;" style="endArrow=blockThin;html=1;strokeWidth=3;rounded=0;exitX=0;exitY=0;exitDx=0;exitDy=0;dashed=1;align=right;fontSize=20;fontFamily=monospace;fontColor=#6C8EBF;labelBackgroundColor=none;spacingLeft=0;spacingRight=15;spacing=0;fillColor=#dae8fc;strokeColor=#6C8EBF;endFill=1;startArrow=oval;startFill=1;endSize=6;targetPerimeterSpacing=0;entryX=0;entryY=0;entryDx=0;entryDy=0;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-3" edge="1" target="cRYnzpdCW-J0f_YpP3mc-2">
-          <mxGeometry x="-0.36" y="-24" width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="80" y="160" as="sourcePoint" />
-            <mxPoint x="240" y="160" as="targetPoint" />
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-10" value="&lt;font&gt;outer_size&lt;/font&gt;" style="endArrow=none;html=1;strokeWidth=3;rounded=0;dashed=1;align=left;fontSize=20;fontFamily=monospace;fontColor=#6C8EBF;labelBackgroundColor=none;spacingLeft=15;spacingRight=0;spacing=0;exitX=1;exitY=0;exitDx=0;exitDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;entryX=1;entryY=1;entryDx=0;entryDy=0;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-2" edge="1" target="cRYnzpdCW-J0f_YpP3mc-4">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="850" y="170" as="sourcePoint" />
-            <mxPoint x="760" y="420" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="860" y="140" />
-              <mxPoint x="860" y="380" />
-            </Array>
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-11" value="&lt;font&gt;surface_size&lt;/font&gt;" style="endArrow=none;html=1;strokeWidth=3;rounded=0;dashed=1;align=left;fontSize=20;fontFamily=monospace;fontColor=#82B366;labelBackgroundColor=none;spacingLeft=15;spacingRight=0;spacing=0;entryX=1;entryY=1;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82B366;" parent="1" target="cRYnzpdCW-J0f_YpP3mc-4" edge="1">
-          <mxGeometry x="0.0526" width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="180" as="sourcePoint" />
-            <mxPoint x="760" y="420" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="700" y="180" />
-              <mxPoint x="700" y="380" />
-            </Array>
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="cRYnzpdCW-J0f_YpP3mc-12" value="&lt;font&gt;surface_position&lt;/font&gt;" style="endArrow=blockThin;html=1;strokeWidth=3;rounded=0;dashed=1;align=right;fontSize=20;fontFamily=monospace;fontColor=#82B366;labelBackgroundColor=none;spacingLeft=0;spacingRight=15;spacing=0;fillColor=#d5e8d4;strokeColor=#82b366;exitX=0;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0;entryDx=0;entryDy=0;curved=1;startArrow=oval;startFill=1;endFill=1;" parent="1" source="cRYnzpdCW-J0f_YpP3mc-2" target="cRYnzpdCW-J0f_YpP3mc-5" edge="1">
-          <mxGeometry y="-50" width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="140" y="140" as="sourcePoint" />
-            <mxPoint x="160" y="200" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="250" y="160" />
-            </Array>
-            <mxPoint x="-5" y="-22" as="offset" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram name="mobile" id="D5mAeJSS4Z33KEKjPCBt">
-    <mxGraphModel dx="1710" dy="1120" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="720" pageHeight="720" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-1" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E8E8E8;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="200" y="40" width="320" height="640" as="geometry" />
-        </mxCell>
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-2" value="" style="rounded=1;whiteSpace=wrap;html=1;shadow=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="210" y="50" width="300" height="620" as="geometry" />
-        </mxCell>
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-4" value="" style="rounded=0;whiteSpace=wrap;html=1;shadow=0;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
-          <mxGeometry x="210" y="90" width="300" height="540" as="geometry" />
-        </mxCell>
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-20" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DBDBDB;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1">
-          <mxGeometry x="290" y="640" width="140" height="10" as="geometry" />
-        </mxCell>
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-3" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DBDBDB;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1">
-          <mxGeometry x="300" y="50" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="RxwCrVmIsQwV7z5iJ9nY-12" value="&lt;font&gt;surface_size&lt;/font&gt;" style="endArrow=none;html=1;strokeWidth=3;rounded=0;dashed=1;align=left;fontSize=20;fontFamily=monospace;fontColor=#82B366;labelBackgroundColor=none;spacingLeft=15;spacingRight=15;spacing=0;fillColor=#d5e8d4;strokeColor=#82b366;exitX=1;exitY=0;exitDx=0;exitDy=0;" parent="1" source="RxwCrVmIsQwV7z5iJ9nY-2" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="210" y="50" as="sourcePoint" />
-            <mxPoint x="510" y="670" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="560" y="50" />
-              <mxPoint x="560" y="670" />
-            </Array>
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="NrHAzeOh65jb3hkBOxW9-1" value="&lt;div&gt;safe_area.top&lt;/div&gt;" style="endArrow=blockThin;html=1;strokeWidth=3;rounded=0;align=right;fontSize=20;fontFamily=monospace;fontColor=#D79B00;labelBackgroundColor=none;spacingLeft=0;spacingRight=15;spacing=0;fillColor=#ffe6cc;strokeColor=#d79b00;startArrow=blockThin;startFill=1;endFill=1;" edge="1" parent="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="180" y="50" as="sourcePoint" />
-            <mxPoint x="180" y="90" as="targetPoint" />
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="NrHAzeOh65jb3hkBOxW9-5" value="&lt;div&gt;safe_area.bottom&lt;/div&gt;" style="endArrow=blockThin;html=1;strokeWidth=3;rounded=0;align=right;fontSize=20;fontFamily=monospace;fontColor=#D79B00;labelBackgroundColor=none;spacingLeft=0;spacingRight=15;spacing=0;fillColor=#ffe6cc;strokeColor=#d79b00;startArrow=blockThin;startFill=1;endFill=1;" edge="1" parent="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="180" y="670" as="sourcePoint" />
-            <mxPoint x="180" y="630" as="targetPoint" />
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
--- a/docs/res/ATTRIBUTION.md
+++ b/docs/res/ATTRIBUTION.md
@@ -9,10 +9,3 @@ 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.
-
-## `coordinate-systems*`
-
-These files are created by [Mads Marquart](https://github.com/madsmtm) using
-[draw.io](https://draw.io/), and compressed using [svgomg.net](https://svgomg.net/).
-
-They are licensed under the [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/) license.
--- a/docs/res/coordinate-systems-desktop.svg
+++ b/docs/res/coordinate-systems-desktop.svg
--- a/docs/res/coordinate-systems-mobile.svg
+++ b/docs/res/coordinate-systems-mobile.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="720" height="720" viewBox="-0.5 -0.5 720 720" class="ge-export-svg-auto"><defs><style><![CDATA[@media (prefers-color-scheme:dark){svg.ge-export-svg-auto svg:not(mjx-container>svg),svg.ge-export-svg-auto:not(mjx-container>svg){filter:invert(100%) hue-rotate(180deg)}}]]></style></defs><g data-cell-id="0"><g data-cell-id="1"><rect x="200" y="40" width="320" height="640" rx="48" ry="48" fill="#e8e8e8" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-1"/><rect x="210" y="50" width="300" height="620" rx="45" ry="45" fill="#d5e8d4" stroke="#82b366" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-2"/><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M210 90h300v540H210z" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-4"/><rect x="290" y="640" width="140" height="10" rx="1.5" ry="1.5" fill="#dbdbdb" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-20"/><rect x="300" y="50" width="120" height="30" rx="4.5" ry="4.5" fill="#dbdbdb" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-3"/><g data-cell-id="RxwCrVmIsQwV7z5iJ9nY-12"><path d="M510 50h50v620h-50" fill="none" stroke="#82b366" stroke-width="3" stroke-miterlimit="10" stroke-dasharray="9 9" pointer-events="stroke"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:360px;margin-left:575px"><div style="box-sizing:border-box;font-size:0;text-align:left" data-drawio-colors="color: #82B366;"><div style="display:inline-block;font-size:20px;font-family:&quot;monospace&quot;;color:#82b366;line-height:1.2;pointer-events:all;white-space:nowrap"><font>surface_size</font></div></div></div></foreignObject><text x="575" y="366" fill="#82B366" font-family="&quot;monospace&quot;" font-size="20">surfa...</text></switch></g><g data-cell-id="NrHAzeOh65jb3hkBOxW9-1"><path d="M180 62.35v15.3" fill="none" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="m180 53.35 3 9h-6ZM180 86.65l-3-9h6Z" fill="#d79b00" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-end;width:1px;height:1px;padding-top:70px;margin-left:165px"><div style="box-sizing:border-box;font-size:0;text-align:right" data-drawio-colors="color: #D79B00;"><div style="display:inline-block;font-size:20px;font-family:&quot;monospace&quot;;color:#d79b00;line-height:1.2;pointer-events:all;white-space:nowrap"><div>safe_area.top</div></div></div></div></foreignObject><text x="165" y="76" fill="#D79B00" font-family="&quot;monospace&quot;" font-size="20" text-anchor="end">safe_...</text></switch></g><g data-cell-id="NrHAzeOh65jb3hkBOxW9-5"><path d="M180 657.65v-15.3" fill="none" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="m180 666.65-3-9h6ZM180 633.35l3 9h-6Z" fill="#d79b00" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-end;width:1px;height:1px;padding-top:650px;margin-left:165px"><div style="box-sizing:border-box;font-size:0;text-align:right" data-drawio-colors="color: #D79B00;"><div style="display:inline-block;font-size:20px;font-family:&quot;monospace&quot;;color:#d79b00;line-height:1.2;pointer-events:all;white-space:nowrap"><div>safe_area.bottom</div></div></div></div></foreignObject><text x="165" y="656" fill="#D79B00" font-family="&quot;monospace&quot;" font-size="20" text-anchor="end">safe_...</text></switch></g></g></g></svg>
--- a/dpi/CHANGELOG.md
+++ b/dpi/CHANGELOG.md
@@ -11,8 +11,6 @@ Unreleased` header.

 ## Unreleased

- Added `Insets`, `LogicalInsets` and `PhysicalInsets` types.
-
 ## 0.1.1

 - Derive `Debug`, `Copy`, `Clone`, `PartialEq`, `Serialize`, `Deserialize` traits for `PixelUnit`.
--- a/dpi/src/lib.rs
+++ b/dpi/src/lib.rs
@@ -759,150 +759,6 @@ impl<P: Pixel> From<LogicalPosition<P>> for Position {
    }
 }

-/// The logical distance between the edges of two rectangles.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct LogicalInsets<P> {
-    /// The distance to the top edge.
-    pub top: P,
-    /// The distance to the left edge.
-    pub left: P,
-    /// The distance to the bottom edge.
-    pub bottom: P,
-    /// The distance to the right edge.
-    pub right: P,
-}
-
-impl<P> LogicalInsets<P> {
-    #[inline]
-    pub const fn new(top: P, left: P, bottom: P, right: P) -> Self {
-        Self { top, left, bottom, right }
-    }
-}
-
-impl<P: Pixel> LogicalInsets<P> {
-    #[inline]
-    pub fn from_physical<T: Into<PhysicalInsets<X>>, X: Pixel>(
-        physical: T,
-        scale_factor: f64,
-    ) -> Self {
-        physical.into().to_logical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_physical<X: Pixel>(&self, scale_factor: f64) -> PhysicalInsets<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let top = self.top.into() * scale_factor;
-        let left = self.left.into() * scale_factor;
-        let bottom = self.bottom.into() * scale_factor;
-        let right = self.right.into() * scale_factor;
-        PhysicalInsets::new(top, left, bottom, right).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> LogicalInsets<X> {
-        LogicalInsets {
-            top: self.top.cast(),
-            left: self.left.cast(),
-            bottom: self.bottom.cast(),
-            right: self.right.cast(),
-        }
-    }
-}
-
-/// The physical distance between the edges of two rectangles.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Default, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct PhysicalInsets<P> {
-    /// The distance to the top edge.
-    pub top: P,
-    /// The distance to the left edge.
-    pub left: P,
-    /// The distance to the bottom edge.
-    pub bottom: P,
-    /// The distance to the right edge.
-    pub right: P,
-}
-
-impl<P> PhysicalInsets<P> {
-    #[inline]
-    pub const fn new(top: P, left: P, bottom: P, right: P) -> Self {
-        Self { top, left, bottom, right }
-    }
-}
-
-impl<P: Pixel> PhysicalInsets<P> {
-    #[inline]
-    pub fn from_logical<T: Into<LogicalInsets<X>>, X: Pixel>(
-        logical: T,
-        scale_factor: f64,
-    ) -> Self {
-        logical.into().to_physical(scale_factor)
-    }
-
-    #[inline]
-    pub fn to_logical<X: Pixel>(&self, scale_factor: f64) -> LogicalInsets<X> {
-        assert!(validate_scale_factor(scale_factor));
-        let top = self.top.into() / scale_factor;
-        let left = self.left.into() / scale_factor;
-        let bottom = self.bottom.into() / scale_factor;
-        let right = self.right.into() / scale_factor;
-        LogicalInsets::new(top, left, bottom, right).cast()
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> PhysicalInsets<X> {
-        PhysicalInsets {
-            top: self.top.cast(),
-            left: self.left.cast(),
-            bottom: self.bottom.cast(),
-            right: self.right.cast(),
-        }
-    }
-}
-
-/// Insets that are either physical or logical.
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum Insets {
-    Physical(PhysicalInsets<u32>),
-    Logical(LogicalInsets<f64>),
-}
-
-impl Insets {
-    pub fn new<S: Into<Self>>(insets: S) -> Self {
-        insets.into()
-    }
-
-    pub fn to_logical<P: Pixel>(&self, scale_factor: f64) -> LogicalInsets<P> {
-        match *self {
-            Self::Physical(insets) => insets.to_logical(scale_factor),
-            Self::Logical(insets) => insets.cast(),
-        }
-    }
-
-    pub fn to_physical<P: Pixel>(&self, scale_factor: f64) -> PhysicalInsets<P> {
-        match *self {
-            Self::Physical(insets) => insets.cast(),
-            Self::Logical(insets) => insets.to_physical(scale_factor),
-        }
-    }
-}
-
-impl<P: Pixel> From<PhysicalInsets<P>> for Insets {
-    #[inline]
-    fn from(insets: PhysicalInsets<P>) -> Self {
-        Self::Physical(insets.cast())
-    }
-}
-
-impl<P: Pixel> From<LogicalInsets<P>> for Insets {
-    #[inline]
-    fn from(insets: LogicalInsets<P>) -> Self {
-        Self::Logical(insets.cast())
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use std::collections::HashSet;
--- a/examples/child_window.rs
+++ b/examples/child_window.rs
@@ -44,7 +44,7 @@ fn main() -> Result<(), impl std::error::Error> {
                    self.windows.clear();
                    event_loop.exit();
                },
-                WindowEvent::PointerEntered { device_id: _, .. } => {
+                WindowEvent::CursorEntered { device_id: _ } => {
                    // On x11, println when the cursor entered in a window even if the child window
                    // is created by some key inputs.
                    // the child windows are always placed at (0, 0) with size (200, 200) in the
--- a/examples/util/fill.rs
+++ b/examples/util/fill.rs
@@ -11,7 +11,7 @@
 pub use platform::cleanup_window;
 pub use platform::fill_window;

-#[cfg(not(any(target_os = "android", target_os = "ios")))]
+#[cfg(all(feature = "rwh_06", not(any(target_os = "android", target_os = "ios"))))]
 mod platform {
    use std::cell::RefCell;
    use std::collections::HashMap;
@@ -106,7 +106,7 @@ mod platform {
    }
 }

-#[cfg(any(target_os = "android", target_os = "ios"))]
+#[cfg(not(all(feature = "rwh_06", not(any(target_os = "android", target_os = "ios")))))]
 mod platform {
    pub fn fill_window(_window: &dyn winit::window::Window) {
        // No-op on mobile platforms.
--- a/examples/window.rs
+++ b/examples/window.rs
@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 use std::error::Error;
 use std::fmt::Debug;
-#[cfg(not(android_platform))]
+#[cfg(not(any(android_platform, ios_platform)))]
 use std::num::NonZeroU32;
 use std::sync::mpsc::{self, Receiver, Sender};
 use std::sync::Arc;
@@ -11,9 +11,9 @@ use std::{fmt, mem};

 use ::tracing::{error, info};
 use cursor_icon::CursorIcon;
-#[cfg(not(android_platform))]
+#[cfg(not(any(android_platform, ios_platform)))]
 use rwh_06::{DisplayHandle, HasDisplayHandle};
-#[cfg(not(android_platform))]
+#[cfg(not(any(android_platform, ios_platform)))]
 use softbuffer::{Context, Surface};
 use winit::application::ApplicationHandler;
 use winit::dpi::{LogicalSize, PhysicalPosition, PhysicalSize};
@@ -22,17 +22,13 @@ use winit::event::{DeviceEvent, DeviceId, Ime, MouseButton, MouseScrollDelta, Wi
 use winit::event_loop::{ActiveEventLoop, EventLoop};
 use winit::keyboard::{Key, ModifiersState};
 #[cfg(macos_platform)]
-use winit::platform::macos::{
-    ApplicationHandlerExtMacOS, OptionAsAlt, WindowAttributesExtMacOS, WindowExtMacOS,
-};
+use winit::platform::macos::{OptionAsAlt, WindowAttributesExtMacOS, WindowExtMacOS};
 #[cfg(any(x11_platform, wayland_platform))]
 use winit::platform::startup_notify::{
    self, EventLoopExtStartupNotify, WindowAttributesExtStartupNotify, WindowExtStartupNotify,
 };
 #[cfg(web_platform)]
 use winit::platform::web::{ActiveEventLoopExtWeb, CustomCursorExtWeb, WindowAttributesExtWeb};
-#[cfg(x11_platform)]
-use winit::platform::x11::WindowAttributesExtX11;
 use winit::window::{
    Cursor, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, Icon, ResizeDirection,
    Theme, Window, WindowAttributes, WindowId,
@@ -87,14 +83,14 @@ struct Application {
    /// Drawing context.
    ///
    /// With OpenGL it could be EGLDisplay.
-    #[cfg(not(android_platform))]
+    #[cfg(not(any(android_platform, ios_platform)))]
    context: Option<Context<DisplayHandle<'static>>>,
 }

 impl Application {
    fn new(event_loop: &EventLoop, receiver: Receiver<Action>, sender: Sender<Action>) -> Self {
        // SAFETY: we drop the context right before the event loop is stopped, thus making it safe.
-        #[cfg(not(android_platform))]
+        #[cfg(not(any(android_platform, ios_platform)))]
        let context = Some(
            Context::new(unsafe {
                std::mem::transmute::<DisplayHandle<'_>, DisplayHandle<'static>>(
@@ -123,7 +119,7 @@ impl Application {
        Self {
            receiver,
            sender,
-            #[cfg(not(android_platform))]
+            #[cfg(not(any(android_platform, ios_platform)))]
            context,
            custom_cursors,
            icon,
@@ -151,28 +147,6 @@ impl Application {
            window_attributes = window_attributes.with_activation_token(token);
        }

-        #[cfg(x11_platform)]
-        match std::env::var("X11_VISUAL_ID") {
-            Ok(visual_id_str) => {
-                info!("Using X11 visual id {visual_id_str}");
-                let visual_id = visual_id_str.parse()?;
-                window_attributes = window_attributes.with_x11_visual(visual_id);
-            },
-            Err(_) => info!("Set the X11_VISUAL_ID env variable to request specific X11 visual"),
-        }
-
-        #[cfg(x11_platform)]
-        match std::env::var("X11_SCREEN_ID") {
-            Ok(screen_id_str) => {
-                info!("Placing the window on X11 screen {screen_id_str}");
-                let screen_id = screen_id_str.parse()?;
-                window_attributes = window_attributes.with_x11_screen(screen_id);
-            },
-            Err(_) => info!(
-                "Set the X11_SCREEN_ID env variable to place the window on non-default screen"
-            ),
-        }
-
        #[cfg(macos_platform)]
        if let Some(tab_id) = _tab_id {
            window_attributes = window_attributes.with_tabbing_identifier(&tab_id);
@@ -242,10 +216,6 @@ impl Application {
            Action::ToggleResizable => window.toggle_resizable(),
            Action::ToggleDecorations => window.toggle_decorations(),
            Action::ToggleFullscreen => window.toggle_fullscreen(),
-            #[cfg(macos_platform)]
-            Action::ToggleSimpleFullscreen => {
-                window.window.set_simple_fullscreen(!window.window.simple_fullscreen());
-            },
            Action::ToggleMaximize => window.toggle_maximize(),
            Action::ToggleImeInput => window.toggle_ime(),
            Action::Minimize => window.minimize(),
@@ -476,23 +446,20 @@ impl ApplicationHandler for Application {
                    }
                }
            },
-            WindowEvent::PointerButton { button, state, .. } => {
-                info!("Pointer button {button:?} {state:?}");
+            WindowEvent::MouseInput { button, state, .. } => {
                let mods = window.modifiers;
-                if let Some(action) = state
-                    .is_pressed()
-                    .then(|| Self::process_mouse_binding(button.mouse_button(), &mods))
-                    .flatten()
+                if let Some(action) =
+                    state.is_pressed().then(|| Self::process_mouse_binding(button, &mods)).flatten()
                {
                    self.handle_action_with_window(event_loop, window_id, action);
                }
            },
-            WindowEvent::PointerLeft { .. } => {
-                info!("Pointer left Window={window_id:?}");
+            WindowEvent::CursorLeft { .. } => {
+                info!("Cursor left Window={window_id:?}");
                window.cursor_left();
            },
-            WindowEvent::PointerMoved { position, .. } => {
-                info!("Moved pointer to {position:?}");
+            WindowEvent::CursorMoved { position, .. } => {
+                info!("Moved cursor to {position:?}");
                window.cursor_moved(position);
            },
            WindowEvent::ActivationTokenDone { token: _token, .. } => {
@@ -543,10 +510,11 @@ impl ApplicationHandler for Application {
            WindowEvent::TouchpadPressure { .. }
            | WindowEvent::HoveredFileCancelled
            | WindowEvent::KeyboardInput { .. }
-            | WindowEvent::PointerEntered { .. }
+            | WindowEvent::CursorEntered { .. }
            | WindowEvent::DroppedFile(_)
            | WindowEvent::HoveredFile(_)
            | WindowEvent::Destroyed
+            | WindowEvent::Touch(_)
            | WindowEvent::Moved(_) => (),
        }
    }
@@ -554,7 +522,7 @@ impl ApplicationHandler for Application {
    fn device_event(
        &mut self,
        _event_loop: &dyn ActiveEventLoop,
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        event: DeviceEvent,
    ) {
        info!("Device {device_id:?} event: {event:?}");
@@ -577,28 +545,11 @@ impl ApplicationHandler for Application {
        }
    }

-    #[cfg(not(android_platform))]
+    #[cfg(not(any(android_platform, ios_platform)))]
    fn exiting(&mut self, _event_loop: &dyn ActiveEventLoop) {
        // We must drop the context here.
        self.context = None;
    }
-
-    #[cfg(target_os = "macos")]
-    fn macos_handler(&mut self) -> Option<&mut dyn ApplicationHandlerExtMacOS> {
-        Some(self)
-    }
-}
-
-#[cfg(target_os = "macos")]
-impl ApplicationHandlerExtMacOS for Application {
-    fn standard_key_binding(
-        &mut self,
-        _event_loop: &dyn ActiveEventLoop,
-        window_id: WindowId,
-        action: &str,
-    ) {
-        info!(?window_id, ?action, "macOS standard key binding");
-    }
 }

 /// State of the window.
@@ -608,7 +559,7 @@ struct WindowState {
    /// Render surface.
    ///
    /// NOTE: This surface must be dropped before the `Window`.
-    #[cfg(not(android_platform))]
+    #[cfg(not(any(android_platform, ios_platform)))]
    surface: Surface<DisplayHandle<'static>, Arc<dyn Window>>,
    /// The actual winit Window.
    window: Arc<dyn Window>,
@@ -644,7 +595,7 @@ impl WindowState {

        // SAFETY: the surface is dropped before the `window` which provided it with handle, thus
        // it doesn't outlive it.
-        #[cfg(not(android_platform))]
+        #[cfg(not(any(android_platform, ios_platform)))]
        let surface = Surface::new(app.context.as_ref().unwrap(), Arc::clone(&window))?;

        let theme = window.theme().unwrap_or(Theme::Dark);
@@ -663,7 +614,7 @@ impl WindowState {
            custom_idx: app.custom_cursors.as_ref().map(Vec::len).unwrap_or(1) - 1,
            cursor_grab: CursorGrabMode::None,
            named_idx,
-            #[cfg(not(android_platform))]
+            #[cfg(not(any(android_platform, ios_platform)))]
            surface,
            window,
            theme,
@@ -845,7 +796,7 @@ impl WindowState {
    /// Resize the surface to the new size.
    fn resize(&mut self, size: PhysicalSize<u32>) {
        info!("Surface resized to {size:?}");
-        #[cfg(not(android_platform))]
+        #[cfg(not(any(android_platform, ios_platform)))]
        {
            let (width, height) = match (NonZeroU32::new(size.width), NonZeroU32::new(size.height))
            {
@@ -938,49 +889,29 @@ impl WindowState {
    }

    /// Draw the window contents.
-    #[cfg(not(android_platform))]
+    #[cfg(not(any(android_platform, ios_platform)))]
    fn draw(&mut self) -> Result<(), Box<dyn Error>> {
        if self.occluded {
            info!("Skipping drawing occluded window={:?}", self.window.id());
            return Ok(());
        }

+        const WHITE: u32 = 0xffffffff;
+        const DARK_GRAY: u32 = 0xff181818;
+
+        let color = match self.theme {
+            Theme::Light => WHITE,
+            Theme::Dark => DARK_GRAY,
+        };
+
        let mut buffer = self.surface.buffer_mut()?;
-
-        // Draw a different color inside the safe area
-        let surface_size = self.window.surface_size();
-        let insets = self.window.safe_area();
-        for y in 0..surface_size.height {
-            for x in 0..surface_size.width {
-                let index = y as usize * surface_size.width as usize + x as usize;
-                if insets.left <= x
-                    && x <= (surface_size.width - insets.right)
-                    && insets.top <= y
-                    && y <= (surface_size.height - insets.bottom)
-                {
-                    // In safe area
-                    buffer[index] = match self.theme {
-                        Theme::Light => 0xffe8e8e8, // Light gray
-                        Theme::Dark => 0xff525252,  // Medium gray
-                    };
-                } else {
-                    // Outside safe area
-                    buffer[index] = match self.theme {
-                        Theme::Light => 0xffffffff, // White
-                        Theme::Dark => 0xff181818,  // Dark gray
-                    };
-                }
-            }
-        }
-
-        // Present the buffer
+        buffer.fill(color);
        self.window.pre_present_notify();
        buffer.present()?;
-
        Ok(())
    }

-    #[cfg(android_platform)]
+    #[cfg(any(android_platform, ios_platform))]
    fn draw(&mut self) -> Result<(), Box<dyn Error>> {
        info!("Drawing but without rendering...");
        Ok(())
@@ -1013,8 +944,6 @@ enum Action {
    ToggleDecorations,
    ToggleResizable,
    ToggleFullscreen,
-    #[cfg(macos_platform)]
-    ToggleSimpleFullscreen,
    ToggleMaximize,
    Minimize,
    NextCursor,
@@ -1048,8 +977,6 @@ impl Action {
            Action::ToggleDecorations => "Toggle decorations",
            Action::ToggleResizable => "Toggle window resizable state",
            Action::ToggleFullscreen => "Toggle fullscreen",
-            #[cfg(macos_platform)]
-            Action::ToggleSimpleFullscreen => "Toggle simple fullscreen",
            Action::ToggleMaximize => "Maximize",
            Action::Minimize => "Minimize",
            Action::ToggleResizeIncrements => "Use resize increments when resizing window",
@@ -1192,8 +1119,6 @@ const KEY_BINDINGS: &[Binding<&'static str>] = &[
    Binding::new("Q", ModifiersState::CONTROL, Action::CloseWindow),
    Binding::new("H", ModifiersState::CONTROL, Action::PrintHelp),
    Binding::new("F", ModifiersState::CONTROL, Action::ToggleFullscreen),
-    #[cfg(macos_platform)]
-    Binding::new("F", ModifiersState::ALT, Action::ToggleSimpleFullscreen),
    Binding::new("D", ModifiersState::CONTROL, Action::ToggleDecorations),
    Binding::new("I", ModifiersState::CONTROL, Action::ToggleImeInput),
    Binding::new("L", ModifiersState::CONTROL, Action::CycleCursorGrab),
--- a/src/application.rs
+++ b/src/application.rs
@@ -2,8 +2,6 @@

 use crate::event::{DeviceEvent, DeviceId, StartCause, WindowEvent};
 use crate::event_loop::ActiveEventLoop;
-#[cfg(any(docsrs, macos_platform))]
-use crate::platform::macos::ApplicationHandlerExtMacOS;
 use crate::window::WindowId;

 /// The handler of the application events.
@@ -43,21 +41,11 @@ pub trait ApplicationHandler {
    /// [`pageshow`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pageshow_event
    /// [`bfcache`]: https://web.dev/bfcache/
    ///
-    /// ### Android
-    ///
-    /// On Android, the [`resumed()`] method is called when the `Activity` is (again, if after a
-    /// prior [`suspended()`]) being displayed to the user. This is a good place to begin drawing
-    /// visual elements, running animations, etc. It is driven by Android's [`onStart()`] method.
-    ///
-    /// [`onStart()`]: https://developer.android.com/reference/android/app/Activity#onStart()
-    ///
    /// ### Others
    ///
-    /// **macOS / Orbital / Wayland / Windows / X11:** Unsupported.
+    /// **Android / macOS / Orbital / Wayland / Windows / X11:** Unsupported.
    ///
-    /// [`resumed()`]: Self::resumed()
-    /// [`suspended()`]: Self::suspended()
-    /// [`exiting()`]: Self::exiting()
+    /// [`resumed()`]: Self::resumed
    fn resumed(&mut self, event_loop: &dyn ActiveEventLoop) {
        let _ = event_loop;
    }
@@ -83,24 +71,26 @@ pub trait ApplicationHandler {
    ///
    /// ### Android
    ///
-    /// On Android, the [`can_create_surfaces()`] method is called when a new [`NativeWindow`]
-    /// (native [`Surface`]) is created which backs the application window. This is expected to
-    /// closely correlate with the [`onStart`] lifecycle event which typically results in a surface
-    /// to be created after the app becomes visible.
+    /// On Android, the [`can_create_surfaces()`] method is called when a new [`SurfaceView`] has
+    /// been created. This is expected to closely correlate with the [`onResume`] lifecycle
+    /// event but there may technically be a discrepancy.
    ///
-    /// Applications that need to run on Android must wait until they have received a surface before
+    /// [`onResume`]: https://developer.android.com/reference/android/app/Activity#onResume()
+    ///
+    /// Applications that need to run on Android must wait until they have been "resumed" before
    /// they will be able to create a render surface (such as an `EGLSurface`, [`VkSurfaceKHR`]
-    /// or [`wgpu::Surface`]) which depend on having a [`NativeWindow`]. Applications must handle
-    /// [`destroy_surfaces()`], where their render surfaces are invalid and should be dropped.
+    /// or [`wgpu::Surface`]) which depend on having a [`SurfaceView`]. Applications must also
+    /// assume that if they are [suspended], then their render surfaces are invalid and should
+    /// be dropped.
    ///
-    /// [`NativeWindow`]: https://developer.android.com/ndk/reference/group/a-native-window
-    /// [`Surface`]: https://developer.android.com/reference/android/view/Surface
-    /// [`onStart`]: https://developer.android.com/reference/android/app/Activity#onStart()
+    /// [suspended]: Self::destroy_surfaces
+    /// [`SurfaceView`]: https://developer.android.com/reference/android/view/SurfaceView
+    /// [Activity lifecycle]: https://developer.android.com/guide/components/activities/activity-lifecycle
    /// [`VkSurfaceKHR`]: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkSurfaceKHR.html
    /// [`wgpu::Surface`]: https://docs.rs/wgpu/latest/wgpu/struct.Surface.html
    ///
-    /// [`can_create_surfaces()`]: Self::can_create_surfaces()
-    /// [`destroy_surfaces()`]: Self::destroy_surfaces()
+    /// [`can_create_surfaces()`]: Self::can_create_surfaces
+    /// [`destroy_surfaces()`]: Self::destroy_surfaces
    fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop);

    /// Called after a wake up is requested using [`EventLoopProxy::wake_up()`].
@@ -206,7 +196,7 @@ pub trait ApplicationHandler {
    fn device_event(
        &mut self,
        event_loop: &dyn ActiveEventLoop,
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        event: DeviceEvent,
    ) {
        let _ = (event_loop, device_id, event);
@@ -245,30 +235,18 @@ pub trait ApplicationHandler {
    /// ### Web
    ///
    /// On Web, the [`suspended()`] method is called in response to a [`pagehide`] event if the
-    /// page is being stored in the [`bfcache`] (back/forward cache) - an in-memory cache that
+    /// page is being restored from the [`bfcache`] (back/forward cache) - an in-memory cache that
    /// stores a complete snapshot of a page (including the JavaScript heap) as the user is
    /// navigating away.
    ///
    /// [`pagehide`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/pagehide_event
    /// [`bfcache`]: https://web.dev/bfcache/
    ///
-    /// ### Android
-    ///
-    /// On Android, the [`suspended()`] method is called when the `Activity` is no longer visible
-    /// to the user. This is a good place to stop refreshing UI, running animations and other visual
-    /// things. It is driven by Android's [`onStop()`] method.
-    ///
-    /// After this event the application either receives [`resumed()`] again, or [`exiting()`].
-    ///
-    /// [`onStop()`]: https://developer.android.com/reference/android/app/Activity#onStop()
-    ///
    /// ### Others
    ///
-    /// **macOS / Orbital / Wayland / Windows / X11:** Unsupported.
+    /// **Android / macOS / Orbital / Wayland / Windows / X11:** Unsupported.
    ///
-    /// [`resumed()`]: Self::resumed()
-    /// [`suspended()`]: Self::suspended()
-    /// [`exiting()`]: Self::exiting()
+    /// [`suspended()`]: Self::suspended
    fn suspended(&mut self, event_loop: &dyn ActiveEventLoop) {
        let _ = event_loop;
    }
@@ -281,22 +259,24 @@ pub trait ApplicationHandler {
    ///
    /// ### Android
    ///
-    /// On Android, the [`destroy_surfaces()`] method is called when the application's
-    /// [`NativeWindow`] (native [`Surface`]) is destroyed. This is expected to closely correlate
-    /// with the [`onStop`] lifecycle event which typically results in the surface to be destroyed
-    /// after the app becomes invisible.
+    /// On Android, the [`destroy_surfaces()`] method is called when the application's associated
+    /// [`SurfaceView`] is destroyed. This is expected to closely correlate with the [`onPause`]
+    /// lifecycle event but there may technically be a discrepancy.
    ///
-    /// Applications that need to run on Android should assume their [`NativeWindow`] has been
+    /// [`onPause`]: https://developer.android.com/reference/android/app/Activity#onPause()
+    ///
+    /// Applications that need to run on Android should assume their [`SurfaceView`] has been
    /// destroyed, which indirectly invalidates any existing render surfaces that may have been
    /// created outside of Winit (such as an `EGLSurface`, [`VkSurfaceKHR`] or [`wgpu::Surface`]).
    ///
-    /// When receiving [`destroy_surfaces()`] Android applications should drop all render surfaces
-    /// before the event callback completes, which may be re-created when the application next
-    /// receives [`can_create_surfaces()`].
+    /// After being [suspended] on Android applications must drop all render surfaces before
+    /// the event callback completes, which may be re-created when the application is next
+    /// [resumed].
    ///
-    /// [`NativeWindow`]: https://developer.android.com/ndk/reference/group/a-native-window
-    /// [`Surface`]: https://developer.android.com/reference/android/view/Surface
-    /// [`onStop`]: https://developer.android.com/reference/android/app/Activity#onStop()
+    /// [suspended]: Self::destroy_surfaces
+    /// [resumed]: Self::can_create_surfaces
+    /// [`SurfaceView`]: https://developer.android.com/reference/android/view/SurfaceView
+    /// [Activity lifecycle]: https://developer.android.com/guide/components/activities/activity-lifecycle
    /// [`VkSurfaceKHR`]: https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VkSurfaceKHR.html
    /// [`wgpu::Surface`]: https://docs.rs/wgpu/latest/wgpu/struct.Surface.html
    ///
@@ -304,8 +284,8 @@ pub trait ApplicationHandler {
    ///
    /// - **iOS / macOS / Orbital / Wayland / Web / Windows / X11:** Unsupported.
    ///
-    /// [`can_create_surfaces()`]: Self::can_create_surfaces()
-    /// [`destroy_surfaces()`]: Self::destroy_surfaces()
+    /// [`can_create_surfaces()`]: Self::can_create_surfaces
+    /// [`destroy_surfaces()`]: Self::destroy_surfaces
    fn destroy_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
        let _ = event_loop;
    }
@@ -345,15 +325,6 @@ pub trait ApplicationHandler {
    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
        let _ = event_loop;
    }
-
-    /// The macOS-specific handler.
-    ///
-    /// The return value from this should not change at runtime.
-    #[cfg(any(docsrs, macos_platform))]
-    #[inline(always)]
-    fn macos_handler(&mut self) -> Option<&mut dyn ApplicationHandlerExtMacOS> {
-        None
-    }
 }

 #[deny(clippy::missing_trait_methods)]
@@ -392,7 +363,7 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for &mut A {
    fn device_event(
        &mut self,
        event_loop: &dyn ActiveEventLoop,
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        event: DeviceEvent,
    ) {
        (**self).device_event(event_loop, device_id, event);
@@ -422,12 +393,6 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for &mut A {
    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
        (**self).memory_warning(event_loop);
    }
-
-    #[cfg(any(docsrs, macos_platform))]
-    #[inline]
-    fn macos_handler(&mut self) -> Option<&mut dyn ApplicationHandlerExtMacOS> {
-        (**self).macos_handler()
-    }
 }

 #[deny(clippy::missing_trait_methods)]
@@ -466,7 +431,7 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for Box<A> {
    fn device_event(
        &mut self,
        event_loop: &dyn ActiveEventLoop,
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        event: DeviceEvent,
    ) {
        (**self).device_event(event_loop, device_id, event);
@@ -496,10 +461,4 @@ impl<A: ?Sized + ApplicationHandler> ApplicationHandler for Box<A> {
    fn memory_warning(&mut self, event_loop: &dyn ActiveEventLoop) {
        (**self).memory_warning(event_loop);
    }
-
-    #[cfg(any(docsrs, macos_platform))]
-    #[inline]
-    fn macos_handler(&mut self) -> Option<&mut dyn ApplicationHandlerExtMacOS> {
-        (**self).macos_handler()
-    }
 }
--- a/src/changelog/unreleased.md
+++ b/src/changelog/unreleased.md
@@ -56,25 +56,15 @@ changelog entry.

  Keep in mind that handles do not auto-upgrade after permissions are granted and have to be
  re-created to make full use of this feature.
+- Add `Touch::finger_id` with a new type `FingerId`.
+- On Web and Windows, add `FingerIdExt*::is_primary()`, exposing a way to determine
+  the primary finger in a multi-touch interaction.
 - Implement `Clone`, `Copy`, `Debug`, `Deserialize`, `Eq`, `Hash`, `Ord`, `PartialEq`, `PartialOrd`
  and `Serialize` on many types.
 - Add `MonitorHandle::current_video_mode()`.
- On Android, the soft keyboard can now be shown using `Window::set_ime_allowed`.
 - Add basic iOS IME support. The soft keyboard can now be shown using `Window::set_ime_allowed`.
- Add `ApplicationHandlerExtMacOS` trait, and a `macos_handler` method to `ApplicationHandler` which returns a `dyn ApplicationHandlerExtMacOS` which allows for macOS specific extensions to winit.
- Add a `standard_key_binding` method to the `ApplicationHandlerExtMacOS` trait. This allows handling of standard keybindings such as "go to end of line" on macOS.
 - On macOS, add `WindowExtMacOS::set_borderless_game` and `WindowAttributesExtMacOS::with_borderless_game`
  to fully disable the menu bar and dock in Borderless Fullscreen as commonly done in games.
- On macOS, add `WindowExtMacOS::set_unified_titlebar` and `WindowAttributesExtMacOS::with_unified_titlebar`
-  to use a larger style of titlebar.
- Add `WindowId::into_raw()` and `from_raw()`.
- Add `PointerKind`, `PointerSource`, `ButtonSource`, `FingerId`, `primary` and `position` to all
-  pointer events as part of the pointer event overhaul.
- Add `DeviceId::into_raw()` and `from_raw()`.
- On X11, the `window` example now understands the `X11_VISUAL_ID` and `X11_SCREEN_ID` env
-  variables to test the respective modifiers of window creation.
- Added `Window::surface_position`, which is the position of the surface inside the window.
- Added `Window::safe_area`, which describes the area of the surface that is unobstructed.

 ### Changed

@@ -93,14 +83,14 @@ changelog entry.
 - Changed `EventLoopProxy::send_event` to `EventLoopProxy::wake_up`, it now
  only wakes up the loop.
 - On X11, implement smooth resizing through the sync extension API.
- `ApplicationHandler::can_create|destroy_surfaces()` was split off from
+- `ApplicationHandler::create|destroy_surfaces()` was split off from
  `ApplicationHandler::resumed/suspended()`.

  `ApplicationHandler::can_create_surfaces()` should, for portability reasons
  to Android, be the only place to create render surfaces.

-  `ApplicationHandler::resumed/suspended()` are now only emitted by iOS, Web
-  and Android, and now signify actually resuming/suspending the application.
+  `ApplicationHandler::resumed/suspended()` are now only emitted by iOS and Web
+  and now signify actually resuming/suspending the application.
 - Rename `platform::web::*ExtWebSys` to `*ExtWeb`.
 - Change signature of `EventLoop::run_app`, `EventLoopExtPumpEvents::pump_app_events` and
  `EventLoopExtRunOnDemand::run_app_on_demand` to accept a `impl ApplicationHandler` directly,
@@ -134,32 +124,6 @@ changelog entry.
  - `Window::set_max_inner_size` to `set_max_surface_size`.

  To migrate, you can probably just replace all instances of `inner_size` with `surface_size` in your codebase.
- Every event carrying a `DeviceId` now uses `Option<DeviceId>` instead. A `None` value signifies that the
-  device can't be uniquely identified.
- Pointer `WindowEvent`s were overhauled. The new events can handle any type of pointer, serving as
-  a single pointer input source. Now your application can handle any pointer type without having to
-  explicitly handle e.g. `Touch`:
-  - Rename `CursorMoved` to `PointerMoved`.
-  - Rename `CursorEntered` to `PointerEntered`.
-  - Rename `CursorLeft` to `PointerLeft`.
-  - Rename `MouseInput` to `PointerButton`.
-  - Add `primary` to every `PointerEvent` as a way to identify discard non-primary pointers in a
-    multi-touch interaction.
-  - Add `position` to every `PointerEvent`.
-  - `PointerMoved` is **not sent** after `PointerEntered` anymore.
-  - Remove `Touch`, which is folded into the `Pointer*` events.
-  - New `PointerKind` added to `PointerEntered` and `PointerLeft`, signifying which pointer type is
-    the source of this event.
-  - New `PointerSource` added to `PointerMoved`, similar to `PointerKind` but holding additional
-    data.
-  - New `ButtonSource` added to `PointerButton`, similar to `PointerKind` but holding pointer type
-    specific buttons. Use `ButtonSource::mouse_button()` to easily normalize any pointer button
-    type to a generic mouse button.
-  - New `FingerId` added to `PointerKind::Touch` and `PointerSource::Touch` able to uniquely
-    identify a finger in a multi-touch interaction. Replaces the old `Touch::id`.
-  - In the same spirit rename `DeviceEvent::MouseMotion` to `PointerMotion`.
-  - Remove `Force::Calibrated::altitude_angle`.
- On X11, use bottom-right corner for IME hotspot in `Window::set_ime_cursor_area`.

 ### Removed

@@ -182,27 +146,11 @@ changelog entry.
  v0.5 support. v0.6 remains in place and is enabled by default.
 - Remove `DeviceEvent::Added` and `DeviceEvent::Removed`.
 - Remove `DeviceEvent::Motion` and `WindowEvent::AxisMotion`.
+- Remove `Touch::id` in favor of `Touch::finger_id`.
 - Remove `MonitorHandle::size()` and `refresh_rate_millihertz()` in favor of
  `MonitorHandle::current_video_mode()`.
 - On Android, remove all `MonitorHandle` support instead of emitting false data.
- Remove `impl From<u64> for WindowId` and `impl From<WindowId> for u64`. Replaced with
-  `WindowId::into_raw()` and `from_raw()`.
- Remove `dummy()` from `WindowId` and `DeviceId`.
- Remove `WindowEvent::Touch` and `Touch` in favor of the new `PointerKind`, `PointerSource` and
- `ButtonSource` as part of the new pointer event overhaul.
- Remove `Force::altitude_angle`.
- Removed `Window::inner_position`, use the new `Window::surface_position` instead.

 ### Fixed

 - On Orbital, `MonitorHandle::name()` now returns `None` instead of a dummy name.
- On macOS, fix `WindowEvent::Moved` sometimes being triggered unnecessarily on resize.
- On macOS, package manifest definitions of `LSUIElement` will no longer be overridden with the
-  default activation policy, unless explicitly provided during initialization.
- On macOS, fix crash when calling `drag_window()` without a left click present.
- On X11, key events forward to IME anyway, even when it's disabled.
- On Windows, make `ControlFlow::WaitUntil` work more precisely using `CREATE_WAITABLE_TIMER_HIGH_RESOLUTION`.
- On X11, creating windows on screen that is not the first one (e.g. `DISPLAY=:0.1`) works again.
- On X11, creating windows while passing `with_x11_screen(non_default_screen)` works again.
- On X11, fix XInput handling that prevented a new window from getting the focus in some cases.
- On iOS, fixed `SurfaceResized` and `Window::surface_size` not reporting the size of the actual surface.
--- a/src/event.rs
+++ b/src/event.rs
@@ -63,51 +63,51 @@ use crate::window::{ActivationToken, Theme, WindowId};
 #[allow(dead_code)]
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) enum Event {
-    /// See [`ApplicationHandler::new_events()`] for details.
+    /// See [`ApplicationHandler::new_events`] for details.
    ///
-    /// [`ApplicationHandler::new_events()`]: crate::application::ApplicationHandler::new_events()
+    /// [`ApplicationHandler::new_events`]: crate::application::ApplicationHandler::new_events
    NewEvents(StartCause),

-    /// See [`ApplicationHandler::window_event()`] for details.
+    /// See [`ApplicationHandler::window_event`] for details.
    ///
-    /// [`ApplicationHandler::window_event()`]: crate::application::ApplicationHandler::window_event()
+    /// [`ApplicationHandler::window_event`]: crate::application::ApplicationHandler::window_event
    #[allow(clippy::enum_variant_names)]
    WindowEvent { window_id: WindowId, event: WindowEvent },

-    /// See [`ApplicationHandler::device_event()`] for details.
+    /// See [`ApplicationHandler::device_event`] for details.
    ///
-    /// [`ApplicationHandler::device_event()`]: crate::application::ApplicationHandler::device_event()
+    /// [`ApplicationHandler::device_event`]: crate::application::ApplicationHandler::device_event
    #[allow(clippy::enum_variant_names)]
-    DeviceEvent { device_id: Option<DeviceId>, event: DeviceEvent },
+    DeviceEvent { device_id: DeviceId, event: DeviceEvent },

-    /// See [`ApplicationHandler::suspended()`] for details.
+    /// See [`ApplicationHandler::suspended`] for details.
    ///
-    /// [`ApplicationHandler::suspended()`]: crate::application::ApplicationHandler::suspended()
+    /// [`ApplicationHandler::suspended`]: crate::application::ApplicationHandler::suspended
    Suspended,

-    /// See [`ApplicationHandler::can_create_surfaces()`] for details.
+    /// See [`ApplicationHandler::can_create_surfaces`] for details.
    ///
-    /// [`ApplicationHandler::can_create_surfaces()`]: crate::application::ApplicationHandler::can_create_surfaces()
+    /// [`ApplicationHandler::can_create_surfaces`]: crate::application::ApplicationHandler::can_create_surfaces
    CreateSurfaces,

-    /// See [`ApplicationHandler::resumed()`] for details.
+    /// See [`ApplicationHandler::resumed`] for details.
    ///
-    /// [`ApplicationHandler::resumed()`]: crate::application::ApplicationHandler::resumed()
+    /// [`ApplicationHandler::resumed`]: crate::application::ApplicationHandler::resumed
    Resumed,

-    /// See [`ApplicationHandler::about_to_wait()`] for details.
+    /// See [`ApplicationHandler::about_to_wait`] for details.
    ///
-    /// [`ApplicationHandler::about_to_wait()`]: crate::application::ApplicationHandler::about_to_wait()
+    /// [`ApplicationHandler::about_to_wait`]: crate::application::ApplicationHandler::about_to_wait
    AboutToWait,

-    /// See [`ApplicationHandler::exiting()`] for details.
+    /// See [`ApplicationHandler::exiting`] for details.
    ///
-    /// [`ApplicationHandler::exiting()`]: crate::application::ApplicationHandler::exiting()
+    /// [`ApplicationHandler::exiting`]: crate::application::ApplicationHandler::exiting
    LoopExiting,

-    /// See [`ApplicationHandler::memory_warning()`] for details.
+    /// See [`ApplicationHandler::memory_warning`] for details.
    ///
-    /// [`ApplicationHandler::memory_warning()`]: crate::application::ApplicationHandler::memory_warning()
+    /// [`ApplicationHandler::memory_warning`]: crate::application::ApplicationHandler::memory_warning
    MemoryWarning,

    /// User requested a wake up.
@@ -156,10 +156,7 @@ pub enum WindowEvent {
    /// [`Window::surface_size`]: crate::window::Window::surface_size
    SurfaceResized(PhysicalSize<u32>),

-    /// The position of the window has changed.
-    ///
-    /// Contains the window's new position in desktop coordinates (can also be retrieved with
-    /// [`Window::outer_position`]).
+    /// The position of the window has changed. Contains the window's new position.
    ///
    /// ## Platform-specific
    ///
@@ -202,7 +199,7 @@ pub enum WindowEvent {
    ///   numpad keys act as if NumLock wasn't active. When this is used, the OS sends fake key
    ///   events which are not marked as `is_synthetic`.
    KeyboardInput {
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        event: KeyEvent,

        /// If `true`, the event was generated synthetically by winit
@@ -229,113 +226,52 @@ pub enum WindowEvent {
    /// - **iOS / Android / Web / Orbital:** Unsupported.
    Ime(Ime),

-    /// The pointer has moved on the window.
-    PointerMoved {
-        device_id: Option<DeviceId>,
+    /// The cursor has moved on the window.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
+    ///
+    /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
+    /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+    /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+    CursorMoved {
+        device_id: DeviceId,

-        /// (x,y) coordinates in pixels relative to the top-left corner of the window. Because the
-        /// range of this data is limited by the display area and it may have been
-        /// transformed by the OS to implement effects such as pointer acceleration, it
-        /// should not be used to implement non-pointer-like interactions such as 3D camera
-        /// control. For that, consider [`DeviceEvent::PointerMotion`].
-        ///
-        /// ## Platform-specific
-        ///
-        /// **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
-        ///
-        /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
-        /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-        /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+        /// (x,y) coords in pixels relative to the top-left corner of the window. Because the range
+        /// of this data is limited by the display area and it may have been transformed by
+        /// the OS to implement effects such as cursor acceleration, it should not be used
+        /// to implement non-cursor-like interactions such as 3D camera control.
        position: PhysicalPosition<f64>,
-
-        /// Indicates whether the event is created by a primary pointer.
-        ///
-        /// A pointer is considered primary when it's a mouse, the first finger in a multi-touch
-        /// interaction, or an unknown pointer source.
-        primary: bool,
-
-        source: PointerSource,
    },

-    /// The pointer has entered the window.
-    PointerEntered {
-        device_id: Option<DeviceId>,
+    /// The cursor has entered the window.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
+    ///
+    /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
+    /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+    /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+    CursorEntered { device_id: DeviceId },

-        /// The position of the pointer when it entered the window.
-        ///
-        /// ## Platform-specific
-        ///
-        /// - **Orbital: Always emits `(0., 0.)`.
-        /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
-        ///
-        /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
-        /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-        /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
-        position: PhysicalPosition<f64>,
-
-        /// Indicates whether the event is created by a primary pointer.
-        ///
-        /// A pointer is considered primary when it's a mouse, the first finger in a multi-touch
-        /// interaction, or an unknown pointer source.
-        primary: bool,
-
-        kind: PointerKind,
-    },
-
-    /// The pointer has left the window.
-    PointerLeft {
-        device_id: Option<DeviceId>,
-
-        /// The position of the pointer when it left the window. The position reported can be
-        /// outside the bounds of the window.
-        ///
-        /// ## Platform-specific
-        ///
-        /// - **Orbital/Windows:** Always emits [`None`].
-        /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
-        ///
-        /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
-        /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-        /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
-        position: Option<PhysicalPosition<f64>>,
-
-        /// Indicates whether the event is created by a primary pointer.
-        ///
-        /// A pointer is considered primary when it's a mouse, the first finger in a multi-touch
-        /// interaction, or an unknown pointer source.
-        primary: bool,
-
-        kind: PointerKind,
-    },
+    /// The cursor has left the window.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
+    ///
+    /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
+    /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+    /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+    CursorLeft { device_id: DeviceId },

    /// A mouse wheel movement or touchpad scroll occurred.
-    MouseWheel { device_id: Option<DeviceId>, delta: MouseScrollDelta, phase: TouchPhase },
+    MouseWheel { device_id: DeviceId, delta: MouseScrollDelta, phase: TouchPhase },

    /// An mouse button press has been received.
-    PointerButton {
-        device_id: Option<DeviceId>,
-        state: ElementState,
-
-        /// The position of the pointer when the button was pressed.
-        ///
-        /// ## Platform-specific
-        ///
-        /// - **Orbital: Always emits `(0., 0.)`.
-        /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
-        ///
-        /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
-        /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-        /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
-        position: PhysicalPosition<f64>,
-
-        /// Indicates whether the event is created by a primary pointer.
-        ///
-        /// A pointer is considered primary when it's a mouse, the first finger in a multi-touch
-        /// interaction, or an unknown pointer source.
-        primary: bool,
-
-        button: ButtonSource,
-    },
+    MouseInput { device_id: DeviceId, state: ElementState, button: MouseButton },

    /// Two-finger pinch gesture, often used for magnification.
    ///
@@ -344,7 +280,7 @@ pub enum WindowEvent {
    /// - Only available on **macOS** and **iOS**.
    /// - On iOS, not recognized by default. It must be enabled when needed.
    PinchGesture {
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        /// Positive values indicate magnification (zooming in) and  negative
        /// values indicate shrinking (zooming out).
        ///
@@ -360,7 +296,7 @@ pub enum WindowEvent {
    /// - Only available on **iOS**.
    /// - On iOS, not recognized by default. It must be enabled when needed.
    PanGesture {
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        /// Change in pixels of pan gesture from last update.
        delta: PhysicalPosition<f32>,
        phase: TouchPhase,
@@ -384,7 +320,7 @@ pub enum WindowEvent {
    ///
    /// - Only available on **macOS 10.8** and later, and **iOS**.
    /// - On iOS, not recognized by default. It must be enabled when needed.
-    DoubleTapGesture { device_id: Option<DeviceId> },
+    DoubleTapGesture { device_id: DeviceId },

    /// Two-finger rotation gesture.
    ///
@@ -396,7 +332,7 @@ pub enum WindowEvent {
    /// - Only available on **macOS** and **iOS**.
    /// - On iOS, not recognized by default. It must be enabled when needed.
    RotationGesture {
-        device_id: Option<DeviceId>,
+        device_id: DeviceId,
        /// change in rotation in degrees
        delta: f32,
        phase: TouchPhase,
@@ -407,7 +343,19 @@ pub enum WindowEvent {
    /// At the moment, only supported on Apple forcetouch-capable macbooks.
    /// The parameters are: pressure level (value between 0 and 1 representing how hard the
    /// touchpad is being pressed) and stage (integer representing the click level).
-    TouchpadPressure { device_id: Option<DeviceId>, pressure: f32, stage: i64 },
+    TouchpadPressure { device_id: DeviceId, pressure: f32, stage: i64 },
+
+    /// Touch event has been received
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
+    /// - **macOS:** Unsupported.
+    ///
+    /// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
+    /// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+    /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+    Touch(Touch),

    /// The window's scale factor has changed.
    ///
@@ -472,141 +420,16 @@ pub enum WindowEvent {

    /// Emitted when a window should be redrawn.
    ///
-    /// This gets triggered in a few scenarios:
+    /// This gets triggered in two scenarios:
    /// - The OS has performed an operation that's invalidated the window's contents (such as
-    ///   resizing the window, or changing [the safe area]).
+    ///   resizing the window).
    /// - The application has explicitly requested a redraw via [`Window::request_redraw`].
    ///
    /// Winit will aggregate duplicate redraw requests into a single event, to
    /// help avoid duplicating rendering work.
-    ///
-    /// [the safe area]: crate::window::Window::safe_area
    RedrawRequested,
 }

-/// Represents the kind type of a pointer event.
-///
-/// ## Platform-specific
-///
-/// **Wayland/X11:** [`Unknown`](Self::Unknown) device types are converted to known variants by the
-/// system.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum PointerKind {
-    Mouse,
-    /// See [`PointerSource::Touch`] for more details.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **macOS:** Unsupported.
-    Touch(FingerId),
-    Unknown,
-}
-
-/// Represents the pointer type and its data for a pointer event.
-///
-/// **Wayland/X11:** [`Unknown`](Self::Unknown) device types are converted to known variants by the
-/// system.
-#[derive(Clone, Debug, PartialEq)]
-pub enum PointerSource {
-    Mouse,
-    /// Represents a touch event.
-    ///
-    /// Every time the user touches the screen, a [`WindowEvent::PointerEntered`] and a
-    /// [`WindowEvent::PointerButton`] with [`ElementState::Pressed`] event with an unique
-    /// identifier for the finger is emitted. When a finger is lifted, a
-    /// [`WindowEvent::PointerButton`] with [`ElementState::Released`] and a
-    /// [`WindowEvent::PointerLeft`] event is generated with the same [`FingerId`].
-    ///
-    /// After a [`WindowEvent::PointerEntered`] event has been emitted, there may be zero or more
-    /// [`WindowEvent::PointerMoved`] events when the finger is moved or the touch pressure
-    /// changes.
-    ///
-    /// A [`WindowEvent::PointerLeft`] without a [`WindowEvent::PointerButton`] with
-    /// [`ElementState::Released`] event is emitted when the system has canceled tracking this
-    /// touch, such as when the window loses focus, or on mobile devices if the user moves the
-    /// device against their face.
-    ///
-    /// The [`FingerId`] may be reused by the system after a [`WindowEvent::PointerLeft`] event.
-    /// The user should assume that a new [`WindowEvent::PointerEntered`] event received with the
-    /// same ID has nothing to do with the old finger and is a new finger.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **macOS:** Unsupported.
-    Touch {
-        finger_id: FingerId,
-
-        /// Describes how hard the screen was pressed. May be [`None`] if the hardware does not
-        /// support pressure sensitivity.
-        ///
-        /// ## Platform-specific
-        ///
-        /// - **MacOS / Orbital / Wayland / X11:** Always emits [`None`].
-        /// - **Android:** Will never be [`None`]. If the device doesn't support pressure
-        ///   sensitivity, force will either be 0.0 or 1.0. Also see the
-        ///   [android documentation](https://developer.android.com/reference/android/view/MotionEvent#AXIS_PRESSURE).#[derive(Debug, Clone, Copy, PartialEq)]
-        /// - **Web:** Will never be [`None`]. If the device doesn't support pressure sensitivity,
-        ///   force will be 0.5 when a button is pressed or 0.0 otherwise.
-        force: Option<Force>,
-    },
-    Unknown,
-}
-
-impl From<PointerSource> for PointerKind {
-    fn from(source: PointerSource) -> Self {
-        match source {
-            PointerSource::Mouse => Self::Mouse,
-            PointerSource::Touch { finger_id, .. } => Self::Touch(finger_id),
-            PointerSource::Unknown => Self::Unknown,
-        }
-    }
-}
-
-/// Represents the pointer type of a [`WindowEvent::PointerButton`].
-///
-/// **Wayland/X11:** [`Unknown`](Self::Unknown) device types are converted to known variants by the
-/// system.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ButtonSource {
-    Mouse(MouseButton),
-    /// See [`PointerSource::Touch`] for more details.
-    ///
-    /// ## Platform-specific
-    ///
-    /// **macOS:** Unsupported.
-    Touch {
-        finger_id: FingerId,
-        force: Option<Force>,
-    },
-    Unknown(u16),
-}
-
-impl ButtonSource {
-    /// Convert any [`ButtonSource`] to an equivalent [`MouseButton`]. If a pointer type has no
-    /// special handling in an application, this method can be used to handle it like any generic
-    /// mouse input.
-    pub fn mouse_button(self) -> MouseButton {
-        match self {
-            ButtonSource::Mouse(mouse) => mouse,
-            ButtonSource::Touch { .. } => MouseButton::Left,
-            ButtonSource::Unknown(button) => match button {
-                0 => MouseButton::Left,
-                1 => MouseButton::Middle,
-                2 => MouseButton::Right,
-                3 => MouseButton::Back,
-                4 => MouseButton::Forward,
-                _ => MouseButton::Other(button),
-            },
-        }
-    }
-}
-
-impl From<MouseButton> for ButtonSource {
-    fn from(mouse: MouseButton) -> Self {
-        Self::Mouse(mouse)
-    }
-}
-
 /// Identifier of an input device.
 ///
 /// Whenever you receive an event arising from a particular input device, this event contains a
@@ -614,23 +437,24 @@ impl From<MouseButton> for ButtonSource {
 /// on-screen cursor and keyboard focus) or physical. Virtual devices typically aggregate inputs
 /// from multiple physical devices.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct DeviceId(i64);
+pub struct DeviceId(pub(crate) platform_impl::DeviceId);
+
+impl Default for DeviceId {
+    fn default() -> Self {
+        Self::dummy()
+    }
+}

 impl DeviceId {
-    /// Convert the [`DeviceId`] into the underlying integer.
+    /// Returns a dummy id, useful for unit testing.
    ///
-    /// This is useful if you need to pass the ID across an FFI boundary, or store it in an atomic.
-    #[allow(dead_code)]
-    pub(crate) const fn into_raw(self) -> i64 {
-        self.0
-    }
-
-    /// Construct a [`DeviceId`] from the underlying integer.
+    /// # Notes
    ///
-    /// This should only be called with integers returned from [`DeviceId::into_raw`].
-    #[allow(dead_code)]
-    pub(crate) const fn from_raw(id: i64) -> Self {
-        Self(id)
+    /// The only guarantee made about the return value of this function is that
+    /// it will always be equal to itself and to future values returned by this function.
+    /// No other guarantees are made. This may be equal to a real `DeviceId`.
+    pub const fn dummy() -> Self {
+        DeviceId(platform_impl::DeviceId::dummy())
    }
 }

@@ -639,23 +463,18 @@ impl DeviceId {
 /// Whenever a touch event is received it contains a `FingerId` which uniquely identifies the finger
 /// used for the current interaction.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FingerId(pub(crate) usize);
+pub struct FingerId(pub(crate) platform_impl::FingerId);

 impl FingerId {
-    /// Convert the [`FingerId`] into the underlying integer.
+    /// Returns a dummy id, useful for unit testing.
    ///
-    /// This is useful if you need to pass the ID across an FFI boundary, or store it in an atomic.
-    #[allow(dead_code)]
-    pub(crate) const fn into_raw(self) -> usize {
-        self.0
-    }
-
-    /// Construct a [`FingerId`] from the underlying integer.
+    /// # Notes
    ///
-    /// This should only be called with integers returned from [`FingerId::into_raw`].
-    #[allow(dead_code)]
-    pub(crate) const fn from_raw(id: usize) -> Self {
-        Self(id)
+    /// The only guarantee made about the return value of this function is that
+    /// it will always be equal to itself and to future values returned by this function.
+    /// No other guarantees are made. This may be equal to a real `FingerId`.
+    pub const fn dummy() -> Self {
+        FingerId(platform_impl::FingerId::dummy())
    }
 }

@@ -664,7 +483,7 @@ impl FingerId {
 /// Useful for interactions that diverge significantly from a conventional 2D GUI, such as 3D camera
 /// or first-person game controls. Many physical actions, such as mouse movement, can produce both
 /// device and window events. Because window events typically arise from virtual devices
-/// (corresponding to GUI pointers and keyboard focus) the device IDs may not match.
+/// (corresponding to GUI cursors and keyboard focus) the device IDs may not match.
 ///
 /// Note that these events are delivered regardless of input focus.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -672,7 +491,7 @@ pub enum DeviceEvent {
    /// Change in physical position of a pointing device.
    ///
    /// This represents raw, unfiltered physical motion. Not to be confused with
-    /// [`WindowEvent::PointerMoved`].
+    /// [`WindowEvent::CursorMoved`].
    ///
    /// ## Platform-specific
    ///
@@ -689,7 +508,7 @@ pub enum DeviceEvent {
    ///
    #[rustfmt::skip]
    /// [`CursorGrabMode::Locked`]: crate::window::CursorGrabMode::Locked
-    PointerMotion {
+    MouseMotion {
        /// (x, y) change in position in unspecified units.
        ///
        /// Different devices may use different units.
@@ -1018,6 +837,50 @@ pub enum TouchPhase {
    Cancelled,
 }

+/// Represents a touch event
+///
+/// Every time the user touches the screen, a new [`TouchPhase::Started`] event with an unique
+/// identifier for the finger is generated. When the finger is lifted, an [`TouchPhase::Ended`]
+/// event is generated with the same finger id.
+///
+/// After a `Started` event has been emitted, there may be zero or more `Move`
+/// events when the finger is moved or the touch pressure changes.
+///
+/// The finger id may be reused by the system after an `Ended` event. The user
+/// should assume that a new `Started` event received with the same id has nothing
+/// to do with the old finger and is a new finger.
+///
+/// A [`TouchPhase::Cancelled`] event is emitted when the system has canceled tracking this
+/// touch, such as when the window loses focus, or on iOS if the user moves the
+/// device against their face.
+///
+/// ## Platform-specific
+///
+/// - **Web:** Doesn't take into account CSS [`border`], [`padding`], or [`transform`].
+/// - **macOS:** Unsupported.
+///
+/// [`border`]: https://developer.mozilla.org/en-US/docs/Web/CSS/border
+/// [`padding`]: https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+/// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Touch {
+    pub device_id: DeviceId,
+    pub phase: TouchPhase,
+    pub location: PhysicalPosition<f64>,
+    /// Describes how hard the screen was pressed. May be `None` if the platform
+    /// does not support pressure sensitivity.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - Only available on **iOS** 9.0+, **Windows** 8+, **Web**, and **Android**.
+    /// - **Android**: This will never be [None]. If the device doesn't support pressure
+    ///   sensitivity, force will either be 0.0 or 1.0. Also see the
+    ///   [android documentation](https://developer.android.com/reference/android/view/MotionEvent#AXIS_PRESSURE).
+    pub force: Option<Force>,
+    /// Unique identifier of a finger.
+    pub finger_id: FingerId,
+}
+
 /// Describes the force of a touch event
 #[derive(Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -1038,6 +901,12 @@ pub enum Force {
        /// The value of this field is sufficiently high to provide a wide
        /// dynamic range for values of the `force` field.
        max_possible_force: f64,
+        /// The altitude (in radians) of the stylus.
+        ///
+        /// A value of 0 radians indicates that the stylus is parallel to the
+        /// surface. The value of this property is Pi/2 when the stylus is
+        /// perpendicular to the surface.
+        altitude_angle: Option<f64>,
    },
    /// If the platform reports the force as normalized, we have no way of
    /// knowing how much pressure 1.0 corresponds to – we know it's the maximum
@@ -1054,7 +923,13 @@ impl Force {
    /// consistent across devices.
    pub fn normalized(&self) -> f64 {
        match self {
-            Force::Calibrated { force, max_possible_force } => force / max_possible_force,
+            Force::Calibrated { force, max_possible_force, altitude_angle } => {
+                let force = match altitude_angle {
+                    Some(altitude_angle) => force / altitude_angle.sin(),
+                    None => *force,
+                };
+                force / max_possible_force
+            },
            Force::Normalized(force) => *force,
        }
    }
@@ -1170,18 +1045,18 @@ mod tests {
        ($closure:expr) => {{
            #[allow(unused_mut)]
            let mut x = $closure;
-            let fid = event::FingerId::from_raw(0);
+            let did = event::DeviceId::dummy();
+            let fid = event::FingerId::dummy();

            #[allow(deprecated)]
            {
                use crate::event::Event::*;
                use crate::event::Ime::Enabled;
                use crate::event::WindowEvent::*;
-                use crate::event::{PointerKind, PointerSource};
                use crate::window::WindowId;

                // Mainline events.
-                let wid = WindowId::from_raw(0);
+                let wid = WindowId::dummy();
                x(NewEvents(event::StartCause::Init));
                x(AboutToWait);
                x(LoopExiting);
@@ -1200,64 +1075,44 @@ mod tests {
                with_window_event(HoveredFile("x.txt".into()));
                with_window_event(HoveredFileCancelled);
                with_window_event(Ime(Enabled));
-                with_window_event(PointerMoved {
-                    device_id: None,
-                    primary: true,
-                    position: (0, 0).into(),
-                    source: PointerSource::Mouse,
-                });
+                with_window_event(CursorMoved { device_id: did, position: (0, 0).into() });
                with_window_event(ModifiersChanged(event::Modifiers::default()));
-                with_window_event(PointerEntered {
-                    device_id: None,
-                    primary: true,
-                    position: (0, 0).into(),
-                    kind: PointerKind::Mouse,
-                });
-                with_window_event(PointerLeft {
-                    primary: true,
-                    device_id: None,
-                    position: Some((0, 0).into()),
-                    kind: PointerKind::Mouse,
-                });
+                with_window_event(CursorEntered { device_id: did });
+                with_window_event(CursorLeft { device_id: did });
                with_window_event(MouseWheel {
-                    device_id: None,
+                    device_id: did,
                    delta: event::MouseScrollDelta::LineDelta(0.0, 0.0),
                    phase: event::TouchPhase::Started,
                });
-                with_window_event(PointerButton {
-                    device_id: None,
-                    primary: true,
+                with_window_event(MouseInput {
+                    device_id: did,
                    state: event::ElementState::Pressed,
-                    position: (0, 0).into(),
-                    button: event::MouseButton::Other(0).into(),
-                });
-                with_window_event(PointerButton {
-                    device_id: None,
-                    primary: true,
-                    state: event::ElementState::Released,
-                    position: (0, 0).into(),
-                    button: event::ButtonSource::Touch {
-                        finger_id: fid,
-                        force: Some(event::Force::Normalized(0.0)),
-                    },
+                    button: event::MouseButton::Other(0),
                });
                with_window_event(PinchGesture {
-                    device_id: None,
+                    device_id: did,
                    delta: 0.0,
                    phase: event::TouchPhase::Started,
                });
-                with_window_event(DoubleTapGesture { device_id: None });
+                with_window_event(DoubleTapGesture { device_id: did });
                with_window_event(RotationGesture {
-                    device_id: None,
+                    device_id: did,
                    delta: 0.0,
                    phase: event::TouchPhase::Started,
                });
                with_window_event(PanGesture {
-                    device_id: None,
+                    device_id: did,
                    delta: PhysicalPosition::<f32>::new(0.0, 0.0),
                    phase: event::TouchPhase::Started,
                });
-                with_window_event(TouchpadPressure { device_id: None, pressure: 0.0, stage: 0 });
+                with_window_event(TouchpadPressure { device_id: did, pressure: 0.0, stage: 0 });
+                with_window_event(Touch(event::Touch {
+                    device_id: did,
+                    phase: event::TouchPhase::Started,
+                    location: (0.0, 0.0).into(),
+                    finger_id: fid,
+                    force: Some(event::Force::Normalized(0.0)),
+                }));
                with_window_event(ThemeChanged(crate::window::Theme::Light));
                with_window_event(Occluded(true));
            }
@@ -1267,9 +1122,9 @@ mod tests {
                use event::DeviceEvent::*;

                let with_device_event =
-                    |dev_ev| x(event::Event::DeviceEvent { device_id: None, event: dev_ev });
+                    |dev_ev| x(event::Event::DeviceEvent { device_id: did, event: dev_ev });

-                with_device_event(PointerMotion { delta: (0.0, 0.0).into() });
+                with_device_event(MouseMotion { delta: (0.0, 0.0).into() });
                with_device_event(MouseWheel {
                    delta: event::MouseScrollDelta::LineDelta(0.0, 0.0),
                });
@@ -1292,10 +1147,15 @@ mod tests {
        let force = event::Force::Normalized(0.0);
        assert_eq!(force.normalized(), 0.0);

-        let force2 = event::Force::Calibrated { force: 5.0, max_possible_force: 2.5 };
+        let force2 =
+            event::Force::Calibrated { force: 5.0, max_possible_force: 2.5, altitude_angle: None };
        assert_eq!(force2.normalized(), 2.0);

-        let force3 = event::Force::Calibrated { force: 5.0, max_possible_force: 2.5 };
+        let force3 = event::Force::Calibrated {
+            force: 5.0,
+            max_possible_force: 2.5,
+            altitude_angle: Some(std::f64::consts::PI / 2.0),
+        };
        assert_eq!(force3.normalized(), 2.0);
    }

@@ -1303,22 +1163,33 @@ mod tests {
    #[test]
    fn ensure_attrs_do_not_panic() {
        foreach_event!(|event: event::Event| {
-            let _ = format!("{event:?}");
+            let _ = format!("{:?}", event);
        });
        let _ = event::StartCause::Init.clone();

-        let fid = crate::event::FingerId::from_raw(0).clone();
-        HashSet::new().insert(fid);
-        let mut set = [fid, fid, fid];
+        let did = crate::event::DeviceId::dummy().clone();
+        let fid = crate::event::FingerId::dummy().clone();
+        HashSet::new().insert(did);
+        let mut set = [did, did, did];
        set.sort_unstable();
        let mut set2 = BTreeSet::new();
-        set2.insert(fid);
-        set2.insert(fid);
+        set2.insert(did);
+        set2.insert(did);

        HashSet::new().insert(event::TouchPhase::Started.clone());
        HashSet::new().insert(event::MouseButton::Left.clone());
        HashSet::new().insert(event::Ime::Enabled);

-        let _ = event::Force::Calibrated { force: 0.0, max_possible_force: 0.0 }.clone();
+        let _ = event::Touch {
+            device_id: did,
+            phase: event::TouchPhase::Started,
+            location: (0.0, 0.0).into(),
+            finger_id: fid,
+            force: Some(event::Force::Normalized(0.0)),
+        }
+        .clone();
+        let _ =
+            event::Force::Calibrated { force: 0.0, max_possible_force: 0.0, altitude_angle: None }
+                .clone();
    }
 }
--- a/src/event_loop.rs
+++ b/src/event_loop.rs
@@ -13,11 +13,9 @@ use std::marker::PhantomData;
 #[cfg(any(x11_platform, wayland_platform))]
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::sync::Arc;
 #[cfg(not(web_platform))]
 use std::time::{Duration, Instant};

-use rwh_06::{DisplayHandle, HandleError, HasDisplayHandle};
 #[cfg(web_platform)]
 use web_time::{Duration, Instant};

@@ -74,7 +72,7 @@ impl EventLoopBuilder {
    /// Attempting to create the event loop off the main thread will panic. This
    /// restriction isn't strictly necessary on all platforms, but is imposed to
    /// eliminate any nasty surprises when porting to platforms that require it.
-    /// `EventLoopBuilderExt::with_any_thread` functions are exposed in the relevant
+    /// `EventLoopBuilderExt::any_thread` functions are exposed in the relevant
    /// [`platform`] module if the target platform supports creating an event
    /// loop on any thread.
    ///
@@ -150,11 +148,12 @@ pub enum ControlFlow {
    /// 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.
+    /// Useful for implementing efficient timers, but should not be relied on for real-time needs
+    /// like rendering (VSync) or audio. Applications which want to render at the display's native
+    /// refresh rate should instead issue a [`Window::request_redraw`] at the end of
+    /// [`WindowEvent::RedrawRequested`].
    ///
-    /// [`Poll`]: Self::Poll
+    /// [`WindowEvent::RedrawRequested`]: crate::event::WindowEvent::RedrawRequested
    WaitUntil(Instant),
 }

@@ -275,9 +274,10 @@ impl EventLoop {
    }
 }

-impl HasDisplayHandle for EventLoop {
-    fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
-        HasDisplayHandle::display_handle(self.event_loop.window_target().rwh_06_handle())
+#[cfg(feature = "rwh_06")]
+impl rwh_06::HasDisplayHandle for EventLoop {
+    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
+        rwh_06::HasDisplayHandle::display_handle(self.event_loop.window_target().rwh_06_handle())
    }
 }

@@ -408,18 +408,20 @@ pub trait ActiveEventLoop: AsAny {
    fn owned_display_handle(&self) -> OwnedDisplayHandle;

    /// Get the raw-window-handle handle.
-    fn rwh_06_handle(&self) -> &dyn HasDisplayHandle;
+    #[cfg(feature = "rwh_06")]
+    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle;
 }

-impl HasDisplayHandle for dyn ActiveEventLoop + '_ {
-    fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
+#[cfg(feature = "rwh_06")]
+impl rwh_06::HasDisplayHandle for dyn ActiveEventLoop + '_ {
+    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        self.rwh_06_handle().display_handle()
    }
 }

 /// A proxy for the underlying display handle.
 ///
-/// The purpose of this type is to provide a cheaply cloneable handle to the underlying
+/// The purpose of this type is to provide a cheaply clonable handle to the underlying
 /// display handle. This is often used by graphics APIs to connect to the underlying APIs.
 /// It is difficult to keep a handle to the [`EventLoop`] type or the [`ActiveEventLoop`]
 /// type. In contrast, this type involves no lifetimes and can be persisted for as long as
@@ -429,55 +431,36 @@ impl HasDisplayHandle for dyn ActiveEventLoop + '_ {
 ///
 /// - A zero-sized type that is likely optimized out.
 /// - A reference-counted pointer to the underlying type.
-#[derive(Clone)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct OwnedDisplayHandle {
-    pub(crate) handle: Arc<dyn HasDisplayHandle>,
-}
-
-impl OwnedDisplayHandle {
-    pub(crate) fn new(handle: Arc<dyn HasDisplayHandle>) -> Self {
-        Self { handle }
-    }
-}
-
-impl HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<DisplayHandle<'_>, HandleError> {
-        self.handle.display_handle()
-    }
+    #[cfg_attr(not(feature = "rwh_06"), allow(dead_code))]
+    pub(crate) platform: platform_impl::OwnedDisplayHandle,
 }

 impl fmt::Debug for OwnedDisplayHandle {
+    #[inline]
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        f.debug_struct("OwnedDisplayHandle").finish_non_exhaustive()
    }
 }

-impl PartialEq for OwnedDisplayHandle {
-    fn eq(&self, other: &Self) -> bool {
-        match (self.display_handle(), other.display_handle()) {
-            (Ok(lhs), Ok(rhs)) => lhs == rhs,
-            _ => false,
-        }
+#[cfg(feature = "rwh_06")]
+impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
+    #[inline]
+    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
+        let raw = self.platform.raw_display_handle_rwh_06()?;
+
+        // SAFETY: The underlying display handle should be safe.
+        let handle = unsafe { rwh_06::DisplayHandle::borrow_raw(raw) };
+
+        Ok(handle)
    }
 }

-impl Eq for OwnedDisplayHandle {}
-
-pub(crate) trait EventLoopProxyProvider: Send + Sync {
-    /// See [`EventLoopProxy::wake_up`] for details.
-    fn wake_up(&self);
-}
-
 /// Control the [`EventLoop`], possibly from a different thread, without referencing it directly.
 #[derive(Clone)]
 pub struct EventLoopProxy {
-    pub(crate) proxy: Arc<dyn EventLoopProxyProvider>,
-}
-
-impl fmt::Debug for EventLoopProxy {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("EventLoopProxy").finish_non_exhaustive()
-    }
+    pub(crate) event_loop_proxy: platform_impl::EventLoopProxy,
 }

 impl EventLoopProxy {
@@ -497,11 +480,13 @@ impl EventLoopProxy {
    ///
    /// [#3687]: https://github.com/rust-windowing/winit/pull/3687
    pub fn wake_up(&self) {
-        self.proxy.wake_up();
+        self.event_loop_proxy.wake_up();
    }
+}

-    pub(crate) fn new(proxy: Arc<dyn EventLoopProxyProvider>) -> Self {
-        Self { proxy }
+impl fmt::Debug for EventLoopProxy {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("ActiveEventLoop").finish_non_exhaustive()
    }
 }

--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,12 +7,7 @@
 //!
 //! ```no_run
 //! use winit::event_loop::EventLoop;
-//!
-//! # // Intentionally use `fn main` for clarity
-//! fn main() {
-//!     let event_loop = EventLoop::new().unwrap();
-//!     // ...
-//! }
+//! let event_loop = EventLoop::new().unwrap();
 //! ```
 //!
 //! Then you create a [`Window`] with [`create_window`].
@@ -88,22 +83,19 @@
 //!     }
 //! }
 //!
-//! # // Intentionally use `fn main` for clarity
-//! fn main() {
-//!     let event_loop = EventLoop::new().unwrap();
+//! let event_loop = EventLoop::new().unwrap();
 //!
-//!     // ControlFlow::Poll continuously runs the event loop, even if the OS hasn't
-//!     // dispatched any events. This is ideal for games and similar applications.
-//!     event_loop.set_control_flow(ControlFlow::Poll);
+//! // ControlFlow::Poll continuously runs the event loop, even if the OS hasn't
+//! // dispatched any events. This is ideal for games and similar applications.
+//! event_loop.set_control_flow(ControlFlow::Poll);
 //!
-//!     // ControlFlow::Wait pauses the event loop if no events are available to process.
-//!     // This is ideal for non-game applications that only update in response to user
-//!     // input, and uses significantly less power/CPU time than ControlFlow::Poll.
-//!     event_loop.set_control_flow(ControlFlow::Wait);
+//! // ControlFlow::Wait pauses the event loop if no events are available to process.
+//! // This is ideal for non-game applications that only update in response to user
+//! // input, and uses significantly less power/CPU time than ControlFlow::Poll.
+//! event_loop.set_control_flow(ControlFlow::Wait);
 //!
-//!     let mut app = App::default();
-//!     event_loop.run_app(&mut app);
-//! }
+//! let mut app = App::default();
+//! event_loop.run_app(&mut app);
 //! ```
 //!
 //! [`WindowEvent`] has a [`WindowId`] member. In multi-window environments, it should be
@@ -123,45 +115,6 @@
 //! [`visible` set to `false`][crate::window::WindowAttributes::with_visible] and explicitly make
 //! the window visible only once you're ready to render into it.
 //!
-//! There is another important concept you need to know about when drawing: the "safe area". This
-//! can be accessed with [`Window::safe_area`], and describes a rectangle in the surface that is not
-//! obscured by notches, the status bar, and so on. You should be drawing your background and
-//! non-important content on the entire surface, but restrict important content (such as
-//! interactable UIs, text, etc.) to only being drawn inside the safe area.
-//!
-//! [`Window::safe_area`]: crate::window::Window::safe_area
-//!
-//! # Coordinate systems
-//!
-//! Windowing systems use many different coordinate systems, and this is reflected in Winit as well;
-//! there are "desktop coordinates", which is the coordinates of a window or monitor relative to the
-//! desktop at large, "window coordinates" which is the coordinates of the surface, relative to the
-//! window, and finally "surface coordinates", which is the coordinates relative to the drawn
-//! surface. All of these coordinates are relative to the top-left corner of their respective
-//! origin.
-//!
-//! Most of the functionality in Winit works with surface coordinates, so usually you only need to
-//! concern yourself with those. In case you need to convert to some other coordinate system, Winit
-//! provides [`Window::surface_position`] and [`Window::surface_size`] to describe the surface's
-//! location in window coordinates, and Winit provides [`Window::outer_position`] and
-//! [`Window::outer_size`] to describe the window's location in desktop coordinates. Using these
-//! methods, you should be able to convert a position in one coordinate system to another.
-//!
-//! An overview of how these four methods fit together can be seen in the image below:
-#![doc = concat!("\n\n", include_str!("../docs/res/coordinate-systems-desktop.svg"), "\n\n")] // Rustfmt removes \n, adding them like this works around that.
-//! On mobile, the situation is usually a bit different; because of the smaller screen space,
-//! windows usually fill the whole screen at a time, and as such there is _rarely_ a difference
-//! between these three coordinate systems, although you should still strive to handle this, as
-//! they're still relevant in more niche area such as Mac Catalyst, or multi-tasking on tablets.
-//!
-//! This is illustrated in the image below, along with the safe area since it's often relevant on
-//! mobile.
-#![doc = concat!("\n\n", include_str!("../docs/res/coordinate-systems-mobile.svg"), "\n\n")] // Rustfmt removes \n, adding them like this works around that.
-//! [`Window::surface_position`]: crate::window::Window::surface_position
-//! [`Window::surface_size`]: crate::window::Window::surface_size
-//! [`Window::outer_position`]: crate::window::Window::outer_position
-//! [`Window::outer_size`]: crate::window::Window::outer_size
-//!
 //! # UI scaling
 //!
 //! UI scaling is important, go read the docs for the [`dpi`] crate for an
@@ -194,62 +147,6 @@
 //! See the [`platform`] module for documentation on platform-specific cargo
 //! features.
 //!
-//! # Platform/Architecture Support
-//!
-//! Platform support on `winit` has two tiers: Tier 1 and Tier 2.
-//!
-//! - Tier 1 is **guaranteed to work**. Targets in this tier are actively tested both in CI and by
-//!   maintainers.
-//! - Tier 2 is **guaranteed to build**. Code compilation is tested in CI, but deeper testing is not
-//!   done.
-//!
-//! Please open an issue if you would like to add a Tier 2 target, or if you would
-//! like a Tier 2 target moved to Tier 1.
-//!
-//! ## Tier 1 Targets
-//!
-//! |Target Name                    |Target Triple                       |APIs           |
-//! |-------------------------------|------------------------------------|---------------|
-//! |32-Bit x86 Windows with MSVC   |`i686-pc-windows-msvc`              |Win32          |
-//! |64-Bit x86 Windows with MSVC   |`x86_64-pc-windows-msvc`            |Win32          |
-//! |32-Bit x86 Windows with glibc  |`i686-pc-windows-gnu`               |Win32          |
-//! |64-Bit x86 Windows with glibc  |`x86_64-pc-windows-gnu`             |Win32          |
-//! |32-Bit x86 Linux with glibc    |`i686-unknown-linux-gnu`            |X11, Wayland   |
-//! |64-Bit x86 Linux with glibc    |`x86_64-unknown-linux-gnu`          |X11, Wayland   |
-//! |64-Bit ARM Android             |`aarch64-linux-android`             |Android        |
-//! |64-Bit x86 Redox OS            |`x86_64-unknown-redox`              |Orbital        |
-//! |32-Bit x86 Redox OS            |`i686-unknown-redox`                |Orbital        |
-//! |64-Bit ARM Redox OS            |`aarch64-unknown-redox`             |Orbital        |
-//! |64-bit x64 macOS               |`x86_64-apple-darwin`               |AppKit         |
-//! |64-bit ARM macOS               |`aarch64-apple-darwin`              |AppKit         |
-//! |32-bit Wasm Web browser        |`wasm32-unknown-unknown`            |`wasm-bindgen` |
-//!
-//! ## Tier 2 Targets
-//!
-//! |Target Name                         |Target Triple                       |APIs           |
-//! |------------------------------------|------------------------------------|---------------|
-//! |64-Bit ARM Windows with MSVC        |`aarch64-pc-windows-msvc`           |Win32          |
-//! |32-Bit x86 Windows 7 with MSVC      |`i686-win7-windows-msvc`            |Win32          |
-//! |64-Bit x86 Windows 7 with MSVC      |`x86_64-win7-windows-msvc`          |Win32          |
-//! |64-bit x86 Linux with Musl          |`x86_64-unknown-linux-musl`         |X11, Wayland   |
-//! |64-bit x86 Linux with 32-bit glibc  |`x86_64-unknown-linux-gnux32`       |X11, Wayland   |
-//! |64-bit x86 Android                  |`x86_64-linux-android`              |Android        |
-//! |64-bit x64 iOS                      |`x86_64-apple-ios`                  |UIKit          |
-//! |64-bit ARM iOS                      |`aarch64-apple-ios`                 |UIKit          |
-//! |64-bit ARM Mac Catalyst             |`aarch64-apple-ios-macabi`          |UIKit          |
-//! |32-bit x86 Android                  |`i686-linux-android`                |Android        |
-//! |64-bit x86 FreeBSD                  |`x86_64-unknown-freebsd`            |X11, Wayland   |
-//! |64-bit x86 NetBSD                   |`x86_64-unknown-netbsd`             |X11            |
-//! |32-bit x86 Linux with Musl          |`i686-unknown-linux-musl`           |X11, Wayland   |
-//! |64-bit RISC-V Linux with glibc      |`riscv64gc-unknown-linux-gnu`       |X11, Wayland   |
-//! |64-bit ARM Linux with glibc         |`aarch64-unknown-linux-gnu`         |X11, Wayland   |
-//! |64-bit ARM Linux with Musl          |`aarch64-unknown-linux-musl`        |X11, Wayland   |
-//! |64-bit PowerPC Linux with glibc     |`powerpc64le-unknown-linux-gnu`     |X11, Wayland   |
-//! |32-Bit ARM Linux with glibc         |`armv5te-unknown-linux-gnueabi`     |X11, Wayland   |
-//! |64-Bit Linux on IBM Supercomputers  |`s390x-unknown-linux-gnu`           |X11, Wayland   |
-//! |32-bit ARM Android                  |`arm-linux-androideabi`             |Android        |
-//! |64-bit SPARC Linux with glibc       |`sparc64-unknown-linux-gnu`         |X11, Wayland   |
-//!
 //! [`EventLoop`]: event_loop::EventLoop
 //! [`EventLoop::new()`]: event_loop::EventLoop::new
 //! [`EventLoop::run_app()`]: event_loop::EventLoop::run_app
@@ -277,11 +174,11 @@
 // doc
 #![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg_hide), doc(cfg_hide(doc, docsrs)))]
 #![allow(clippy::missing_safety_doc)]
-#![warn(clippy::uninlined_format_args)]

 // Re-export DPI types so that users don't have to put it in Cargo.toml.
 #[doc(inline)]
 pub use dpi;
+#[cfg(feature = "rwh_06")]
 pub use rwh_06 as raw_window_handle;

 pub mod application;
--- a/src/monitor.rs
+++ b/src/monitor.rs
@@ -141,11 +141,8 @@ impl MonitorHandle {
        self.inner.name()
    }

-    /// Returns the top-left corner position of the monitor in desktop coordinates.
-    ///
-    /// This position is in the same coordinate system as [`Window::outer_position`].
-    ///
-    /// [`Window::outer_position`]: crate::window::Window::outer_position
+    /// Returns the top-left corner position of the monitor relative to the larger full
+    /// screen area.
    ///
    /// ## Platform-specific
    ///
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -75,10 +75,9 @@ use std::os::raw::c_void;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};

-use crate::application::ApplicationHandler;
 use crate::event_loop::{ActiveEventLoop, EventLoopBuilder};
 use crate::monitor::MonitorHandle;
-use crate::window::{Window, WindowAttributes, WindowId};
+use crate::window::{Window, WindowAttributes};

 /// Additional methods on [`Window`] that are specific to MacOS.
 pub trait WindowExtMacOS {
@@ -92,9 +91,6 @@ pub trait WindowExtMacOS {
    /// This is how fullscreen used to work on macOS in versions before Lion.
    /// And allows the user to have a fullscreen window without using another
    /// space or taking control over the entire monitor.
-    ///
-    /// Make sure you only draw your important content inside the safe area so that it does not
-    /// overlap with the notch on newer devices, see [`Window::safe_area`] for details.
    fn set_simple_fullscreen(&self, fullscreen: bool) -> bool;

    /// Returns whether or not the window has shadow.
@@ -160,13 +156,6 @@ pub trait WindowExtMacOS {

    /// Getter for the [`WindowExtMacOS::set_borderless_game`].
    fn is_borderless_game(&self) -> bool;
-
-    /// Makes the titlebar bigger, effectively adding more space around the
-    /// window controls if the titlebar is invisible.
-    fn set_unified_titlebar(&self, unified_titlebar: bool);
-
-    /// Getter for the [`WindowExtMacOS::set_unified_titlebar`].
-    fn unified_titlebar(&self) -> bool;
 }

 impl WindowExtMacOS for dyn Window + '_ {
@@ -265,18 +254,6 @@ impl WindowExtMacOS for dyn Window + '_ {
        let window = self.as_any().downcast_ref::<crate::platform_impl::Window>().unwrap();
        window.maybe_wait_on_main(|w| w.is_borderless_game())
    }
-
-    #[inline]
-    fn set_unified_titlebar(&self, unified_titlebar: bool) {
-        let window = self.as_any().downcast_ref::<crate::platform_impl::Window>().unwrap();
-        window.maybe_wait_on_main(|w| w.set_unified_titlebar(unified_titlebar))
-    }
-
-    #[inline]
-    fn unified_titlebar(&self) -> bool {
-        let window = self.as_any().downcast_ref::<crate::platform_impl::Window>().unwrap();
-        window.maybe_wait_on_main(|w| w.unified_titlebar())
-    }
 }

 /// Corresponds to `NSApplicationActivationPolicy`.
@@ -330,8 +307,6 @@ pub trait WindowAttributesExtMacOS {
    fn with_option_as_alt(self, option_as_alt: OptionAsAlt) -> Self;
    /// See [`WindowExtMacOS::set_borderless_game`] for details on what this means if set.
    fn with_borderless_game(self, borderless_game: bool) -> Self;
-    /// See [`WindowExtMacOS::set_unified_titlebar`] for details on what this means if set.
-    fn with_unified_titlebar(self, unified_titlebar: bool) -> Self;
 }

 impl WindowAttributesExtMacOS for WindowAttributes {
@@ -406,21 +381,12 @@ impl WindowAttributesExtMacOS for WindowAttributes {
        self.platform_specific.borderless_game = borderless_game;
        self
    }
-
-    #[inline]
-    fn with_unified_titlebar(mut self, unified_titlebar: bool) -> Self {
-        self.platform_specific.unified_titlebar = unified_titlebar;
-        self
-    }
 }

 pub trait EventLoopBuilderExtMacOS {
-    /// Sets the activation policy for the application. If used, this will override
-    /// any relevant settings provided in the package manifest.
-    /// For instance, `with_activation_policy(ActivationPolicy::Regular)` will prevent
-    /// the application from running as an "agent", even if LSUIElement is set to true.
+    /// Sets the activation policy for the application.
    ///
-    /// If unused, the Winit will honor the package manifest.
+    /// It is set to [`ActivationPolicy::Regular`] by default.
    ///
    /// # Example
    ///
@@ -472,7 +438,7 @@ pub trait EventLoopBuilderExtMacOS {
 impl EventLoopBuilderExtMacOS for EventLoopBuilder {
    #[inline]
    fn with_activation_policy(&mut self, activation_policy: ActivationPolicy) -> &mut Self {
-        self.platform_specific.activation_policy = Some(activation_policy);
+        self.platform_specific.activation_policy = activation_policy;
        self
    }

@@ -579,52 +545,3 @@ pub enum OptionAsAlt {
    #[default]
    None,
 }
-
-/// Additional events on [`ApplicationHandler`] that are specific to macOS.
-///
-/// This can be registered with [`ApplicationHandler::macos_handler`].
-pub trait ApplicationHandlerExtMacOS: ApplicationHandler {
-    /// The system interpreted a keypress as a standard key binding command.
-    ///
-    /// Examples include inserting tabs and newlines, or moving the insertion point, see
-    /// [`NSStandardKeyBindingResponding`] for the full list of key bindings. They are often text
-    /// editing related.
-    ///
-    /// This corresponds to the [`doCommandBySelector:`] method on `NSTextInputClient`.
-    ///
-    /// The `action` parameter contains the string representation of the selector. Examples include
-    /// `"insertBacktab:"`, `"indent:"` and `"noop:"`.
-    ///
-    /// # Example
-    ///
-    /// ```ignore
-    /// impl ApplicationHandlerExtMacOS for App {
-    ///     fn standard_key_binding(
-    ///         &mut self,
-    ///         event_loop: &dyn ActiveEventLoop,
-    ///         window_id: WindowId,
-    ///         action: &str,
-    ///     ) {
-    ///         match action {
-    ///             "moveBackward:" => self.cursor.position -= 1,
-    ///             "moveForward:" => self.cursor.position += 1,
-    ///             _ => {} // Ignore other actions
-    ///         }
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// [`NSStandardKeyBindingResponding`]: https://developer.apple.com/documentation/appkit/nsstandardkeybindingresponding?language=objc
-    /// [`doCommandBySelector:`]: https://developer.apple.com/documentation/appkit/nstextinputclient/1438256-docommandbyselector?language=objc
-    #[doc(alias = "doCommandBySelector:")]
-    fn standard_key_binding(
-        &mut self,
-        event_loop: &dyn ActiveEventLoop,
-        window_id: WindowId,
-        action: &str,
-    ) {
-        let _ = event_loop;
-        let _ = window_id;
-        let _ = action;
-    }
-}
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -21,7 +21,6 @@ pub mod windows;
 #[cfg(any(x11_platform, docsrs))]
 pub mod x11;

-#[allow(unused_imports)]
 #[cfg(any(
    windows_platform,
    macos_platform,
--- a/src/platform/web.rs
+++ b/src/platform/web.rs
@@ -29,16 +29,17 @@
 //! The following APIs can't take them into account and will therefore provide inaccurate results:
 //! - [`WindowEvent::SurfaceResized`] and [`Window::(set_)surface_size()`]
 //! - [`WindowEvent::Occluded`]
-//! - [`WindowEvent::PointerMoved`], [`WindowEvent::PointerEntered`] and
-//!   [`WindowEvent::PointerLeft`].
+//! - [`WindowEvent::CursorMoved`], [`WindowEvent::CursorEntered`], [`WindowEvent::CursorLeft`], and
+//!   [`WindowEvent::Touch`].
 //! - [`Window::set_outer_position()`]
 //!
 //! [`WindowEvent::SurfaceResized`]: crate::event::WindowEvent::SurfaceResized
 //! [`Window::(set_)surface_size()`]: crate::window::Window::surface_size
 //! [`WindowEvent::Occluded`]: crate::event::WindowEvent::Occluded
-//! [`WindowEvent::PointerMoved`]: crate::event::WindowEvent::PointerMoved
-//! [`WindowEvent::PointerEntered`]: crate::event::WindowEvent::PointerEntered
-//! [`WindowEvent::PointerLeft`]: crate::event::WindowEvent::PointerLeft
+//! [`WindowEvent::CursorMoved`]: crate::event::WindowEvent::CursorMoved
+//! [`WindowEvent::CursorEntered`]: crate::event::WindowEvent::CursorEntered
+//! [`WindowEvent::CursorLeft`]: crate::event::WindowEvent::CursorLeft
+//! [`WindowEvent::Touch`]: crate::event::WindowEvent::Touch
 //! [`Window::set_outer_position()`]: crate::window::Window::set_outer_position

 use std::cell::Ref;
@@ -57,6 +58,7 @@ use web_sys::HtmlCanvasElement;
 use crate::application::ApplicationHandler;
 use crate::cursor::CustomCursorSource;
 use crate::error::NotSupportedError;
+use crate::event::FingerId;
 use crate::event_loop::{ActiveEventLoop, EventLoop};
 use crate::monitor::MonitorHandle;
 use crate::platform_impl::PlatformCustomCursorSource;
@@ -779,3 +781,16 @@ impl Display for OrientationLockError {
 }

 impl Error for OrientationLockError {}
+
+/// Additional methods on [`FingerId`] that are specific to Web.
+pub trait FingerIdExtWeb {
+    /// Indicates if the finger represents the first contact in a multi-touch interaction.
+    #[allow(clippy::wrong_self_convention)]
+    fn is_primary(self) -> bool;
+}
+
+impl FingerIdExtWeb for FingerId {
+    fn is_primary(self) -> bool {
+        self.0.is_primary()
+    }
+}
--- a/src/platform/windows.rs
+++ b/src/platform/windows.rs
@@ -9,11 +9,9 @@ use std::path::Path;

 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
-#[cfg(windows_platform)]
-use windows_sys::Win32::Foundation::HANDLE;

 use crate::dpi::PhysicalSize;
-use crate::event::DeviceId;
+use crate::event::{DeviceId, FingerId};
 use crate::event_loop::EventLoopBuilder;
 use crate::monitor::MonitorHandle;
 use crate::window::{BadIcon, Icon, Window, WindowAttributes};
@@ -135,6 +133,7 @@ impl<W: Window> Deref for AnyThread<W> {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl<W: Window> rwh_06::HasWindowHandle for AnyThread<W> {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        // SAFETY: The top level user has asserted this is only used safely.
@@ -336,6 +335,7 @@ pub trait WindowExtWindows {
    /// });
    /// # }
    /// ```
+    #[cfg(feature = "rwh_06")]
    unsafe fn window_handle_any_thread(
        &self,
    ) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError>;
@@ -399,6 +399,7 @@ impl WindowExtWindows for dyn Window + '_ {
        window.set_corner_preference(preference)
    }

+    #[cfg(feature = "rwh_06")]
    unsafe fn window_handle_any_thread(
        &self,
    ) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
@@ -432,8 +433,16 @@ pub trait WindowBorrowExtWindows: Borrow<dyn Window> + Sized {
    /// Win32 APIs.
    ///
    /// [`Window`]: crate::window::Window
-    /// [`HasWindowHandle`]: rwh_06::HasWindowHandle
-    /// [`window_handle_any_thread`]: WindowExtWindows::window_handle_any_thread
+    #[cfg_attr(
+        feature = "rwh_06",
+        doc = "[`HasWindowHandle`]: rwh_06::HasWindowHandle",
+        doc = "[`window_handle_any_thread`]: WindowExtWindows::window_handle_any_thread"
+    )]
+    #[cfg_attr(
+        not(feature = "rwh_06"),
+        doc = "[`HasWindowHandle`]: #only-available-with-rwh_06",
+        doc = "[`window_handle_any_thread`]: #only-available-with-rwh_06"
+    )]
    unsafe fn any_thread(self) -> AnyThread<Self>
    where
        Self: Window,
@@ -647,15 +656,24 @@ pub trait DeviceIdExtWindows {
    fn persistent_identifier(&self) -> Option<String>;
 }

-#[cfg(windows_platform)]
 impl DeviceIdExtWindows for DeviceId {
+    #[inline]
    fn persistent_identifier(&self) -> Option<String> {
-        let raw_id = self.into_raw();
-        if raw_id != 0 {
-            crate::platform_impl::raw_input::get_raw_input_device_name(raw_id as HANDLE)
-        } else {
-            None
-        }
+        self.0.persistent_identifier()
+    }
+}
+
+/// Additional methods on `FingerId` that are specific to Windows.
+pub trait FingerIdExtWindows {
+    /// Indicates if the finger represents the first contact in a multi-touch interaction.
+    #[allow(clippy::wrong_self_convention)]
+    fn is_primary(self) -> bool;
+}
+
+impl FingerIdExtWindows for FingerId {
+    #[inline]
+    fn is_primary(self) -> bool {
+        self.0.is_primary()
    }
 }

--- a/src/platform/x11.rs
+++ b/src/platform/x11.rs
@@ -80,7 +80,9 @@ pub type XWindow = u32;
 #[inline]
 pub fn register_xlib_error_hook(hook: XlibErrorHook) {
    // Append new hook.
-    crate::platform_impl::XLIB_ERROR_HOOKS.lock().unwrap().push(hook);
+    unsafe {
+        crate::platform_impl::XLIB_ERROR_HOOKS.lock().unwrap().push(hook);
+    }
 }

 /// Additional methods on [`ActiveEventLoop`] that are specific to X11.
--- a/src/platform_impl/android/mod.rs
+++ b/src/platform_impl/android/mod.rs
@@ -13,20 +13,18 @@ use tracing::{debug, trace, warn};

 use crate::application::ApplicationHandler;
 use crate::cursor::Cursor;
-use crate::dpi::{PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{EventLoopError, NotSupportedError, RequestError};
-use crate::event::{self, DeviceId, FingerId, Force, StartCause, SurfaceSizeWriter};
+use crate::event::{self, Force, StartCause, SurfaceSizeWriter};
 use crate::event_loop::{
    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
+    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
 };
 use crate::monitor::MonitorHandle as RootMonitorHandle;
 use crate::platform::pump_events::PumpStatus;
 use crate::window::{
    self, CursorGrabMode, CustomCursor, CustomCursorSource, Fullscreen, ImePurpose,
-    ResizeDirection, Theme, Window as CoreWindow, WindowAttributes, WindowButtons, WindowId,
-    WindowLevel,
+    ResizeDirection, Theme, Window as CoreWindow, WindowAttributes, WindowButtons, WindowLevel,
 };

 mod keycodes;
@@ -108,7 +106,6 @@ pub struct EventLoop {
    running: bool,
    pending_redraw: bool,
    cause: StartCause,
-    primary_pointer: Option<FingerId>,
    ignore_volume_keys: bool,
    combining_accent: Option<char>,
 }
@@ -125,31 +122,26 @@ impl Default for PlatformSpecificEventLoopAttributes {
    }
 }

-// Android currently only supports one window
-const GLOBAL_WINDOW: WindowId = WindowId::from_raw(0);
-
 impl EventLoop {
    pub(crate) fn new(
        attributes: &PlatformSpecificEventLoopAttributes,
    ) -> Result<Self, EventLoopError> {
+        let proxy_wake_up = Arc::new(AtomicBool::new(false));
+
        let android_app = attributes.android_app.as_ref().expect(
            "An `AndroidApp` as passed to android_main() is required to create an `EventLoop` on \
             Android",
        );
-
-        let event_loop_proxy = Arc::new(EventLoopProxy::new(android_app.create_waker()));
-
        let redraw_flag = SharedFlag::new();

        Ok(Self {
            android_app: android_app.clone(),
-            primary_pointer: None,
            window_target: ActiveEventLoop {
                app: android_app.clone(),
                control_flow: Cell::new(ControlFlow::default()),
                exit: Cell::new(false),
                redraw_requester: RedrawRequester::new(&redraw_flag, android_app.create_waker()),
-                event_loop_proxy,
+                proxy_wake_up,
            },
            redraw_flag,
            loop_running: false,
@@ -195,19 +187,22 @@ impl EventLoop {
                },
                MainEvent::GainedFocus => {
                    HAS_FOCUS.store(true, Ordering::Relaxed);
+                    let window_id = window::WindowId(WindowId);
                    let event = event::WindowEvent::Focused(true);
-                    app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                    app.window_event(&self.window_target, window_id, event);
                },
                MainEvent::LostFocus => {
                    HAS_FOCUS.store(false, Ordering::Relaxed);
+                    let window_id = window::WindowId(WindowId);
                    let event = event::WindowEvent::Focused(false);
-                    app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                    app.window_event(&self.window_target, window_id, event);
                },
                MainEvent::ConfigChanged { .. } => {
                    let old_scale_factor = scale_factor(&self.android_app);
                    let scale_factor = scale_factor(&self.android_app);
                    if (scale_factor - old_scale_factor).abs() < f64::EPSILON {
                        let new_surface_size = Arc::new(Mutex::new(screen_size(&self.android_app)));
+                        let window_id = window::WindowId(WindowId);
                        let event = event::WindowEvent::ScaleFactorChanged {
                            surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(
                                &new_surface_size,
@@ -215,18 +210,18 @@ impl EventLoop {
                            scale_factor,
                        };

-                        app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                        app.window_event(&self.window_target, window_id, event);
                    }
                },
                MainEvent::LowMemory => {
                    app.memory_warning(&self.window_target);
                },
                MainEvent::Start => {
-                    app.resumed(self.window_target());
+                    // XXX: how to forward this state to applications?
+                    warn!("TODO: forward onStart notification to application");
                },
                MainEvent::Resume { .. } => {
                    debug!("App Resumed - is running");
-                    // TODO: This is incorrect - will be solved in https://github.com/rust-windowing/winit/pull/3897
                    self.running = true;
                },
                MainEvent::SaveState { .. } => {
@@ -236,11 +231,11 @@ impl EventLoop {
                },
                MainEvent::Pause => {
                    debug!("App Paused - stopped running");
-                    // TODO: This is incorrect - will be solved in https://github.com/rust-windowing/winit/pull/3897
                    self.running = false;
                },
                MainEvent::Stop => {
-                    app.suspended(self.window_target());
+                    // XXX: how to forward this state to applications?
+                    warn!("TODO: forward onStop notification to application");
                },
                MainEvent::Destroy => {
                    // XXX: maybe exit mainloop to drop things before being
@@ -278,7 +273,7 @@ impl EventLoop {
            },
        }

-        if self.window_target.event_loop_proxy.wake_up.swap(false, Ordering::Relaxed) {
+        if self.window_target.proxy_wake_up.swap(false, Ordering::Relaxed) {
            app.proxy_wake_up(&self.window_target);
        }

@@ -291,15 +286,17 @@ impl EventLoop {
                } else {
                    PhysicalSize::new(0, 0)
                };
+                let window_id = window::WindowId(WindowId);
                let event = event::WindowEvent::SurfaceResized(size);
-                app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                app.window_event(&self.window_target, window_id, event);
            }

            pending_redraw |= self.redraw_flag.get_and_reset();
            if pending_redraw {
                pending_redraw = false;
+                let window_id = window::WindowId(WindowId);
                let event = event::WindowEvent::RedrawRequested;
-                app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                app.window_event(&self.window_target, window_id, event);
            }
        }

@@ -318,131 +315,50 @@ impl EventLoop {
        let mut input_status = InputStatus::Handled;
        match event {
            InputEvent::MotionEvent(motion_event) => {
-                let device_id = Some(DeviceId::from_raw(motion_event.device_id() as i64));
-                let action = motion_event.action();
+                let window_id = window::WindowId(WindowId);
+                let device_id = event::DeviceId(DeviceId(motion_event.device_id()));

-                let pointers: Option<
-                    Box<dyn Iterator<Item = android_activity::input::Pointer<'_>>>,
-                > = match action {
-                    MotionAction::Down
-                    | MotionAction::PointerDown
-                    | MotionAction::Up
-                    | MotionAction::PointerUp => Some(Box::new(std::iter::once(
-                        motion_event.pointer_at_index(motion_event.pointer_index()),
-                    ))),
-                    MotionAction::Move | MotionAction::Cancel => {
-                        Some(Box::new(motion_event.pointers()))
+                let phase = match motion_event.action() {
+                    MotionAction::Down | MotionAction::PointerDown => {
+                        Some(event::TouchPhase::Started)
+                    },
+                    MotionAction::Up | MotionAction::PointerUp => Some(event::TouchPhase::Ended),
+                    MotionAction::Move => Some(event::TouchPhase::Moved),
+                    MotionAction::Cancel => Some(event::TouchPhase::Cancelled),
+                    _ => {
+                        None // TODO mouse events
                    },
-                    // TODO mouse events
-                    _ => None,
                };
+                if let Some(phase) = phase {
+                    let pointers: Box<dyn Iterator<Item = android_activity::input::Pointer<'_>>> =
+                        match phase {
+                            event::TouchPhase::Started | event::TouchPhase::Ended => {
+                                Box::new(std::iter::once(
+                                    motion_event.pointer_at_index(motion_event.pointer_index()),
+                                ))
+                            },
+                            event::TouchPhase::Moved | event::TouchPhase::Cancelled => {
+                                Box::new(motion_event.pointers())
+                            },
+                        };

-                for pointer in pointers.into_iter().flatten() {
-                    let tool_type = pointer.tool_type();
-                    let position = PhysicalPosition { x: pointer.x() as _, y: pointer.y() as _ };
-                    trace!(
-                        "Input event {device_id:?}, {action:?}, loc={position:?}, \
-                         pointer={pointer:?}, tool_type={tool_type:?}"
-                    );
-                    let finger_id = FingerId::from_raw(pointer.pointer_id() as usize);
-                    let force = Some(Force::Normalized(pointer.pressure() as f64));
+                    for pointer in pointers {
+                        let location =
+                            PhysicalPosition { x: pointer.x() as _, y: pointer.y() as _ };
+                        trace!(
+                            "Input event {device_id:?}, {phase:?}, loc={location:?}, \
+                             pointer={pointer:?}"
+                        );

-                    match action {
-                        MotionAction::Down | MotionAction::PointerDown => {
-                            let primary = action == MotionAction::Down;
-                            if primary {
-                                self.primary_pointer = Some(finger_id);
-                            }
-                            let event = event::WindowEvent::PointerEntered {
-                                device_id,
-                                primary,
-                                position,
-                                kind: match tool_type {
-                                    android_activity::input::ToolType::Finger => {
-                                        event::PointerKind::Touch(finger_id)
-                                    },
-                                    // TODO mouse events
-                                    android_activity::input::ToolType::Mouse => continue,
-                                    _ => event::PointerKind::Unknown,
-                                },
-                            };
-                            app.window_event(&self.window_target, GLOBAL_WINDOW, event);
-                            let event = event::WindowEvent::PointerButton {
-                                device_id,
-                                primary,
-                                state: event::ElementState::Pressed,
-                                position,
-                                button: match tool_type {
-                                    android_activity::input::ToolType::Finger => {
-                                        event::ButtonSource::Touch { finger_id, force }
-                                    },
-                                    // TODO mouse events
-                                    android_activity::input::ToolType::Mouse => continue,
-                                    _ => event::ButtonSource::Unknown(0),
-                                },
-                            };
-                            app.window_event(&self.window_target, GLOBAL_WINDOW, event);
-                        },
-                        MotionAction::Move => {
-                            let primary = self.primary_pointer == Some(finger_id);
-                            let event = event::WindowEvent::PointerMoved {
-                                device_id,
-                                primary,
-                                position,
-                                source: match tool_type {
-                                    android_activity::input::ToolType::Finger => {
-                                        event::PointerSource::Touch { finger_id, force }
-                                    },
-                                    // TODO mouse events
-                                    android_activity::input::ToolType::Mouse => continue,
-                                    _ => event::PointerSource::Unknown,
-                                },
-                            };
-                            app.window_event(&self.window_target, GLOBAL_WINDOW, event);
-                        },
-                        MotionAction::Up | MotionAction::PointerUp | MotionAction::Cancel => {
-                            let primary = action == MotionAction::Up
-                                || (action == MotionAction::Cancel
-                                    && self.primary_pointer == Some(finger_id));
+                        let event = event::WindowEvent::Touch(event::Touch {
+                            device_id,
+                            phase,
+                            location,
+                            finger_id: event::FingerId(FingerId(pointer.pointer_id())),
+                            force: Some(Force::Normalized(pointer.pressure() as f64)),
+                        });

-                            if primary {
-                                self.primary_pointer = None;
-                            }
-
-                            if let MotionAction::Up | MotionAction::PointerUp = action {
-                                let event = event::WindowEvent::PointerButton {
-                                    device_id,
-                                    primary,
-                                    state: event::ElementState::Released,
-                                    position,
-                                    button: match tool_type {
-                                        android_activity::input::ToolType::Finger => {
-                                            event::ButtonSource::Touch { finger_id, force }
-                                        },
-                                        // TODO mouse events
-                                        android_activity::input::ToolType::Mouse => continue,
-                                        _ => event::ButtonSource::Unknown(0),
-                                    },
-                                };
-                                app.window_event(&self.window_target, GLOBAL_WINDOW, event);
-                            }
-
-                            let event = event::WindowEvent::PointerLeft {
-                                device_id,
-                                primary,
-                                position: Some(position),
-                                kind: match tool_type {
-                                    android_activity::input::ToolType::Finger => {
-                                        event::PointerKind::Touch(finger_id)
-                                    },
-                                    // TODO mouse events
-                                    android_activity::input::ToolType::Mouse => continue,
-                                    _ => event::PointerKind::Unknown,
-                                },
-                            };
-                            app.window_event(&self.window_target, GLOBAL_WINDOW, event);
-                        },
-                        _ => unreachable!(),
+                        app.window_event(&self.window_target, window_id, event);
                    }
                }
            },
@@ -470,8 +386,9 @@ impl EventLoop {
                            &mut self.combining_accent,
                        );

+                        let window_id = window::WindowId(WindowId);
                        let event = event::WindowEvent::KeyboardInput {
-                            device_id: Some(DeviceId::from_raw(key.device_id() as i64)),
+                            device_id: event::DeviceId(DeviceId(key.device_id())),
                            event: event::KeyEvent {
                                state,
                                physical_key: keycodes::to_physical_key(keycode),
@@ -484,7 +401,7 @@ impl EventLoop {
                            is_synthetic: false,
                        };

-                        app.window_event(&self.window_target, GLOBAL_WINDOW, event);
+                        app.window_event(&self.window_target, window_id, event);
                    },
                }
            },
@@ -564,8 +481,7 @@ impl EventLoop {
        self.pending_redraw |= self.redraw_flag.get_and_reset();

        timeout = if self.running
-            && (self.pending_redraw
-                || self.window_target.event_loop_proxy.wake_up.load(Ordering::Relaxed))
+            && (self.pending_redraw || self.window_target.proxy_wake_up.load(Ordering::Relaxed))
        {
            // If we already have work to do then we don't want to block on the next poll
            Some(Duration::ZERO)
@@ -598,7 +514,7 @@ impl EventLoop {
                    self.pending_redraw |= self.redraw_flag.get_and_reset();
                    if !self.running
                        || (!self.pending_redraw
-                            && !self.window_target.event_loop_proxy.wake_up.load(Ordering::Relaxed))
+                            && !self.window_target.proxy_wake_up.load(Ordering::Relaxed))
                    {
                        return;
                    }
@@ -637,20 +553,15 @@ impl EventLoop {
    }
 }

+#[derive(Clone)]
 pub struct EventLoopProxy {
-    wake_up: AtomicBool,
+    proxy_wake_up: Arc<AtomicBool>,
    waker: AndroidAppWaker,
 }

 impl EventLoopProxy {
-    fn new(waker: AndroidAppWaker) -> Self {
-        Self { wake_up: AtomicBool::new(false), waker }
-    }
-}
-
-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.wake_up.store(true, Ordering::Relaxed);
+    pub fn wake_up(&self) {
+        self.proxy_wake_up.store(true, Ordering::Relaxed);
        self.waker.wake();
    }
 }
@@ -660,7 +571,7 @@ pub struct ActiveEventLoop {
    control_flow: Cell<ControlFlow>,
    exit: Cell<bool>,
    redraw_requester: RedrawRequester,
-    event_loop_proxy: Arc<EventLoopProxy>,
+    proxy_wake_up: Arc<AtomicBool>,
 }

 impl ActiveEventLoop {
@@ -670,8 +581,12 @@ impl ActiveEventLoop {
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        CoreEventLoopProxy::new(self.event_loop_proxy.clone())
+    fn create_proxy(&self) -> RootEventLoopProxy {
+        let event_loop_proxy = EventLoopProxy {
+            proxy_wake_up: self.proxy_wake_up.clone(),
+            waker: self.app.create_waker(),
+        };
+        RootEventLoopProxy { event_loop_proxy }
    }

    fn create_window(
@@ -718,15 +633,17 @@ impl RootActiveEventLoop for ActiveEventLoop {
        self.exit.get()
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(Arc::new(OwnedDisplayHandle))
+    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
+        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::AndroidDisplayHandle::new();
@@ -737,10 +654,52 @@ impl rwh_06::HasDisplayHandle for ActiveEventLoop {
 #[derive(Clone, PartialEq, Eq)]
 pub(crate) struct OwnedDisplayHandle;

-impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::AndroidDisplayHandle::new();
-        Ok(unsafe { rwh_06::DisplayHandle::borrow_raw(raw.into()) })
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::AndroidDisplayHandle::new().into())
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub(crate) struct WindowId;
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        WindowId
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(_: WindowId) -> Self {
+        0
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(_: u64) -> Self {
+        Self
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct DeviceId(i32);
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId(0)
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct FingerId(i32);
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId(0)
    }
 }

@@ -770,6 +729,7 @@ impl Window {
        self.app.content_rect()
    }

+    #[cfg(feature = "rwh_06")]
    // Allow the usage of HasRawWindowHandle inside this function
    #[allow(deprecated)]
    fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
@@ -787,11 +747,13 @@ impl Window {
        }
    }

+    #[cfg(feature = "rwh_06")]
    fn raw_display_handle_rwh_06(&self) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
        Ok(rwh_06::RawDisplayHandle::Android(rwh_06::AndroidDisplayHandle::new()))
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_display_handle_rwh_06()?;
@@ -799,6 +761,7 @@ impl rwh_06::HasDisplayHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_window_handle_rwh_06()?;
@@ -807,8 +770,8 @@ impl rwh_06::HasWindowHandle for Window {
 }

 impl CoreWindow for Window {
-    fn id(&self) -> WindowId {
-        GLOBAL_WINDOW
+    fn id(&self) -> window::WindowId {
+        window::WindowId(WindowId)
    }

    fn primary_monitor(&self) -> Option<RootMonitorHandle> {
@@ -833,8 +796,8 @@ impl CoreWindow for Window {

    fn pre_present_notify(&self) {}

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        (0, 0).into()
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        Err(NotSupportedError::new("inner_position is not supported").into())
    }

    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
@@ -857,10 +820,6 @@ impl CoreWindow for Window {
        screen_size(&self.app)
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        PhysicalInsets::new(0, 0, 0, 0)
-    }
-
    fn set_min_surface_size(&self, _: Option<Size>) {}

    fn set_max_surface_size(&self, _: Option<Size>) {}
@@ -927,13 +886,7 @@ impl CoreWindow for Window {

    fn set_ime_cursor_area(&self, _position: Position, _size: Size) {}

-    fn set_ime_allowed(&self, allowed: bool) {
-        if allowed {
-            self.app.show_soft_input(true);
-        } else {
-            self.app.hide_soft_input(true);
-        }
-    }
+    fn set_ime_allowed(&self, _allowed: bool) {}

    fn set_ime_purpose(&self, _purpose: ImePurpose) {}

@@ -986,10 +939,12 @@ impl CoreWindow for Window {

    fn reset_dead_keys(&self) {}

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
--- a/src/platform_impl/apple/appkit/app.rs
+++ b/src/platform_impl/apple/appkit/app.rs
@@ -7,6 +7,7 @@ use objc2_app_kit::{NSApplication, NSEvent, NSEventModifierFlags, NSEventType, N
 use objc2_foundation::{MainThreadMarker, NSObject};

 use super::app_state::AppState;
+use super::DEVICE_ID;
 use crate::event::{DeviceEvent, ElementState};

 declare_class!(
@@ -60,7 +61,7 @@ fn maybe_dispatch_device_event(app_state: &Rc<AppState>, event: &NSEvent) {

            if delta_x != 0.0 || delta_y != 0.0 {
                app_state.maybe_queue_with_handler(move |app, event_loop| {
-                    app.device_event(event_loop, None, DeviceEvent::PointerMotion {
+                    app.device_event(event_loop, DEVICE_ID, DeviceEvent::MouseMotion {
                        delta: (delta_x, delta_y),
                    });
                });
@@ -69,7 +70,7 @@ fn maybe_dispatch_device_event(app_state: &Rc<AppState>, event: &NSEvent) {
        NSEventType::LeftMouseDown | NSEventType::RightMouseDown | NSEventType::OtherMouseDown => {
            let button = unsafe { event.buttonNumber() } as u32;
            app_state.maybe_queue_with_handler(move |app, event_loop| {
-                app.device_event(event_loop, None, DeviceEvent::Button {
+                app.device_event(event_loop, DEVICE_ID, DeviceEvent::Button {
                    button,
                    state: ElementState::Pressed,
                });
@@ -78,7 +79,7 @@ fn maybe_dispatch_device_event(app_state: &Rc<AppState>, event: &NSEvent) {
        NSEventType::LeftMouseUp | NSEventType::RightMouseUp | NSEventType::OtherMouseUp => {
            let button = unsafe { event.buttonNumber() } as u32;
            app_state.maybe_queue_with_handler(move |app, event_loop| {
-                app.device_event(event_loop, None, DeviceEvent::Button {
+                app.device_event(event_loop, DEVICE_ID, DeviceEvent::Button {
                    button,
                    state: ElementState::Released,
                });
--- a/src/platform_impl/apple/appkit/app_state.rs
+++ b/src/platform_impl/apple/appkit/app_state.rs
@@ -1,30 +1,30 @@
 use std::cell::{Cell, OnceCell, RefCell};
 use std::mem;
 use std::rc::{Rc, Weak};
-use std::sync::atomic::Ordering as AtomicOrdering;
+use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::sync::Arc;
 use std::time::Instant;

-use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy, NSRunningApplication};
+use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy};
 use objc2_foundation::{MainThreadMarker, NSNotification};

 use super::super::event_handler::EventHandler;
-use super::event_loop::{stop_app_immediately, ActiveEventLoop, EventLoopProxy, PanicInfo};
-use super::menu;
+use super::event_loop::{stop_app_immediately, ActiveEventLoop, PanicInfo};
 use super::observer::{EventLoopWaker, RunLoop};
+use super::{menu, WindowId};
 use crate::application::ApplicationHandler;
 use crate::event::{StartCause, WindowEvent};
 use crate::event_loop::ControlFlow;
-use crate::window::WindowId;
+use crate::window::WindowId as RootWindowId;

 #[derive(Debug)]
 pub(super) struct AppState {
    mtm: MainThreadMarker,
-    activation_policy: Option<NSApplicationActivationPolicy>,
+    activation_policy: NSApplicationActivationPolicy,
    default_menu: bool,
    activate_ignoring_other_apps: bool,
    run_loop: RunLoop,
-    event_loop_proxy: Arc<EventLoopProxy>,
+    proxy_wake_up: Arc<AtomicBool>,
    event_handler: EventHandler,
    stop_on_launch: Cell<bool>,
    stop_before_wait: Cell<bool>,
@@ -65,14 +65,14 @@ static GLOBAL: StaticMainThreadBound<OnceCell<Rc<AppState>>> =
 impl AppState {
    pub(super) fn setup_global(
        mtm: MainThreadMarker,
-        activation_policy: Option<NSApplicationActivationPolicy>,
+        activation_policy: NSApplicationActivationPolicy,
        default_menu: bool,
        activate_ignoring_other_apps: bool,
    ) -> Rc<Self> {
        let this = Rc::new(AppState {
            mtm,
            activation_policy,
-            event_loop_proxy: Arc::new(EventLoopProxy::new()),
+            proxy_wake_up: Arc::new(AtomicBool::new(false)),
            default_menu,
            activate_ignoring_other_apps,
            run_loop: RunLoop::main(mtm),
@@ -113,22 +113,7 @@ impl AppState {
        // 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.
-        if let Some(activation_policy) = self.activation_policy {
-            app.setActivationPolicy(activation_policy);
-        } else {
-            // If no activation policy is explicitly provided, and the application
-            // is bundled, do not set the activation policy at all, to allow the
-            // package manifest to define the behavior via LSUIElement.
-            //
-            // See:
-            // - https://github.com/rust-windowing/winit/issues/261
-            // - https://github.com/rust-windowing/winit/issues/3958
-            let is_bundled =
-                unsafe { NSRunningApplication::currentApplication().bundleIdentifier().is_some() };
-            if !is_bundled {
-                app.setActivationPolicy(NSApplicationActivationPolicy::Regular);
-            }
-        }
+        app.setActivationPolicy(self.activation_policy);

        #[allow(deprecated)]
        app.activateIgnoringOtherApps(self.activate_ignoring_other_apps);
@@ -176,8 +161,8 @@ impl AppState {
        self.event_handler.set(handler, closure)
    }

-    pub fn event_loop_proxy(&self) -> &Arc<EventLoopProxy> {
-        &self.event_loop_proxy
+    pub fn proxy_wake_up(&self) -> Arc<AtomicBool> {
+        self.proxy_wake_up.clone()
    }

    /// If `pump_events` is called to progress the event loop then we
@@ -256,7 +241,7 @@ impl AppState {
        // -> Don't go back into the event handler when our callstack originates from there
        if !self.event_handler.in_use() {
            self.with_handler(|app, event_loop| {
-                app.window_event(event_loop, window_id, WindowEvent::RedrawRequested);
+                app.window_event(event_loop, RootWindowId(window_id), WindowEvent::RedrawRequested);
            });

            // `pump_events` will request to stop immediately _after_ dispatching RedrawRequested
@@ -361,14 +346,14 @@ impl AppState {
            return;
        }

-        if self.event_loop_proxy.wake_up.swap(false, AtomicOrdering::Relaxed) {
+        if self.proxy_wake_up.swap(false, AtomicOrdering::Relaxed) {
            self.with_handler(|app, event_loop| app.proxy_wake_up(event_loop));
        }

        let redraw = mem::take(&mut *self.pending_redraw.borrow_mut());
        for window_id in redraw {
            self.with_handler(|app, event_loop| {
-                app.window_event(event_loop, window_id, WindowEvent::RedrawRequested);
+                app.window_event(event_loop, RootWindowId(window_id), WindowEvent::RedrawRequested);
            });
        }
        self.with_handler(|app, event_loop| {
--- a/src/platform_impl/apple/appkit/event_loop.rs
+++ b/src/platform_impl/apple/appkit/event_loop.rs
@@ -20,7 +20,6 @@ use objc2_app_kit::{
    NSApplicationWillTerminateNotification, NSWindow,
 };
 use objc2_foundation::{MainThreadMarker, NSNotificationCenter, NSObject, NSObjectProtocol};
-use rwh_06::HasDisplayHandle;

 use super::super::notification_center::create_observer;
 use super::app::WinitApplication;
@@ -33,8 +32,7 @@ use crate::application::ApplicationHandler;
 use crate::error::{EventLoopError, RequestError};
 use crate::event_loop::{
    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
+    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
 };
 use crate::monitor::MonitorHandle as RootMonitorHandle;
 use crate::platform::macos::ActivationPolicy;
@@ -97,8 +95,9 @@ impl ActiveEventLoop {
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        CoreEventLoopProxy::new(self.app_state.event_loop_proxy().clone())
+    fn create_proxy(&self) -> RootEventLoopProxy {
+        let event_loop_proxy = EventLoopProxy::new(self.app_state.proxy_wake_up());
+        RootEventLoopProxy { event_loop_proxy }
    }

    fn create_window(
@@ -152,15 +151,17 @@ impl RootActiveEventLoop for ActiveEventLoop {
        self.app_state.exiting()
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(Arc::new(OwnedDisplayHandle))
+    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
+        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::RawDisplayHandle::AppKit(rwh_06::AppKitDisplayHandle::new());
@@ -189,14 +190,18 @@ pub struct EventLoop {

 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PlatformSpecificEventLoopAttributes {
-    pub(crate) activation_policy: Option<ActivationPolicy>,
+    pub(crate) activation_policy: ActivationPolicy,
    pub(crate) default_menu: bool,
    pub(crate) activate_ignoring_other_apps: bool,
 }

 impl Default for PlatformSpecificEventLoopAttributes {
    fn default() -> Self {
-        Self { activation_policy: None, default_menu: true, activate_ignoring_other_apps: true }
+        Self {
+            activation_policy: Default::default(), // Regular
+            default_menu: true,
+            activate_ignoring_other_apps: true,
+        }
    }
 }

@@ -218,10 +223,9 @@ impl EventLoop {
        }

        let activation_policy = match attributes.activation_policy {
-            None => None,
-            Some(ActivationPolicy::Regular) => Some(NSApplicationActivationPolicy::Regular),
-            Some(ActivationPolicy::Accessory) => Some(NSApplicationActivationPolicy::Accessory),
-            Some(ActivationPolicy::Prohibited) => Some(NSApplicationActivationPolicy::Prohibited),
+            ActivationPolicy::Regular => NSApplicationActivationPolicy::Regular,
+            ActivationPolicy::Accessory => NSApplicationActivationPolicy::Accessory,
+            ActivationPolicy::Prohibited => NSApplicationActivationPolicy::Prohibited,
        };

        let app_state = AppState::setup_global(
@@ -390,12 +394,16 @@ impl EventLoop {
    }
 }

+#[derive(Clone, PartialEq, Eq)]
 pub(crate) struct OwnedDisplayHandle;

-impl HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::RawDisplayHandle::AppKit(rwh_06::AppKitDisplayHandle::new());
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::AppKitDisplayHandle::new().into())
    }
 }

@@ -434,9 +442,8 @@ pub fn stop_app_on_panic<F: FnOnce() -> R + UnwindSafe, R>(
    }
 }

-#[derive(Debug)]
 pub struct EventLoopProxy {
-    pub(crate) wake_up: AtomicBool,
+    proxy_wake_up: Arc<AtomicBool>,
    source: CFRunLoopSourceRef,
 }

@@ -451,8 +458,14 @@ impl Drop for EventLoopProxy {
    }
 }

+impl Clone for EventLoopProxy {
+    fn clone(&self) -> Self {
+        EventLoopProxy::new(self.proxy_wake_up.clone())
+    }
+}
+
 impl EventLoopProxy {
-    pub(crate) fn new() -> Self {
+    fn new(proxy_wake_up: Arc<AtomicBool>) -> Self {
        unsafe {
            // just wake up the eventloop
            extern "C" fn event_loop_proxy_handler(_: *const c_void) {}
@@ -476,16 +489,14 @@ impl EventLoopProxy {
            CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);
            CFRunLoopWakeUp(rl);

-            EventLoopProxy { wake_up: AtomicBool::new(false), source }
+            EventLoopProxy { proxy_wake_up, source }
        }
    }
-}

-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.wake_up.store(true, AtomicOrdering::Relaxed);
+    pub fn wake_up(&self) {
+        self.proxy_wake_up.store(true, AtomicOrdering::Relaxed);
        unsafe {
-            // Let the main thread know there's a new event.
+            // let the main thread know there's a new event
            CFRunLoopSourceSignal(self.source);
            let rl = CFRunLoopGetMain();
            CFRunLoopWakeUp(rl);
--- a/src/platform_impl/apple/appkit/mod.rs
+++ b/src/platform_impl/apple/appkit/mod.rs
@@ -17,11 +17,34 @@ mod window_delegate;
 pub(crate) use self::cursor::CustomCursor as PlatformCustomCursor;
 pub(crate) use self::event::{physicalkey_to_scancode, scancode_to_physicalkey, KeyEventExtra};
 pub(crate) use self::event_loop::{
-    ActiveEventLoop, EventLoop, PlatformSpecificEventLoopAttributes,
+    ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
+    PlatformSpecificEventLoopAttributes,
 };
 pub(crate) use self::monitor::{MonitorHandle, VideoModeHandle};
-pub(crate) use self::window::Window;
+pub(crate) use self::window::{Window, WindowId};
 pub(crate) use self::window_delegate::PlatformSpecificWindowAttributes;
 pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
+use crate::event::DeviceId as RootDeviceId;
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
 pub(crate) use crate::platform_impl::Fullscreen;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+// Constant device ID; to be removed when if backend is updated to report real device IDs.
+pub(crate) const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId);
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId;
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId
+    }
+}
--- a/src/platform_impl/apple/appkit/view.rs
+++ b/src/platform_impl/apple/appkit/view.rs
@@ -24,13 +24,15 @@ use super::event::{
    scancode_to_physicalkey,
 };
 use super::window::WinitWindow;
+use super::DEVICE_ID;
 use crate::dpi::{LogicalPosition, LogicalSize};
 use crate::event::{
-    DeviceEvent, ElementState, Ime, Modifiers, MouseButton, MouseScrollDelta, PointerKind,
-    PointerSource, TouchPhase, WindowEvent,
+    DeviceEvent, ElementState, Ime, Modifiers, MouseButton, MouseScrollDelta, TouchPhase,
+    WindowEvent,
 };
 use crate::keyboard::{Key, KeyCode, KeyLocation, ModifiersState, NamedKey};
 use crate::platform::macos::OptionAsAlt;
+use crate::window::WindowId as RootWindowId;

 #[derive(Debug)]
 struct CursorState {
@@ -412,9 +414,8 @@ declare_class!(
        // Basically, we're sent this message whenever a keyboard event that doesn't generate a "human
        // readable" character happens, i.e. newlines, tabs, and Ctrl+C.
        #[method(doCommandBySelector:)]
-        fn do_command_by_selector(&self, command: Sel) {
+        fn do_command_by_selector(&self, _command: Sel) {
            trace_scope!("doCommandBySelector:");
-
            // We shouldn't forward any character from just committed text, since we'll end up sending
            // it twice with some IMEs like Korean one. We'll also always send `Enter` in that case,
            // which is not desired given it was used to confirm IME input.
@@ -429,18 +430,6 @@ declare_class!(
                // Leave preedit so that we also report the key-up for this key.
                self.ivars().ime_state.set(ImeState::Ground);
            }
-
-            // Send command action to user if they requested it.
-            let window_id = self.window().id();
-            self.ivars().app_state.maybe_queue_with_handler(move |app, event_loop| {
-                if let Some(handler) = app.macos_handler() {
-                    handler.standard_key_binding(event_loop, window_id, command.name());
-                }
-            });
-
-            // The documentation for `-[NSTextInputClient doCommandBySelector:]` clearly states that
-            // we should not be forwarding this event up the responder chain, so no calling `super`
-            // here either.
        }
    }

@@ -497,7 +486,7 @@ declare_class!(
            if !had_ime_input || self.ivars().forward_key_to_app.get() {
                let key_event = create_key_event(&event, true, unsafe { event.isARepeat() }, None);
                self.queue_event(WindowEvent::KeyboardInput {
-                    device_id: None,
+                    device_id: DEVICE_ID,
                    event: key_event,
                    is_synthetic: false,
                });
@@ -517,7 +506,7 @@ declare_class!(
                ImeState::Ground | ImeState::Disabled
            ) {
                self.queue_event(WindowEvent::KeyboardInput {
-                    device_id: None,
+                    device_id: DEVICE_ID,
                    event: create_key_event(&event, false, false, None),
                    is_synthetic: false,
                });
@@ -568,7 +557,7 @@ declare_class!(
            let event = create_key_event(&event, true, unsafe { event.isARepeat() }, None);

            self.queue_event(WindowEvent::KeyboardInput {
-                device_id: None,
+                device_id: DEVICE_ID,
                event,
                is_synthetic: false,
            });
@@ -650,30 +639,19 @@ declare_class!(
        }

        #[method(mouseEntered:)]
-        fn mouse_entered(&self, event: &NSEvent) {
+        fn mouse_entered(&self, _event: &NSEvent) {
            trace_scope!("mouseEntered:");
-
-            let position = self.mouse_view_point(event).to_physical(self.scale_factor());
-
-            self.queue_event(WindowEvent::PointerEntered {
-                device_id: None,
-                primary: true,
-                position,
-                kind: PointerKind::Mouse,
+            self.queue_event(WindowEvent::CursorEntered {
+                device_id: DEVICE_ID,
            });
        }

        #[method(mouseExited:)]
-        fn mouse_exited(&self, event: &NSEvent) {
+        fn mouse_exited(&self, _event: &NSEvent) {
            trace_scope!("mouseExited:");

-            let position = self.mouse_view_point(event).to_physical(self.scale_factor());
-
-            self.queue_event(WindowEvent::PointerLeft {
-                device_id: None,
-                primary: true,
-                position: Some(position),
-                kind: PointerKind::Mouse,
+            self.queue_event(WindowEvent::CursorLeft {
+                device_id: DEVICE_ID,
            });
        }

@@ -711,10 +689,10 @@ declare_class!(
            self.update_modifiers(event, false);

            self.ivars().app_state.maybe_queue_with_handler(move |app, event_loop|
-                app.device_event(event_loop, None, DeviceEvent::MouseWheel { delta })
+                app.device_event(event_loop, DEVICE_ID, DeviceEvent::MouseWheel { delta })
            );
            self.queue_event(WindowEvent::MouseWheel {
-                device_id: None,
+                device_id: DEVICE_ID,
                delta,
                phase,
            });
@@ -736,7 +714,7 @@ declare_class!(
            };

            self.queue_event(WindowEvent::PinchGesture {
-                device_id: None,
+                device_id: DEVICE_ID,
                delta: unsafe { event.magnification() },
                phase,
            });
@@ -749,7 +727,7 @@ declare_class!(
            self.mouse_motion(event);

            self.queue_event(WindowEvent::DoubleTapGesture {
-                device_id: None,
+                device_id: DEVICE_ID,
            });
        }

@@ -769,7 +747,7 @@ declare_class!(
            };

            self.queue_event(WindowEvent::RotationGesture {
-                device_id: None,
+                device_id: DEVICE_ID,
                delta: unsafe { event.rotation() },
                phase,
            });
@@ -780,7 +758,7 @@ declare_class!(
            trace_scope!("pressureChangeWithEvent:");

            self.queue_event(WindowEvent::TouchpadPressure {
-                device_id: None,
+                device_id: DEVICE_ID,
                pressure: unsafe { event.pressure() },
                stage: unsafe { event.stage() } as i64,
            });
@@ -856,7 +834,7 @@ impl WinitView {
    }

    fn queue_event(&self, event: WindowEvent) {
-        let window_id = self.window().id();
+        let window_id = RootWindowId(self.window().id());
        self.ivars().app_state.maybe_queue_with_handler(move |app, event_loop| {
            app.window_event(event_loop, window_id, event);
        });
@@ -994,7 +972,7 @@ impl WinitView {
                        event.location = KeyLocation::Left;
                        event.physical_key = get_left_modifier_code(&event.logical_key).into();
                        events.push_back(WindowEvent::KeyboardInput {
-                            device_id: None,
+                            device_id: DEVICE_ID,
                            event,
                            is_synthetic: false,
                        });
@@ -1003,7 +981,7 @@ impl WinitView {
                        event.location = KeyLocation::Right;
                        event.physical_key = get_right_modifier_code(&event.logical_key).into();
                        events.push_back(WindowEvent::KeyboardInput {
-                            device_id: None,
+                            device_id: DEVICE_ID,
                            event,
                            is_synthetic: false,
                        });
@@ -1034,7 +1012,7 @@ impl WinitView {
                    }

                    events.push_back(WindowEvent::KeyboardInput {
-                        device_id: None,
+                        device_id: DEVICE_ID,
                        event,
                        is_synthetic: false,
                    });
@@ -1056,22 +1034,20 @@ impl WinitView {
    }

    fn mouse_click(&self, event: &NSEvent, button_state: ElementState) {
-        let position = self.mouse_view_point(event).to_physical(self.scale_factor());
        let button = mouse_button(event);

        self.update_modifiers(event, false);

-        self.queue_event(WindowEvent::PointerButton {
-            device_id: None,
-            primary: true,
+        self.queue_event(WindowEvent::MouseInput {
+            device_id: DEVICE_ID,
            state: button_state,
-            position,
-            button: button.into(),
+            button,
        });
    }

    fn mouse_motion(&self, event: &NSEvent) {
-        let view_point = self.mouse_view_point(event);
+        let window_point = unsafe { event.locationInWindow() };
+        let view_point = self.convertPoint_fromView(window_point, None);
        let frame = self.frame();

        if view_point.x.is_sign_negative()
@@ -1086,22 +1062,15 @@ impl WinitView {
            }
        }

+        let view_point = LogicalPosition::new(view_point.x, view_point.y);
+
        self.update_modifiers(event, false);

-        self.queue_event(WindowEvent::PointerMoved {
-            device_id: None,
-            primary: true,
+        self.queue_event(WindowEvent::CursorMoved {
+            device_id: DEVICE_ID,
            position: view_point.to_physical(self.scale_factor()),
-            source: PointerSource::Mouse,
        });
    }
-
-    fn mouse_view_point(&self, event: &NSEvent) -> LogicalPosition<f64> {
-        let window_point = unsafe { event.locationInWindow() };
-        let view_point = self.convertPoint_fromView(window_point, None);
-
-        LogicalPosition::new(view_point.x, view_point.y)
-    }
 }

 /// Get the mouse button from the NSEvent.
--- a/src/platform_impl/apple/appkit/window.rs
+++ b/src/platform_impl/apple/appkit/window.rs
@@ -12,7 +12,7 @@ use crate::error::RequestError;
 use crate::monitor::MonitorHandle as CoreMonitorHandle;
 use crate::window::{
    Cursor, Fullscreen, Icon, ImePurpose, Theme, UserAttentionType, Window as CoreWindow,
-    WindowAttributes, WindowButtons, WindowId, WindowLevel,
+    WindowAttributes, WindowButtons, WindowLevel,
 };

 pub(crate) struct Window {
@@ -42,6 +42,7 @@ impl Window {
        self.delegate.get_on_main(|delegate| f(delegate))
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub(crate) fn raw_window_handle_rwh_06(
        &self,
@@ -53,6 +54,7 @@ impl Window {
        }
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub(crate) fn raw_display_handle_rwh_06(
        &self,
@@ -72,6 +74,7 @@ impl Drop for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_display_handle_rwh_06()?;
@@ -79,6 +82,7 @@ impl rwh_06::HasDisplayHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_window_handle_rwh_06()?;
@@ -88,7 +92,7 @@ impl rwh_06::HasWindowHandle for Window {

 impl CoreWindow for Window {
    fn id(&self) -> crate::window::WindowId {
-        self.maybe_wait_on_main(|delegate| delegate.id())
+        self.maybe_wait_on_main(|delegate| crate::window::WindowId(delegate.id()))
    }

    fn scale_factor(&self) -> f64 {
@@ -107,12 +111,12 @@ impl CoreWindow for Window {
        self.maybe_wait_on_main(|delegate| delegate.reset_dead_keys());
    }

-    fn surface_position(&self) -> dpi::PhysicalPosition<i32> {
-        self.maybe_wait_on_main(|delegate| delegate.surface_position())
+    fn inner_position(&self) -> Result<dpi::PhysicalPosition<i32>, RequestError> {
+        Ok(self.maybe_wait_on_main(|delegate| delegate.inner_position()))
    }

    fn outer_position(&self) -> Result<dpi::PhysicalPosition<i32>, RequestError> {
-        self.maybe_wait_on_main(|delegate| delegate.outer_position())
+        Ok(self.maybe_wait_on_main(|delegate| delegate.outer_position()))
    }

    fn set_outer_position(&self, position: Position) {
@@ -131,10 +135,6 @@ impl CoreWindow for Window {
        self.maybe_wait_on_main(|delegate| delegate.outer_size())
    }

-    fn safe_area(&self) -> dpi::PhysicalInsets<u32> {
-        self.maybe_wait_on_main(|delegate| delegate.safe_area())
-    }
-
    fn set_min_surface_size(&self, min_size: Option<Size>) {
        self.maybe_wait_on_main(|delegate| delegate.set_min_surface_size(min_size))
    }
@@ -284,7 +284,8 @@ impl CoreWindow for Window {
    }

    fn drag_window(&self) -> Result<(), RequestError> {
-        self.maybe_wait_on_main(|delegate| delegate.drag_window())
+        self.maybe_wait_on_main(|delegate| delegate.drag_window());
+        Ok(())
    }

    fn drag_resize_window(
@@ -323,15 +324,38 @@ impl CoreWindow for Window {
        })
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
 }

+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(pub usize);
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        Self(0)
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0 as u64
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self(raw_id as usize)
+    }
+}
+
 declare_class!(
    #[derive(Debug)]
    pub struct WinitWindow;
@@ -362,6 +386,6 @@ declare_class!(

 impl WinitWindow {
    pub(super) fn id(&self) -> WindowId {
-        WindowId::from_raw(self as *const Self as usize)
+        WindowId(self as *const Self as usize)
    }
 }
--- a/src/platform_impl/apple/appkit/window_delegate.rs
+++ b/src/platform_impl/apple/appkit/window_delegate.rs
@@ -6,7 +6,7 @@ use std::ptr;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};

-use core_graphics::display::CGDisplay;
+use core_graphics::display::{CGDisplay, CGPoint};
 use monitor::VideoModeHandle;
 use objc2::rc::{autoreleasepool, Retained};
 use objc2::runtime::{AnyObject, ProtocolObject};
@@ -15,16 +15,15 @@ use objc2_app_kit::{
    NSAppKitVersionNumber, NSAppKitVersionNumber10_12, NSAppearance, NSAppearanceCustomization,
    NSAppearanceNameAqua, NSApplication, NSApplicationPresentationOptions, NSBackingStoreType,
    NSColor, NSDraggingDestination, NSFilenamesPboardType, NSPasteboard,
-    NSRequestUserAttentionType, NSScreen, NSToolbar, NSView, NSWindowButton, NSWindowDelegate,
+    NSRequestUserAttentionType, NSScreen, NSView, NSWindowButton, NSWindowDelegate,
    NSWindowFullScreenButton, NSWindowLevel, NSWindowOcclusionState, NSWindowOrderingMode,
    NSWindowSharingType, NSWindowStyleMask, NSWindowTabbingMode, NSWindowTitleVisibility,
-    NSWindowToolbarStyle,
 };
 use objc2_foundation::{
-    ns_string, CGFloat, MainThreadMarker, NSArray, NSCopying, NSDictionary, NSEdgeInsets,
-    NSKeyValueChangeKey, NSKeyValueChangeNewKey, NSKeyValueChangeOldKey,
-    NSKeyValueObservingOptions, NSObject, NSObjectNSDelayedPerforming,
-    NSObjectNSKeyValueObserverRegistration, NSObjectProtocol, NSPoint, NSRect, NSSize, NSString,
+    ns_string, CGFloat, MainThreadMarker, NSArray, NSCopying, NSDictionary, NSKeyValueChangeKey,
+    NSKeyValueChangeNewKey, NSKeyValueChangeOldKey, NSKeyValueObservingOptions, NSObject,
+    NSObjectNSDelayedPerforming, NSObjectNSKeyValueObserverRegistration, NSObjectProtocol, NSPoint,
+    NSRect, NSSize, NSString,
 };
 use tracing::{trace, warn};

@@ -34,17 +33,14 @@ use super::monitor::{self, flip_window_screen_coordinates, get_display_id};
 use super::observer::RunLoop;
 use super::view::WinitView;
 use super::window::WinitWindow;
-use super::{ffi, Fullscreen, MonitorHandle};
-use crate::dpi::{
-    LogicalInsets, LogicalPosition, LogicalSize, PhysicalInsets, PhysicalPosition, PhysicalSize,
-    Position, Size,
-};
+use super::{ffi, Fullscreen, MonitorHandle, WindowId};
+use crate::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::event::{SurfaceSizeWriter, WindowEvent};
 use crate::platform::macos::{OptionAsAlt, WindowExtMacOS};
 use crate::window::{
    Cursor, CursorGrabMode, Icon, ImePurpose, ResizeDirection, Theme, UserAttentionType,
-    WindowAttributes, WindowButtons, WindowId, WindowLevel,
+    WindowAttributes, WindowButtons, WindowId as RootWindowId, WindowLevel,
 };

 #[derive(Clone, Debug, PartialEq)]
@@ -61,7 +57,6 @@ pub struct PlatformSpecificWindowAttributes {
    pub tabbing_identifier: Option<String>,
    pub option_as_alt: OptionAsAlt,
    pub borderless_game: bool,
-    pub unified_titlebar: bool,
 }

 impl Default for PlatformSpecificWindowAttributes {
@@ -80,7 +75,6 @@ impl Default for PlatformSpecificWindowAttributes {
            tabbing_identifier: None,
            option_as_alt: Default::default(),
            borderless_game: false,
-            unified_titlebar: false,
        }
    }
 }
@@ -94,8 +88,8 @@ pub(crate) struct State {

    // During `windowDidResize`, we use this to only send Moved if the position changed.
    //
-    // This is expressed in desktop coordinates, and flipped to match Winit's coordinate system.
-    previous_position: Cell<NSPoint>,
+    // This is expressed in native screen coordinates.
+    previous_position: Cell<Option<NSPoint>>,

    // Used to prevent redundant events.
    previous_scale_factor: Cell<f64>,
@@ -224,10 +218,10 @@ declare_class!(
            trace_scope!("windowDidResignKey:");
            // It happens rather often, e.g. when the user is Cmd+Tabbing, that the
            // NSWindowDelegate will receive a didResignKey event despite no event
-            // being received when the modifiers are released. This is because
+            // being received when the modifiers are released.  This is because
            // flagsChanged events are received by the NSView instead of the
            // NSWindowDelegate, and as a result a tracked modifiers state can quite
-            // easily fall out of synchrony with reality. This requires us to emit
+            // easily fall out of synchrony with reality.  This requires us to emit
            // a synthetic ModifiersChanged event when we lose focus.
            self.view().reset_modifiers();

@@ -445,15 +439,9 @@ declare_class!(
            // NOTE: We don't _really_ need to check the key path, as there should only be one, but
            // in the future we might want to observe other key paths.
            if key_path == Some(ns_string!("effectiveAppearance")) {
-                let change = change.expect(
-                    "requested a change dictionary in `addObserver`, but none was provided",
-                );
-                let old = change
-                    .get(unsafe { NSKeyValueChangeOldKey })
-                    .expect("requested change dictionary did not contain `NSKeyValueChangeOldKey`");
-                let new = change
-                    .get(unsafe { NSKeyValueChangeNewKey })
-                    .expect("requested change dictionary did not contain `NSKeyValueChangeNewKey`");
+                let change = change.expect("requested a change dictionary in `addObserver`, but none was provided");
+                let old = change.get(unsafe { NSKeyValueChangeOldKey }).expect("requested change dictionary did not contain `NSKeyValueChangeOldKey`");
+                let new = change.get(unsafe { NSKeyValueChangeNewKey }).expect("requested change dictionary did not contain `NSKeyValueChangeNewKey`");

                // SAFETY: The value of `effectiveAppearance` is `NSAppearance`
                let old: *const AnyObject = old;
@@ -570,12 +558,6 @@ fn new_window(
        }

        if attrs.platform_specific.fullsize_content_view {
-            // NOTE: If we decide to add an option to change this at runtime, we must emit a
-            // `SurfaceResized` event to let applications know that the safe area changed.
-            //
-            // An alternative would be to add a `WindowEvent::SafeAreaChanged` event, this could be
-            // done with an observer on `safeAreaRect` / `contentLayoutRect`, see:
-            // <https://github.com/rust-windowing/winit/issues/3911>
            masks |= NSWindowStyleMask::FullSizeContentView;
        }

@@ -634,14 +616,6 @@ fn new_window(
        if attrs.platform_specific.movable_by_window_background {
            window.setMovableByWindowBackground(true);
        }
-        if attrs.platform_specific.unified_titlebar {
-            unsafe {
-                // The toolbar style is ignored if there is no toolbar, so it is
-                // necessary to add one.
-                window.setToolbar(Some(&NSToolbar::new(mtm)));
-                window.setToolbarStyle(NSWindowToolbarStyle::Unified);
-            }
-        }

        if !attrs.enabled_buttons.contains(WindowButtons::MAXIMIZE) {
            if let Some(button) = window.standardWindowButton(NSWindowButton::NSWindowZoomButton) {
@@ -707,6 +681,7 @@ impl WindowDelegate {
        let window = new_window(app_state, &attrs, mtm)
            .ok_or_else(|| os_error!("couldn't create `NSWindow`"))?;

+        #[cfg(feature = "rwh_06")]
        match attrs.parent_window.map(|handle| handle.0) {
            Some(rwh_06::RawWindowHandle::AppKit(handle)) => {
                // SAFETY: Caller ensures the pointer is valid or NULL
@@ -747,7 +722,7 @@ impl WindowDelegate {
        let delegate = mtm.alloc().set_ivars(State {
            app_state: Rc::clone(app_state),
            window: window.retain(),
-            previous_position: Cell::new(flip_window_screen_coordinates(window.frame())),
+            previous_position: Cell::new(None),
            previous_scale_factor: Cell::new(scale_factor),
            surface_resize_increments: Cell::new(surface_resize_increments),
            decorations: Cell::new(attrs.decorations),
@@ -844,7 +819,7 @@ impl WindowDelegate {
    }

    pub(crate) fn queue_event(&self, event: WindowEvent) {
-        let window_id = self.window().id();
+        let window_id = RootWindowId(self.window().id());
        self.ivars().app_state.maybe_queue_with_handler(move |app, event_loop| {
            app.window_event(event_loop, window_id, event);
        });
@@ -874,12 +849,13 @@ impl WindowDelegate {
    }

    fn emit_move_event(&self) {
-        let position = flip_window_screen_coordinates(self.window().frame());
-        if self.ivars().previous_position.get() == position {
+        let frame = self.window().frame();
+        if self.ivars().previous_position.get() == Some(frame.origin) {
            return;
        }
-        self.ivars().previous_position.set(position);
+        self.ivars().previous_position.set(Some(frame.origin));

+        let position = flip_window_screen_coordinates(frame);
        let position =
            LogicalPosition::new(position.x, position.y).to_physical(self.scale_factor());
        self.queue_event(WindowEvent::Moved(position));
@@ -949,15 +925,15 @@ impl WindowDelegate {
    #[inline]
    pub fn pre_present_notify(&self) {}

-    pub fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+    pub fn outer_position(&self) -> PhysicalPosition<i32> {
        let position = flip_window_screen_coordinates(self.window().frame());
-        Ok(LogicalPosition::new(position.x, position.y).to_physical(self.scale_factor()))
+        LogicalPosition::new(position.x, position.y).to_physical(self.scale_factor())
    }

-    pub fn surface_position(&self) -> PhysicalPosition<i32> {
+    pub fn inner_position(&self) -> PhysicalPosition<i32> {
        let content_rect = self.window().contentRectForFrameRect(self.window().frame());
-        let logical = LogicalPosition::new(content_rect.origin.x, content_rect.origin.y);
-        logical.to_physical(self.scale_factor())
+        let position = flip_window_screen_coordinates(content_rect);
+        LogicalPosition::new(position.x, position.y).to_physical(self.scale_factor())
    }

    pub fn set_outer_position(&self, position: Position) {
@@ -983,32 +959,6 @@ impl WindowDelegate {
        logical.to_physical(self.scale_factor())
    }

-    pub fn safe_area(&self) -> PhysicalInsets<u32> {
-        // Only available on macOS 11.0
-        let insets = if self.view().respondsToSelector(sel!(safeAreaInsets)) {
-            // Includes NSWindowStyleMask::FullSizeContentView by default, and the notch because
-            // we've set it up with `additionalSafeAreaInsets`.
-            unsafe { self.view().safeAreaInsets() }
-        } else {
-            let content_rect = self.window().contentRectForFrameRect(self.window().frame());
-            // Includes NSWindowStyleMask::FullSizeContentView
-            // Convert from window coordinates to view coordinates
-            let safe_rect = unsafe {
-                self.view().convertRect_fromView(self.window().contentLayoutRect(), None)
-            };
-            NSEdgeInsets {
-                top: safe_rect.origin.y - content_rect.origin.y,
-                left: safe_rect.origin.x - content_rect.origin.x,
-                bottom: (content_rect.size.height + content_rect.origin.x)
-                    - (safe_rect.size.height + safe_rect.origin.x),
-                right: (content_rect.size.width + content_rect.origin.y)
-                    - (safe_rect.size.width + safe_rect.origin.y),
-            }
-        };
-        let insets = LogicalInsets::new(insets.top, insets.left, insets.bottom, insets.right);
-        insets.to_physical(self.scale_factor())
-    }
-
    #[inline]
    pub fn request_surface_size(&self, size: Size) -> Option<PhysicalSize<u32>> {
        let scale_factor = self.scale_factor();
@@ -1205,12 +1155,13 @@ impl WindowDelegate {

    #[inline]
    pub fn set_cursor_position(&self, cursor_position: Position) -> Result<(), RequestError> {
-        let content_rect = self.window().contentRectForFrameRect(self.window().frame());
-        let window_position = flip_window_screen_coordinates(content_rect);
-        let cursor_position = cursor_position.to_logical::<CGFloat>(self.scale_factor());
-        let point = core_graphics::display::CGPoint {
-            x: window_position.x + cursor_position.x,
-            y: window_position.y + cursor_position.y,
+        let physical_window_position = self.inner_position();
+        let scale_factor = self.scale_factor();
+        let window_position = physical_window_position.to_logical::<CGFloat>(scale_factor);
+        let logical_cursor_position = cursor_position.to_logical::<CGFloat>(scale_factor);
+        let point = CGPoint {
+            x: logical_cursor_position.x + window_position.x,
+            y: logical_cursor_position.y + window_position.y,
        };
        CGDisplay::warp_mouse_cursor_position(point)
            .map_err(|status| os_error!(format!("CGError {status}")))?;
@@ -1221,12 +1172,10 @@ impl WindowDelegate {
    }

    #[inline]
-    pub fn drag_window(&self) -> Result<(), RequestError> {
+    pub fn drag_window(&self) {
        let mtm = MainThreadMarker::from(self);
-        let event =
-            NSApplication::sharedApplication(mtm).currentEvent().ok_or(RequestError::Ignored)?;
+        let event = NSApplication::sharedApplication(mtm).currentEvent().unwrap();
        self.window().performWindowDragWithEvent(&event);
-        Ok(())
    }

    #[inline]
@@ -1670,6 +1619,7 @@ impl WindowDelegate {
        Some(monitor)
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub fn raw_window_handle_rwh_06(&self) -> rwh_06::RawWindowHandle {
        let window_handle = rwh_06::AppKitWindowHandle::new({
@@ -1792,15 +1742,12 @@ impl WindowExtMacOS for WindowDelegate {
            let screen = self.window().screen().expect("expected screen to be available");
            self.window().setFrame_display(screen.frame(), true);

-            // Configure the safe area rectangle, to ensure that we don't obscure the notch.
-            if NSScreen::class().responds_to(sel!(safeAreaInsets)) {
-                unsafe { self.view().setAdditionalSafeAreaInsets(screen.safeAreaInsets()) };
-            }
-
            // Fullscreen windows can't be resized, minimized, or moved
            self.toggle_style_mask(NSWindowStyleMask::Miniaturizable, false);
            self.toggle_style_mask(NSWindowStyleMask::Resizable, false);
            self.window().setMovable(false);
+
+            true
        } else {
            let new_mask = self.saved_style();
            self.set_style_mask(new_mask);
@@ -1813,22 +1760,11 @@ impl WindowExtMacOS for WindowDelegate {
                app.setPresentationOptions(presentation_opts);
            }

-            if NSScreen::class().responds_to(sel!(safeAreaInsets)) {
-                unsafe {
-                    self.view().setAdditionalSafeAreaInsets(NSEdgeInsets {
-                        top: 0.0,
-                        left: 0.0,
-                        bottom: 0.0,
-                        right: 0.0,
-                    });
-                }
-            }
-
            self.window().setFrame_display(frame, true);
            self.window().setMovable(true);
-        }

-        true
+            true
+        }
    }

    #[inline]
@@ -1900,34 +1836,6 @@ impl WindowExtMacOS for WindowDelegate {
    fn is_borderless_game(&self) -> bool {
        self.ivars().is_borderless_game.get()
    }
-
-    fn set_unified_titlebar(&self, unified_titlebar: bool) {
-        let window = self.window();
-
-        if unified_titlebar {
-            let mtm = MainThreadMarker::from(self);
-
-            unsafe {
-                // The toolbar style is ignored if there is no toolbar, so it is
-                // necessary to add one.
-                window.setToolbar(Some(&NSToolbar::new(mtm)));
-                window.setToolbarStyle(NSWindowToolbarStyle::Unified);
-            }
-        } else {
-            unsafe {
-                window.setToolbar(None);
-                window.setToolbarStyle(NSWindowToolbarStyle::Automatic);
-            }
-        }
-    }
-
-    fn unified_titlebar(&self) -> bool {
-        let window = self.window();
-
-        unsafe {
-            window.toolbar().is_some() && window.toolbarStyle() == NSWindowToolbarStyle::Unified
-        }
-    }
 }

 const DEFAULT_STANDARD_FRAME: NSRect =
--- a/src/platform_impl/apple/mod.rs
+++ b/src/platform_impl/apple/mod.rs
@@ -7,9 +7,7 @@ mod notification_center;
 #[cfg(not(target_os = "macos"))]
 mod uikit;

-#[allow(unused_imports)]
 #[cfg(target_os = "macos")]
 pub use self::appkit::*;
-#[allow(unused_imports)]
 #[cfg(not(target_os = "macos"))]
 pub use self::uikit::*;
--- a/src/platform_impl/apple/uikit/app_state.rs
+++ b/src/platform_impl/apple/uikit/app_state.rs
@@ -3,7 +3,7 @@
 use std::cell::{OnceCell, RefCell, RefMut};
 use std::collections::HashSet;
 use std::os::raw::c_void;
-use std::sync::atomic::Ordering;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Instant;
 use std::{mem, ptr};
@@ -24,11 +24,12 @@ use objc2_ui_kit::{UIApplication, UICoordinateSpace, UIView, UIWindow};

 use super::super::event_handler::EventHandler;
 use super::window::WinitUIWindow;
-use super::{ActiveEventLoop, EventLoopProxy};
+use super::ActiveEventLoop;
 use crate::application::ApplicationHandler;
 use crate::dpi::PhysicalSize;
 use crate::event::{Event, StartCause, SurfaceSizeWriter, WindowEvent};
 use crate::event_loop::ControlFlow;
+use crate::window::WindowId as RootWindowId;

 macro_rules! bug {
    ($($msg:tt)*) => {
@@ -139,7 +140,7 @@ pub(crate) struct AppState {
    app_state: Option<AppStateImpl>,
    control_flow: ControlFlow,
    waker: EventLoopWaker,
-    event_loop_proxy: Arc<EventLoopProxy>,
+    proxy_wake_up: Arc<AtomicBool>,
 }

 impl AppState {
@@ -149,8 +150,6 @@ impl AppState {
        // must be mut because plain `static` requires `Sync`
        static mut APP_STATE: RefCell<Option<AppState>> = RefCell::new(None);

-        #[allow(unknown_lints)] // New lint below
-        #[allow(static_mut_refs)] // TODO: Use `MainThreadBound` instead.
        let mut guard = unsafe { APP_STATE.borrow_mut() };
        if guard.is_none() {
            #[inline(never)]
@@ -164,7 +163,7 @@ impl AppState {
                    }),
                    control_flow: ControlFlow::default(),
                    waker,
-                    event_loop_proxy: Arc::new(EventLoopProxy::new()),
+                    proxy_wake_up: Arc::new(AtomicBool::new(false)),
                });
            }
            init_guard(&mut guard);
@@ -376,8 +375,8 @@ impl AppState {
        }
    }

-    pub fn event_loop_proxy(&self) -> &Arc<EventLoopProxy> {
-        &self.event_loop_proxy
+    pub(crate) fn proxy_wake_up(&self) -> Arc<AtomicBool> {
+        self.proxy_wake_up.clone()
    }

    pub(crate) fn set_control_flow(&mut self, control_flow: ControlFlow) {
@@ -543,10 +542,10 @@ fn handle_user_events(mtm: MainThreadMarker) {
    if processing_redraws {
        bug!("user events attempted to be sent out while `ProcessingRedraws`");
    }
-    let event_loop_proxy = this.event_loop_proxy().clone();
+    let proxy_wake_up = this.proxy_wake_up.clone();
    drop(this);

-    if event_loop_proxy.wake_up.swap(false, Ordering::Relaxed) {
+    if proxy_wake_up.swap(false, Ordering::Relaxed) {
        handle_event(mtm, Event::UserWakeUp);
    }

@@ -578,7 +577,7 @@ fn handle_user_events(mtm: MainThreadMarker) {
            }
        }

-        if event_loop_proxy.wake_up.swap(false, Ordering::Relaxed) {
+        if proxy_wake_up.swap(false, Ordering::Relaxed) {
            handle_event(mtm, Event::UserWakeUp);
        }
    }
@@ -598,7 +597,7 @@ pub(crate) fn send_occluded_event_for_all_windows(application: &UIApplication, o
                &*ptr
            };
            events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::Occluded(occluded),
            }));
        }
@@ -625,7 +624,7 @@ pub fn handle_main_events_cleared(mtm: MainThreadMarker) {
        .into_iter()
        .map(|window| {
            EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::RedrawRequested,
            })
        })
@@ -654,7 +653,7 @@ pub(crate) fn terminated(application: &UIApplication) {
                &*ptr
            };
            events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::Destroyed,
            }));
        }
@@ -672,7 +671,7 @@ fn handle_hidpi_proxy(mtm: MainThreadMarker, event: ScaleFactorChanged) {
    let ScaleFactorChanged { suggested_size, scale_factor, window } = event;
    let new_surface_size = Arc::new(Mutex::new(suggested_size));
    let event = Event::WindowEvent {
-        window_id: window.id(),
+        window_id: RootWindowId(window.id()),
        event: WindowEvent::ScaleFactorChanged {
            scale_factor,
            surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(&new_surface_size)),
--- a/src/platform_impl/apple/uikit/event_loop.rs
+++ b/src/platform_impl/apple/uikit/event_loop.rs
@@ -20,7 +20,6 @@ use objc2_ui_kit::{
    UIApplicationWillEnterForegroundNotification, UIApplicationWillResignActiveNotification,
    UIApplicationWillTerminateNotification, UIScreen,
 };
-use rwh_06::HasDisplayHandle;

 use super::super::notification_center::create_observer;
 use super::app_state::{send_occluded_event_for_all_windows, AppState, EventWrapper};
@@ -30,8 +29,7 @@ use crate::error::{EventLoopError, NotSupportedError, RequestError};
 use crate::event::Event;
 use crate::event_loop::{
    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
+    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
 };
 use crate::monitor::MonitorHandle as RootMonitorHandle;
 use crate::platform_impl::Window;
@@ -43,8 +41,9 @@ pub(crate) struct ActiveEventLoop {
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        CoreEventLoopProxy::new(AppState::get_mut(self.mtm).event_loop_proxy().clone())
+    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
+        let event_loop_proxy = EventLoopProxy::new(AppState::get_mut(self.mtm).proxy_wake_up());
+        RootEventLoopProxy { event_loop_proxy }
    }

    fn create_window(
@@ -95,15 +94,17 @@ impl RootActiveEventLoop for ActiveEventLoop {
        false
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(Arc::new(OwnedDisplayHandle))
+    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
+        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::RawDisplayHandle::UiKit(rwh_06::UiKitDisplayHandle::new());
@@ -114,10 +115,13 @@ impl rwh_06::HasDisplayHandle for ActiveEventLoop {
 #[derive(Clone, PartialEq, Eq)]
 pub(crate) struct OwnedDisplayHandle;

-impl HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::RawDisplayHandle::UiKit(rwh_06::UiKitDisplayHandle::new());
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::UiKitDisplayHandle::new().into())
    }
 }

@@ -288,13 +292,19 @@ impl EventLoop {
 }

 pub struct EventLoopProxy {
-    pub(crate) wake_up: AtomicBool,
+    proxy_wake_up: Arc<AtomicBool>,
    source: CFRunLoopSourceRef,
 }

 unsafe impl Send for EventLoopProxy {}
 unsafe impl Sync for EventLoopProxy {}

+impl Clone for EventLoopProxy {
+    fn clone(&self) -> EventLoopProxy {
+        EventLoopProxy::new(self.proxy_wake_up.clone())
+    }
+}
+
 impl Drop for EventLoopProxy {
    fn drop(&mut self) {
        unsafe {
@@ -305,7 +315,7 @@ impl Drop for EventLoopProxy {
 }

 impl EventLoopProxy {
-    pub(crate) fn new() -> EventLoopProxy {
+    fn new(proxy_wake_up: Arc<AtomicBool>) -> EventLoopProxy {
        unsafe {
            // just wake up the eventloop
            extern "C" fn event_loop_proxy_handler(_: *const c_void) {}
@@ -329,14 +339,12 @@ impl EventLoopProxy {
            CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes);
            CFRunLoopWakeUp(rl);

-            EventLoopProxy { wake_up: AtomicBool::new(false), source }
+            EventLoopProxy { proxy_wake_up, source }
        }
    }
-}

-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.wake_up.store(true, AtomicOrdering::Relaxed);
+    pub fn wake_up(&self) {
+        self.proxy_wake_up.store(true, AtomicOrdering::Relaxed);
        unsafe {
            // let the main thread know there's a new event
            CFRunLoopSourceSignal(self.source);
--- a/src/platform_impl/apple/uikit/mod.rs
+++ b/src/platform_impl/apple/uikit/mod.rs
@@ -10,16 +10,42 @@ mod window;
 use std::fmt;

 pub(crate) use self::event_loop::{
-    ActiveEventLoop, EventLoop, EventLoopProxy, PlatformSpecificEventLoopAttributes,
+    ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
+    PlatformSpecificEventLoopAttributes,
 };
 pub(crate) use self::monitor::{MonitorHandle, VideoModeHandle};
-pub(crate) use self::window::{PlatformSpecificWindowAttributes, Window};
+pub(crate) use self::window::{PlatformSpecificWindowAttributes, Window, WindowId};
 pub(crate) use crate::cursor::{
    NoCustomCursor as PlatformCustomCursor, NoCustomCursor as PlatformCustomCursorSource,
 };
+use crate::event::DeviceId as RootDeviceId;
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
 pub(crate) use crate::platform_impl::Fullscreen;

+/// There is no way to detect which device that performed a certain event in
+/// UIKit (i.e. you can't differentiate between different external keyboards,
+/// or whether it was the main touchscreen, assistive technologies, or some
+/// other pointer device that caused a touch event).
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+pub(crate) const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId);
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId(usize);
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId(0)
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct KeyEventExtra {}

--- a/src/platform_impl/apple/uikit/view.rs
+++ b/src/platform_impl/apple/uikit/view.rs
@@ -6,23 +6,22 @@ use objc2::runtime::{NSObjectProtocol, ProtocolObject};
 use objc2::{declare_class, msg_send, msg_send_id, mutability, sel, ClassType, DeclaredClass};
 use objc2_foundation::{CGFloat, CGPoint, CGRect, MainThreadMarker, NSObject, NSSet, NSString};
 use objc2_ui_kit::{
-    UIEvent, UIForceTouchCapability, UIGestureRecognizer, UIGestureRecognizerDelegate,
-    UIGestureRecognizerState, UIKeyInput, UIPanGestureRecognizer, UIPinchGestureRecognizer,
-    UIResponder, UIRotationGestureRecognizer, UITapGestureRecognizer, UITextInputTraits, UITouch,
-    UITouchPhase, UITouchType, UITraitEnvironment, UIView,
+    UICoordinateSpace, UIEvent, UIForceTouchCapability, UIGestureRecognizer,
+    UIGestureRecognizerDelegate, UIGestureRecognizerState, UIKeyInput, UIPanGestureRecognizer,
+    UIPinchGestureRecognizer, UIResponder, UIRotationGestureRecognizer, UITapGestureRecognizer,
+    UITextInputTraits, UITouch, UITouchPhase, UITouchType, UITraitEnvironment, UIView,
 };
-use tracing::debug;

 use super::app_state::{self, EventWrapper};
 use super::window::WinitUIWindow;
+use super::{FingerId, DEVICE_ID};
 use crate::dpi::PhysicalPosition;
 use crate::event::{
-    ButtonSource, ElementState, Event, FingerId, Force, KeyEvent, PointerKind, PointerSource,
-    TouchPhase, WindowEvent,
+    ElementState, Event, FingerId as RootFingerId, Force, KeyEvent, Touch, TouchPhase, WindowEvent,
 };
 use crate::keyboard::{Key, KeyCode, KeyLocation, NamedKey, NativeKeyCode, PhysicalKey};
 use crate::platform_impl::KeyEventExtra;
-use crate::window::WindowAttributes;
+use crate::window::{WindowAttributes, WindowId as RootWindowId};

 pub struct WinitViewState {
    pinch_gesture_recognizer: RefCell<Option<Retained<UIPinchGestureRecognizer>>>,
@@ -34,9 +33,6 @@ pub struct WinitViewState {
    rotation_last_delta: Cell<CGFloat>,
    pinch_last_delta: Cell<CGFloat>,
    pan_last_delta: Cell<CGPoint>,
-
-    primary_finger: Cell<Option<FingerId>>,
-    fingers: Cell<u8>,
 }

 declare_class!(
@@ -61,7 +57,7 @@ declare_class!(
            app_state::handle_nonuser_event(
                mtm,
                EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: window.id(),
+                    window_id: RootWindowId(window.id()),
                    event: WindowEvent::RedrawRequested,
                }),
            );
@@ -73,19 +69,30 @@ declare_class!(
            let mtm = MainThreadMarker::new().unwrap();
            let _: () = unsafe { msg_send![super(self), layoutSubviews] };

-            let frame = self.frame();
-            let scale_factor = self.contentScaleFactor() as f64;
-            let size = crate::dpi::LogicalSize {
-                width: frame.size.width as f64,
-                height: frame.size.height as f64,
-            }
-            .to_physical(scale_factor);
-
            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);
+            }
+
            app_state::handle_nonuser_event(
                mtm,
                EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: window.id(),
+                    window_id: RootWindowId(window.id()),
                    event: WindowEvent::SurfaceResized(size),
                }),
            );
@@ -116,12 +123,15 @@ declare_class!(
                "invalid scale_factor set on UIView",
            );
            let scale_factor = scale_factor as f64;
-            let frame = self.frame();
+            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: frame.size.width as f64,
-                height: frame.size.height as f64,
+                width: screen_frame.size.width as f64,
+                height: screen_frame.size.height as f64,
            };
-            let window_id = window.id();
+            let window_id = RootWindowId(window.id());
            app_state::handle_nonuser_events(
                mtm,
                std::iter::once(EventWrapper::ScaleFactorChanged(
@@ -140,13 +150,6 @@ declare_class!(
            );
        }

-        #[method(safeAreaInsetsDidChange)]
-        fn safe_area_changed(&self) {
-            debug!("safeAreaInsetsDidChange was called, requesting redraw");
-            // When the safe area changes we want to make sure to emit a redraw event
-            self.setNeedsDisplay();
-        }
-
        #[method(touchesBegan:withEvent:)]
        fn touches_began(&self, touches: &NSSet<UITouch>, _event: Option<&UIEvent>) {
            self.handle_touches(touches)
@@ -189,13 +192,13 @@ declare_class!(
                    // Pass -delta so that action is reversed
                    (TouchPhase::Cancelled, -recognizer.scale())
                }
-                state => panic!("unexpected recognizer state: {state:?}"),
+                state => panic!("unexpected recognizer state: {:?}", state),
            };

            let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::PinchGesture {
-                    device_id: None,
+                    device_id: DEVICE_ID,
                    delta: delta as f64,
                    phase,
                },
@@ -211,9 +214,9 @@ declare_class!(

            if recognizer.state() == UIGestureRecognizerState::Ended {
                let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: window.id(),
+                    window_id: RootWindowId(window.id()),
                    event: WindowEvent::DoubleTapGesture {
-                        device_id: None,
+                        device_id: DEVICE_ID,
                    },
                });

@@ -248,14 +251,14 @@ declare_class!(
                    // Pass -delta so that action is reversed
                    (TouchPhase::Cancelled, -recognizer.rotation())
                }
-                state => panic!("unexpected recognizer state: {state:?}"),
+                state => panic!("unexpected recognizer state: {:?}", state),
            };

            // Make delta negative to match macos, convert to degrees
            let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::RotationGesture {
-                    device_id: None,
+                    device_id: DEVICE_ID,
                    delta: -delta.to_degrees() as _,
                    phase,
                },
@@ -299,14 +302,14 @@ declare_class!(
                    // Pass -delta so that action is reversed
                    (TouchPhase::Cancelled, -last_pan.x, -last_pan.y)
                }
-                state => panic!("unexpected recognizer state: {state:?}"),
+                state => panic!("unexpected recognizer state: {:?}", state),
            };


            let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent {
-                window_id: window.id(),
+                window_id: RootWindowId(window.id()),
                event: WindowEvent::PanGesture {
-                    device_id: None,
+                    device_id: DEVICE_ID,
                    delta: PhysicalPosition::new(dx as _, dy as _),
                    phase,
                },
@@ -367,9 +370,6 @@ impl WinitView {
            rotation_last_delta: Cell::new(0.0),
            pinch_last_delta: Cell::new(0.0),
            pan_last_delta: Cell::new(CGPoint { x: 0.0, y: 0.0 }),
-
-            primary_finger: Cell::new(None),
-            fingers: Cell::new(0),
        });
        let this: Retained<Self> = unsafe { msg_send_id![super(this), initWithFrame: frame] };

@@ -483,18 +483,25 @@ impl WinitView {
        for touch in touches {
            let logical_location = touch.locationInView(None);
            let touch_type = touch.r#type();
-            let force = if let UITouchType::Pencil = touch_type {
-                None
-            } else if os_supports_force {
+            let force = if os_supports_force {
                let trait_collection = 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 {
+                if touch_capability == UIForceTouchCapability::Available
+                    || touch_type == UITouchType::Pencil
+                {
                    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
@@ -504,134 +511,32 @@ impl WinitView {
            };
            let touch_id = touch as *const UITouch as usize;
            let phase = touch.phase();
-            let position = {
+            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:?}"),
+            };
+
+            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,
                )
            };
-            let window_id = window.id();
-            let finger_id = FingerId::from_raw(touch_id);
-
-            let ivars = self.ivars();
-
-            match phase {
-                UITouchPhase::Began => {
-                    let primary = if let UITouchType::Pencil = touch_type {
-                        true
-                    } else {
-                        ivars.fingers.set(ivars.fingers.get() + 1);
-                        // Keep the primary finger around until we clear all the fingers to
-                        // recognize it when user briefly removes it.
-                        match ivars.primary_finger.get() {
-                            Some(primary_id) => primary_id == finger_id,
-                            None => {
-                                debug_assert_eq!(
-                                    ivars.fingers.get(),
-                                    1,
-                                    "number of fingers were not counted correctly"
-                                );
-                                ivars.primary_finger.set(Some(finger_id));
-                                true
-                            },
-                        }
-                    };
-
-                    touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerEntered {
-                            device_id: None,
-                            primary,
-                            position,
-                            kind: if let UITouchType::Pencil = touch_type {
-                                PointerKind::Unknown
-                            } else {
-                                PointerKind::Touch(finger_id)
-                            },
-                        },
-                    }));
-                    touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerButton {
-                            device_id: None,
-                            primary,
-                            state: ElementState::Pressed,
-                            position,
-                            button: if let UITouchType::Pencil = touch_type {
-                                ButtonSource::Unknown(0)
-                            } else {
-                                ButtonSource::Touch { finger_id, force }
-                            },
-                        },
-                    }));
-                },
-                UITouchPhase::Moved => {
-                    let (primary, source) = if let UITouchType::Pencil = touch_type {
-                        (true, PointerSource::Unknown)
-                    } else {
-                        (ivars.primary_finger.get().unwrap() == finger_id, PointerSource::Touch {
-                            finger_id,
-                            force,
-                        })
-                    };
-
-                    touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerMoved {
-                            device_id: None,
-                            primary,
-                            position,
-                            source,
-                        },
-                    }));
-                },
-                // 2 is UITouchPhase::Stationary and is not expected here
-                UITouchPhase::Ended | UITouchPhase::Cancelled => {
-                    let primary = if let UITouchType::Pencil = touch_type {
-                        true
-                    } else {
-                        ivars.fingers.set(ivars.fingers.get() - 1);
-                        let primary = ivars.primary_finger.get().unwrap() == finger_id;
-                        if ivars.fingers.get() == 0 {
-                            ivars.primary_finger.set(None);
-                        }
-                        primary
-                    };
-
-                    if let UITouchPhase::Ended = phase {
-                        touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                            window_id,
-                            event: WindowEvent::PointerButton {
-                                device_id: None,
-                                primary,
-                                state: ElementState::Released,
-                                position,
-                                button: if let UITouchType::Pencil = touch_type {
-                                    ButtonSource::Unknown(0)
-                                } else {
-                                    ButtonSource::Touch { finger_id, force }
-                                },
-                            },
-                        }));
-                    }
-
-                    touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerLeft {
-                            device_id: None,
-                            primary,
-                            position: Some(position),
-                            kind: if let UITouchType::Pencil = touch_type {
-                                PointerKind::Unknown
-                            } else {
-                                PointerKind::Touch(finger_id)
-                            },
-                        },
-                    }));
-                },
-                _ => panic!("unexpected touch phase: {phase:?}"),
-            }
+            touch_events.push(EventWrapper::StaticEvent(Event::WindowEvent {
+                window_id: RootWindowId(window.id()),
+                event: WindowEvent::Touch(Touch {
+                    device_id: DEVICE_ID,
+                    finger_id: RootFingerId(FingerId(touch_id)),
+                    location: physical_location,
+                    force,
+                    phase,
+                }),
+            }));
        }
        let mtm = MainThreadMarker::new().unwrap();
        app_state::handle_nonuser_events(mtm, touch_events);
@@ -639,7 +544,7 @@ impl WinitView {

    fn handle_insert_text(&self, text: &NSString) {
        let window = self.window().unwrap();
-        let window_id = window.id();
+        let window_id = RootWindowId(window.id());
        let mtm = MainThreadMarker::new().unwrap();
        // send individual events for each character
        app_state::handle_nonuser_events(
@@ -667,7 +572,7 @@ impl WinitView {
                                platform_specific: KeyEventExtra {},
                            },
                            is_synthetic: false,
-                            device_id: None,
+                            device_id: DEVICE_ID,
                        },
                    })
                })
@@ -677,7 +582,7 @@ impl WinitView {

    fn handle_delete_backward(&self) {
        let window = self.window().unwrap();
-        let window_id = window.id();
+        let window_id = RootWindowId(window.id());
        let mtm = MainThreadMarker::new().unwrap();
        app_state::handle_nonuser_events(
            mtm,
@@ -685,7 +590,7 @@ impl WinitView {
                EventWrapper::StaticEvent(Event::WindowEvent {
                    window_id,
                    event: WindowEvent::KeyboardInput {
-                        device_id: None,
+                        device_id: DEVICE_ID,
                        event: KeyEvent {
                            state,
                            logical_key: Key::Named(NamedKey::Backspace),
--- a/src/platform_impl/apple/uikit/window.rs
+++ b/src/platform_impl/apple/uikit/window.rs
@@ -3,13 +3,14 @@
 use std::collections::VecDeque;

 use objc2::rc::Retained;
+use objc2::runtime::{AnyObject, NSObject};
 use objc2::{class, declare_class, msg_send, msg_send_id, mutability, ClassType, DeclaredClass};
 use objc2_foundation::{
-    CGFloat, CGPoint, CGRect, CGSize, MainThreadBound, MainThreadMarker, NSObject, NSObjectProtocol,
+    CGFloat, CGPoint, CGRect, CGSize, MainThreadBound, MainThreadMarker, NSObjectProtocol,
 };
 use objc2_ui_kit::{
-    UIApplication, UICoordinateSpace, UIEdgeInsets, UIResponder, UIScreen,
-    UIScreenOverscanCompensation, UIViewController, UIWindow,
+    UIApplication, UICoordinateSpace, UIResponder, UIScreen, UIScreenOverscanCompensation,
+    UIViewController, UIWindow,
 };
 use tracing::{debug, warn};

@@ -18,10 +19,7 @@ use super::view::WinitView;
 use super::view_controller::WinitViewController;
 use super::{app_state, monitor, ActiveEventLoop, Fullscreen, MonitorHandle};
 use crate::cursor::Cursor;
-use crate::dpi::{
-    LogicalInsets, LogicalPosition, LogicalSize, PhysicalInsets, PhysicalPosition, PhysicalSize,
-    Position, Size,
-};
+use crate::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::event::{Event, WindowEvent};
 use crate::icon::Icon;
@@ -29,7 +27,7 @@ use crate::monitor::MonitorHandle as CoreMonitorHandle;
 use crate::platform::ios::{ScreenEdge, StatusBarStyle, ValidOrientations};
 use crate::window::{
    CursorGrabMode, ImePurpose, ResizeDirection, Theme, UserAttentionType, Window as CoreWindow,
-    WindowAttributes, WindowButtons, WindowId, WindowLevel,
+    WindowAttributes, WindowButtons, WindowId as CoreWindowId, WindowLevel,
 };

 declare_class!(
@@ -52,7 +50,7 @@ declare_class!(
            app_state::handle_nonuser_event(
                mtm,
                EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: self.id(),
+                    window_id: CoreWindowId(self.id()),
                    event: WindowEvent::Focused(true),
                }),
            );
@@ -65,7 +63,7 @@ declare_class!(
            app_state::handle_nonuser_event(
                mtm,
                EventWrapper::StaticEvent(Event::WindowEvent {
-                    window_id: self.id(),
+                    window_id: CoreWindowId(self.id()),
                    event: WindowEvent::Focused(false),
                }),
            );
@@ -108,7 +106,7 @@ impl WinitUIWindow {
    }

    pub(crate) fn id(&self) -> WindowId {
-        WindowId::from_raw(self as *const Self as usize)
+        (self as *const Self as usize as u64).into()
    }
 }

@@ -161,19 +159,20 @@ impl Inner {

    pub fn pre_present_notify(&self) {}

-    pub fn surface_position(&self) -> PhysicalPosition<i32> {
-        let view_position = self.view.frame().origin;
+    pub fn inner_position(&self) -> PhysicalPosition<i32> {
+        let safe_area = self.safe_area_screen_space();
        let position =
-            unsafe { self.window.convertPoint_fromView(view_position, Some(&self.view)) };
-        let position = LogicalPosition::new(position.x, position.y);
-        position.to_physical(self.scale_factor())
+            LogicalPosition { x: safe_area.origin.x as f64, y: safe_area.origin.y as f64 };
+        let scale_factor = self.scale_factor();
+        position.to_physical(scale_factor)
    }

-    pub fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+    pub fn outer_position(&self) -> PhysicalPosition<i32> {
        let screen_frame = self.screen_frame();
        let position =
            LogicalPosition { x: screen_frame.origin.x as f64, y: screen_frame.origin.y as f64 };
-        Ok(position.to_physical(self.scale_factor()))
+        let scale_factor = self.scale_factor();
+        position.to_physical(scale_factor)
    }

    pub fn set_outer_position(&self, physical_position: Position) {
@@ -189,36 +188,29 @@ impl Inner {
    }

    pub fn surface_size(&self) -> PhysicalSize<u32> {
-        let frame = self.view.frame();
-        let size = LogicalSize::new(frame.size.width, frame.size.height);
-        size.to_physical(self.scale_factor())
+        let scale_factor = self.scale_factor();
+        let safe_area = self.safe_area_screen_space();
+        let size = LogicalSize {
+            width: safe_area.size.width as f64,
+            height: safe_area.size.height as f64,
+        };
+        size.to_physical(scale_factor)
    }

    pub fn outer_size(&self) -> PhysicalSize<u32> {
-        let frame = self.window.frame();
-        let size = LogicalSize::new(frame.size.width, frame.size.height);
-        size.to_physical(self.scale_factor())
+        let scale_factor = self.scale_factor();
+        let screen_frame = self.screen_frame();
+        let size = LogicalSize {
+            width: screen_frame.size.width as f64,
+            height: screen_frame.size.height as f64,
+        };
+        size.to_physical(scale_factor)
    }

    pub fn request_surface_size(&self, _size: Size) -> Option<PhysicalSize<u32>> {
        Some(self.surface_size())
    }

-    pub fn safe_area(&self) -> PhysicalInsets<u32> {
-        // Only available on iOS 11.0
-        let insets = if app_state::os_capabilities().safe_area {
-            self.view.safeAreaInsets()
-        } else {
-            // Assume the status bar frame is the only thing that obscures the view
-            let app = UIApplication::sharedApplication(MainThreadMarker::new().unwrap());
-            #[allow(deprecated)]
-            let status_bar_frame = app.statusBarFrame();
-            UIEdgeInsets { top: status_bar_frame.size.height, left: 0.0, bottom: 0.0, right: 0.0 }
-        };
-        let insets = LogicalInsets::new(insets.top, insets.left, insets.bottom, insets.right);
-        insets.to_physical(self.scale_factor())
-    }
-
    pub fn set_min_surface_size(&self, _dimensions: Option<Size>) {
        warn!("`Window::set_min_surface_size` is ignored on iOS")
    }
@@ -429,6 +421,7 @@ impl Inner {
        self.window.id()
    }

+    #[cfg(feature = "rwh_06")]
    pub fn raw_window_handle_rwh_06(&self) -> rwh_06::RawWindowHandle {
        let mut window_handle = rwh_06::UiKitWindowHandle::new({
            let ui_view = Retained::as_ptr(&self.view) as _;
@@ -522,9 +515,15 @@ impl Window {
        let scale_factor = view.contentScaleFactor();
        let scale_factor = scale_factor as f64;
        if scale_factor != 1.0 {
-            let frame = view.frame();
-            let size =
-                LogicalSize { width: frame.size.width as f64, height: frame.size.height as f64 };
+            let bounds = view.bounds();
+            let screen = window.screen();
+            let screen_space = screen.coordinateSpace();
+            let screen_frame = view.convertRect_toCoordinateSpace(bounds, &screen_space);
+            let size = LogicalSize {
+                width: screen_frame.size.width as f64,
+                height: screen_frame.size.height as f64,
+            };
+            let window_id = CoreWindowId(window.id());
            app_state::handle_nonuser_events(
                mtm,
                std::iter::once(EventWrapper::ScaleFactorChanged(app_state::ScaleFactorChanged {
@@ -534,7 +533,7 @@ impl Window {
                }))
                .chain(std::iter::once(EventWrapper::StaticEvent(
                    Event::WindowEvent {
-                        window_id: window.id(),
+                        window_id,
                        event: WindowEvent::SurfaceResized(size.to_physical(scale_factor)),
                    },
                ))),
@@ -549,6 +548,7 @@ impl Window {
        self.inner.get_on_main(|inner| f(inner))
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub(crate) fn raw_window_handle_rwh_06(
        &self,
@@ -560,6 +560,7 @@ impl Window {
        }
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub(crate) fn raw_display_handle_rwh_06(
        &self,
@@ -568,6 +569,7 @@ impl Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_display_handle_rwh_06()?;
@@ -575,6 +577,7 @@ impl rwh_06::HasDisplayHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_window_handle_rwh_06()?;
@@ -584,7 +587,7 @@ impl rwh_06::HasWindowHandle for Window {

 impl CoreWindow for Window {
    fn id(&self) -> crate::window::WindowId {
-        self.maybe_wait_on_main(|delegate| delegate.id())
+        self.maybe_wait_on_main(|delegate| crate::window::WindowId(delegate.id()))
    }

    fn scale_factor(&self) -> f64 {
@@ -603,12 +606,12 @@ impl CoreWindow for Window {
        self.maybe_wait_on_main(|delegate| delegate.reset_dead_keys());
    }

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        self.maybe_wait_on_main(|delegate| delegate.surface_position())
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        Ok(self.maybe_wait_on_main(|delegate| delegate.inner_position()))
    }

    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
-        self.maybe_wait_on_main(|delegate| delegate.outer_position())
+        Ok(self.maybe_wait_on_main(|delegate| delegate.outer_position()))
    }

    fn set_outer_position(&self, position: Position) {
@@ -627,10 +630,6 @@ impl CoreWindow for Window {
        self.maybe_wait_on_main(|delegate| delegate.outer_size())
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        self.maybe_wait_on_main(|delegate| delegate.safe_area())
-    }
-
    fn set_min_surface_size(&self, min_size: Option<Size>) {
        self.maybe_wait_on_main(|delegate| delegate.set_min_surface_size(min_size))
    }
@@ -818,10 +817,12 @@ impl CoreWindow for Window {
        })
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
@@ -889,7 +890,7 @@ impl Inner {

 impl Inner {
    fn screen_frame(&self) -> CGRect {
-        self.rect_to_screen_space(self.window.frame())
+        self.rect_to_screen_space(self.window.bounds())
    }

    fn rect_to_screen_space(&self, rect: CGRect) -> CGRect {
@@ -901,6 +902,75 @@ impl Inner {
        let screen_space = self.window.screen().coordinateSpace();
        self.window.convertRect_fromCoordinateSpace(rect, &screen_space)
    }
+
+    fn safe_area_screen_space(&self) -> CGRect {
+        let bounds = self.window.bounds();
+        if app_state::os_capabilities().safe_area {
+            let safe_area = self.window.safeAreaInsets();
+            let safe_bounds = CGRect {
+                origin: CGPoint {
+                    x: bounds.origin.x + safe_area.left,
+                    y: bounds.origin.y + safe_area.top,
+                },
+                size: CGSize {
+                    width: bounds.size.width - safe_area.left - safe_area.right,
+                    height: bounds.size.height - safe_area.top - safe_area.bottom,
+                },
+            };
+            self.rect_to_screen_space(safe_bounds)
+        } else {
+            let screen_frame = self.rect_to_screen_space(bounds);
+            let status_bar_frame = {
+                let app = UIApplication::sharedApplication(MainThreadMarker::new().unwrap());
+                #[allow(deprecated)]
+                app.statusBarFrame()
+            };
+            let (y, height) = if screen_frame.origin.y > status_bar_frame.size.height {
+                (screen_frame.origin.y, screen_frame.size.height)
+            } else {
+                let y = status_bar_frame.size.height;
+                let height = screen_frame.size.height
+                    - (status_bar_frame.size.height - screen_frame.origin.y);
+                (y, height)
+            };
+            CGRect {
+                origin: CGPoint { x: screen_frame.origin.x, y },
+                size: CGSize { width: screen_frame.size.width, height },
+            }
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId {
+    window: *mut WinitUIWindow,
+}
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        WindowId { window: std::ptr::null_mut() }
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.window as u64
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self { window: raw_id as _ }
+    }
+}
+
+unsafe impl Send for WindowId {}
+unsafe impl Sync for WindowId {}
+
+impl From<&AnyObject> for WindowId {
+    fn from(window: &AnyObject) -> WindowId {
+        WindowId { window: window as *const _ as _ }
+    }
 }

 #[derive(Clone, Debug, Default, PartialEq)]
--- a/src/platform_impl/linux/common/xkb/keymap.rs
+++ b/src/platform_impl/linux/common/xkb/keymap.rs
@@ -638,7 +638,7 @@ pub fn keysym_to_key(keysym: u32) -> Key {
        // keysyms::ISO_Release_Margin_Left => NamedKey::IsoReleaseMarginLeft,
        // keysyms::ISO_Release_Margin_Right => NamedKey::IsoReleaseMarginRight,
        // keysyms::ISO_Release_Both_Margins => NamedKey::IsoReleaseBothMargins,
-        // keysyms::ISO_Fast_Cursor_Left => NamedKey::IsoFastPointerLeft,
+        // keysyms::ISO_Fast_Cursor_Left => NamedKey::IsoFastCursorLeft,
        // keysyms::ISO_Fast_Cursor_Right => NamedKey::IsoFastCursorRight,
        // keysyms::ISO_Fast_Cursor_Up => NamedKey::IsoFastCursorUp,
        // keysyms::ISO_Fast_Cursor_Down => NamedKey::IsoFastCursorDown,
--- a/src/platform_impl/linux/mod.rs
+++ b/src/platform_impl/linux/mod.rs
@@ -107,6 +107,61 @@ impl Default for PlatformSpecificWindowAttributes {
 pub(crate) static X11_BACKEND: Lazy<Mutex<Result<Arc<XConnection>, XNotSupported>>> =
    Lazy::new(|| Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new)));

+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(u64);
+
+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self(raw_id)
+    }
+}
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        Self(0)
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum DeviceId {
+    #[cfg(x11_platform)]
+    X(x11::DeviceId),
+    #[cfg(wayland_platform)]
+    Wayland(wayland::DeviceId),
+}
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        #[cfg(wayland_platform)]
+        return DeviceId::Wayland(wayland::DeviceId::dummy());
+        #[cfg(all(not(wayland_platform), x11_platform))]
+        return DeviceId::X(x11::DeviceId::dummy());
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum FingerId {
+    #[cfg(x11_platform)]
+    X(x11::FingerId),
+    #[cfg(wayland_platform)]
+    Wayland(wayland::FingerId),
+}
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        #[cfg(wayland_platform)]
+        return FingerId::Wayland(wayland::FingerId::dummy());
+        #[cfg(all(not(wayland_platform), x11_platform))]
+        return FingerId::X(x11::FingerId::dummy());
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum MonitorHandle {
    #[cfg(x11_platform)]
@@ -221,7 +276,7 @@ pub(crate) enum PlatformCustomCursor {

 /// Hooks for X11 errors.
 #[cfg(x11_platform)]
-pub(crate) static XLIB_ERROR_HOOKS: Mutex<Vec<XlibErrorHook>> = Mutex::new(Vec::new());
+pub(crate) static mut XLIB_ERROR_HOOKS: Mutex<Vec<XlibErrorHook>> = Mutex::new(Vec::new());

 #[cfg(x11_platform)]
 unsafe extern "C" fn x_error_callback(
@@ -232,7 +287,7 @@ unsafe extern "C" fn x_error_callback(
    if let Ok(ref xconn) = *xconn_lock {
        // Call all the hooks.
        let mut error_handled = false;
-        for hook in XLIB_ERROR_HOOKS.lock().unwrap().iter() {
+        for hook in unsafe { XLIB_ERROR_HOOKS.lock() }.unwrap().iter() {
            error_handled |= hook(display as *mut _, event as *mut _);
        }

@@ -277,6 +332,14 @@ pub enum EventLoop {
    X(x11::EventLoop),
 }

+#[derive(Clone)]
+pub enum EventLoopProxy {
+    #[cfg(x11_platform)]
+    X(x11::EventLoopProxy),
+    #[cfg(wayland_platform)]
+    Wayland(wayland::EventLoopProxy),
+}
+
 impl EventLoop {
    pub(crate) fn new(
        attributes: &PlatformSpecificEventLoopAttributes,
@@ -286,8 +349,8 @@ impl EventLoop {
                "Initializing the event loop outside of the main thread is a significant \
                 cross-platform compatibility hazard. If you absolutely need to create an \
                 EventLoop on a different thread, you can use the \
-                 `EventLoopBuilderExtX11::with_any_thread` or \
-                 `EventLoopBuilderExtWayland::with_any_thread` functions."
+                 `EventLoopBuilderExtX11::any_thread` or `EventLoopBuilderExtWayland::any_thread` \
+                 functions."
            );
        }

@@ -396,6 +459,65 @@ impl AsRawFd for EventLoop {
    }
 }

+impl EventLoopProxy {
+    pub fn wake_up(&self) {
+        x11_or_wayland!(match self; EventLoopProxy(proxy) => proxy.wake_up())
+    }
+}
+
+#[derive(Clone)]
+#[allow(dead_code)]
+pub(crate) enum OwnedDisplayHandle {
+    #[cfg(x11_platform)]
+    X(Arc<XConnection>),
+    #[cfg(wayland_platform)]
+    Wayland(wayland_client::Connection),
+}
+
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        use std::ptr::NonNull;
+
+        match self {
+            #[cfg(x11_platform)]
+            Self::X(xconn) => Ok(rwh_06::XlibDisplayHandle::new(
+                NonNull::new(xconn.display.cast()),
+                xconn.default_screen_index() as _,
+            )
+            .into()),
+
+            #[cfg(wayland_platform)]
+            Self::Wayland(conn) => {
+                use sctk::reexports::client::Proxy;
+
+                Ok(rwh_06::WaylandDisplayHandle::new(
+                    NonNull::new(conn.display().id().as_ptr().cast()).unwrap(),
+                )
+                .into())
+            },
+        }
+    }
+}
+
+impl PartialEq for OwnedDisplayHandle {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            #[cfg(x11_platform)]
+            (Self::X(this), Self::X(other)) => Arc::as_ptr(this).eq(&Arc::as_ptr(other)),
+            #[cfg(wayland_platform)]
+            (Self::Wayland(this), Self::Wayland(other)) => this.eq(other),
+            #[cfg(all(x11_platform, wayland_platform))]
+            _ => false,
+        }
+    }
+}
+
+impl Eq for OwnedDisplayHandle {}
+
 /// Returns the minimum `Option<Duration>`, taking into account that `None`
 /// equates to an infinite timeout, not a zero timeout (so can't just use
 /// `Option::min`)
--- a/src/platform_impl/linux/wayland/event_loop/mod.rs
+++ b/src/platform_impl/linux/wayland/event_loop/mod.rs
@@ -16,10 +16,7 @@ use crate::cursor::OnlyCursorImage;
 use crate::dpi::LogicalSize;
 use crate::error::{EventLoopError, OsError, RequestError};
 use crate::event::{Event, StartCause, SurfaceSizeWriter, WindowEvent};
-use crate::event_loop::{
-    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
-};
+use crate::event_loop::{ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents};
 use crate::platform::pump_events::PumpStatus;
 use crate::platform_impl::platform::min_timeout;
 use crate::platform_impl::PlatformCustomCursor;
@@ -28,13 +25,12 @@ use crate::window::{CustomCursor as RootCustomCursor, CustomCursorSource, Theme}
 mod proxy;
 pub mod sink;

-use proxy::EventLoopProxy;
+pub use proxy::EventLoopProxy;
 use sink::EventSink;

 use super::state::{WindowCompositorUpdate, WinitState};
 use super::window::state::FrameCallbackState;
-use super::{logical_to_physical_rounded, WindowId};
-pub use crate::event_loop::EventLoopProxy as CoreEventLoopProxy;
+use super::{logical_to_physical_rounded, DeviceId, WindowId};

 type WaylandDispatcher = calloop::Dispatcher<'static, WaylandSource<WinitState>, WinitState>;

@@ -52,7 +48,7 @@ pub struct EventLoop {
    wayland_dispatcher: WaylandDispatcher,

    /// Connection to the wayland server.
-    handle: Arc<OwnedDisplayHandle>,
+    connection: Connection,

    /// Event loop window target.
    active_event_loop: ActiveEventLoop,
@@ -120,12 +116,11 @@ impl EventLoop {
            })
            .map_err(|err| os_error!(err))?;

-        let handle = Arc::new(OwnedDisplayHandle::new(connection));
        let active_event_loop = ActiveEventLoop {
-            handle: handle.clone(),
+            connection: connection.clone(),
            wayland_dispatcher: wayland_dispatcher.clone(),
            event_loop_awakener,
-            event_loop_proxy: EventLoopProxy::new(ping).into(),
+            event_loop_proxy: EventLoopProxy::new(ping),
            queue_handle,
            control_flow: Cell::new(ControlFlow::default()),
            exit: Cell::new(None),
@@ -137,7 +132,7 @@ impl EventLoop {
            compositor_updates: Vec::new(),
            buffer_sink: EventSink::default(),
            window_ids: Vec::new(),
-            handle,
+            connection,
            wayland_dispatcher,
            event_loop,
            active_event_loop,
@@ -231,7 +226,7 @@ impl EventLoop {
            //
            // Checking for flush error is essential to perform an exit with error, since
            // once we have a protocol error, we could get stuck retrying...
-            if self.handle.connection.flush().is_err() {
+            if self.connection.flush().is_err() {
                self.set_exit_code(1);
                return;
            }
@@ -317,12 +312,13 @@ impl EventLoop {
                let old_physical_size = physical_size;

                let new_surface_size = Arc::new(Mutex::new(physical_size));
+                let root_window_id = crate::window::WindowId(window_id);
                let event = WindowEvent::ScaleFactorChanged {
                    scale_factor,
                    surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(&new_surface_size)),
                };

-                app.window_event(&self.active_event_loop, window_id, event);
+                app.window_event(&self.active_event_loop, root_window_id, event);

                let physical_size = *new_surface_size.lock().unwrap();
                drop(new_surface_size);
@@ -365,11 +361,13 @@ impl EventLoop {
                    size
                });

+                let window_id = crate::window::WindowId(window_id);
                let event = WindowEvent::SurfaceResized(physical_size);
                app.window_event(&self.active_event_loop, window_id, event);
            }

            if compositor_update.close_window {
+                let window_id = crate::window::WindowId(window_id);
                app.window_event(&self.active_event_loop, window_id, WindowEvent::CloseRequested);
            }
        }
@@ -439,7 +437,8 @@ impl EventLoop {
            });

            if let Some(event) = event {
-                app.window_event(&self.active_event_loop, *window_id, event);
+                let window_id = crate::window::WindowId(*window_id);
+                app.window_event(&self.active_event_loop, window_id, event);
            }
        }

@@ -544,7 +543,7 @@ impl AsRawFd for EventLoop {

 pub struct ActiveEventLoop {
    /// Event loop proxy
-    event_loop_proxy: CoreEventLoopProxy,
+    event_loop_proxy: EventLoopProxy,

    /// The event loop wakeup source.
    pub event_loop_awakener: calloop::ping::Ping,
@@ -565,13 +564,17 @@ pub struct ActiveEventLoop {
    /// Dispatcher of Wayland events.
    pub wayland_dispatcher: WaylandDispatcher,

-    /// Handle for the underlying event loop.
-    pub handle: Arc<OwnedDisplayHandle>,
+    /// Connection to the wayland server.
+    pub connection: Connection,
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        self.event_loop_proxy.clone()
+    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
+        crate::event_loop::EventLoopProxy {
+            event_loop_proxy: crate::platform_impl::EventLoopProxy::Wayland(
+                self.event_loop_proxy.clone(),
+            ),
+        }
    }

    fn set_control_flow(&self, control_flow: ControlFlow) {
@@ -632,10 +635,13 @@ impl RootActiveEventLoop for ActiveEventLoop {
        None
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(self.handle.clone())
+    fn owned_display_handle(&self) -> crate::event_loop::OwnedDisplayHandle {
+        crate::event_loop::OwnedDisplayHandle {
+            platform: crate::platform_impl::OwnedDisplayHandle::Wayland(self.connection.clone()),
+        }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
@@ -655,23 +661,8 @@ impl ActiveEventLoop {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        self.handle.display_handle()
-    }
-}
-
-pub struct OwnedDisplayHandle {
-    pub(crate) connection: Connection,
-}
-
-impl OwnedDisplayHandle {
-    fn new(connection: Connection) -> Self {
-        Self { connection }
-    }
-}
-
-impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        use sctk::reexports::client::Proxy;

--- a/src/platform_impl/linux/wayland/event_loop/proxy.rs
+++ b/src/platform_impl/linux/wayland/event_loop/proxy.rs
@@ -1,30 +1,19 @@
 //! An event loop proxy.

-use std::sync::Arc;
-
 use sctk::reexports::calloop::ping::Ping;

-use crate::event_loop::{EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider};
-
 /// A handle that can be sent across the threads and used to wake up the `EventLoop`.
+#[derive(Clone)]
 pub struct EventLoopProxy {
    ping: Ping,
 }

-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.ping.ping();
-    }
-}
-
 impl EventLoopProxy {
    pub fn new(ping: Ping) -> Self {
        Self { ping }
    }
-}

-impl From<EventLoopProxy> for CoreEventLoopProxy {
-    fn from(value: EventLoopProxy) -> Self {
-        CoreEventLoopProxy::new(Arc::new(value))
+    pub fn wake_up(&self) {
+        self.ping.ping();
    }
 }
--- a/src/platform_impl/linux/wayland/event_loop/sink.rs
+++ b/src/platform_impl/linux/wayland/event_loop/sink.rs
@@ -2,8 +2,10 @@

 use std::vec::Drain;

-use crate::event::{DeviceEvent, Event, WindowEvent};
-use crate::window::WindowId;
+use super::{DeviceId, WindowId};
+use crate::event::{DeviceEvent, DeviceId as RootDeviceId, Event, WindowEvent};
+use crate::platform_impl::platform::DeviceId as PlatformDeviceId;
+use crate::window::WindowId as RootWindowId;

 /// An event loop's sink to deliver events from the Wayland event callbacks
 /// to the winit's user.
@@ -25,14 +27,17 @@ impl EventSink {

    /// Add new device event to a queue.
    #[inline]
-    pub fn push_device_event(&mut self, event: DeviceEvent) {
-        self.window_events.push(Event::DeviceEvent { event, device_id: None });
+    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.
    #[inline]
    pub fn push_window_event(&mut self, event: WindowEvent, window_id: WindowId) {
-        self.window_events.push(Event::WindowEvent { event, window_id });
+        self.window_events.push(Event::WindowEvent { event, window_id: RootWindowId(window_id) });
    }

    #[inline]
--- a/src/platform_impl/linux/wayland/mod.rs
+++ b/src/platform_impl/linux/wayland/mod.rs
@@ -1,6 +1,6 @@
 //! Winit's Wayland backend.

-pub use event_loop::{ActiveEventLoop, EventLoop};
+pub use event_loop::{ActiveEventLoop, EventLoop, EventLoopProxy};
 pub use output::{MonitorHandle, VideoModeHandle};
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
 use sctk::reexports::client::Proxy;
@@ -8,7 +8,7 @@ pub use window::Window;

 pub(super) use crate::cursor::OnlyCursorImage as CustomCursor;
 use crate::dpi::{LogicalSize, PhysicalSize};
-use crate::window::WindowId;
+pub use crate::platform_impl::platform::WindowId;

 mod event_loop;
 mod output;
@@ -17,10 +17,29 @@ mod state;
 mod types;
 mod window;

+/// Dummy device id, since Wayland doesn't have device events.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId(i32);
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId(0)
+    }
+}
+
 /// Get the WindowId out of the surface.
 #[inline]
 fn make_wid(surface: &WlSurface) -> WindowId {
-    WindowId::from_raw(surface.id().as_ptr() as usize)
+    WindowId(surface.id().as_ptr() as u64)
 }

 /// The default routine does floor, but we need round on Wayland.
--- a/src/platform_impl/linux/wayland/seat/keyboard/mod.rs
+++ b/src/platform_impl/linux/wayland/seat/keyboard/mod.rs
@@ -17,7 +17,7 @@ use crate::keyboard::ModifiersState;
 use crate::platform_impl::common::xkb::Context;
 use crate::platform_impl::wayland::event_loop::sink::EventSink;
 use crate::platform_impl::wayland::state::WinitState;
-use crate::platform_impl::wayland::{self, WindowId};
+use crate::platform_impl::wayland::{self, DeviceId, WindowId};

 impl Dispatch<WlKeyboard, KeyboardData, WinitState> for WinitState {
    fn event(
@@ -369,9 +369,10 @@ fn key_input(
        None => return,
    };

+    let device_id = crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(DeviceId));
    if let Some(mut key_context) = keyboard_state.xkb_context.key_context() {
        let event = key_context.process_key_event(keycode, state, repeat);
-        let event = WindowEvent::KeyboardInput { device_id: None, event, is_synthetic: false };
+        let event = WindowEvent::KeyboardInput { device_id, event, is_synthetic: false };
        event_sink.push_window_event(event, window_id);
    }
 }
--- a/src/platform_impl/linux/wayland/seat/mod.rs
+++ b/src/platform_impl/linux/wayland/seat/mod.rs
@@ -40,9 +40,6 @@ pub struct WinitSeatState {
    /// The mapping from touched points to the surfaces they're present.
    touch_map: AHashMap<i32, TouchPoint>,

-    /// Id of the first touch event.
-    first_touch_id: Option<i32>,
-
    /// The text input bound on the seat.
    text_input: Option<Arc<ZwpTextInputV3>>,

--- a/src/platform_impl/linux/wayland/seat/pointer/mod.rs
+++ b/src/platform_impl/linux/wayland/seat/pointer/mod.rs
@@ -27,13 +27,10 @@ use sctk::seat::pointer::{
 use sctk::seat::SeatState;

 use crate::dpi::{LogicalPosition, PhysicalPosition};
-use crate::event::{
-    ElementState, MouseButton, MouseScrollDelta, PointerKind, PointerSource, TouchPhase,
-    WindowEvent,
-};
+use crate::event::{ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent};

 use crate::platform_impl::wayland::state::WinitState;
-use crate::platform_impl::wayland::{self, WindowId};
+use crate::platform_impl::wayland::{self, DeviceId, WindowId};

 pub mod relative_pointer;

@@ -62,6 +59,8 @@ impl PointerHandler for WinitState {
            },
        };

+        let device_id = crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(DeviceId));
+
        for event in events {
            let surface = &event.surface;

@@ -125,20 +124,18 @@ impl PointerHandler for WinitState {
                },
                // Regular events on the main surface.
                PointerEventKind::Enter { .. } => {
-                    self.events_sink.push_window_event(
-                        WindowEvent::PointerEntered {
-                            primary: true,
-                            device_id: None,
-                            position,
-                            kind: PointerKind::Mouse,
-                        },
-                        window_id,
-                    );
+                    self.events_sink
+                        .push_window_event(WindowEvent::CursorEntered { device_id }, window_id);

                    window.pointer_entered(Arc::downgrade(themed_pointer));

                    // Set the currently focused surface.
                    pointer.winit_data().inner.lock().unwrap().surface = Some(window_id);
+
+                    self.events_sink.push_window_event(
+                        WindowEvent::CursorMoved { device_id, position },
+                        window_id,
+                    );
                },
                PointerEventKind::Leave { .. } => {
                    window.pointer_left(Arc::downgrade(themed_pointer));
@@ -146,24 +143,12 @@ impl PointerHandler for WinitState {
                    // Remove the active surface.
                    pointer.winit_data().inner.lock().unwrap().surface = None;

-                    self.events_sink.push_window_event(
-                        WindowEvent::PointerLeft {
-                            primary: true,
-                            device_id: None,
-                            position: Some(position),
-                            kind: PointerKind::Mouse,
-                        },
-                        window_id,
-                    );
+                    self.events_sink
+                        .push_window_event(WindowEvent::CursorLeft { device_id }, window_id);
                },
                PointerEventKind::Motion { .. } => {
                    self.events_sink.push_window_event(
-                        WindowEvent::PointerMoved {
-                            primary: true,
-                            device_id: None,
-                            position,
-                            source: PointerSource::Mouse,
-                        },
+                        WindowEvent::CursorMoved { device_id, position },
                        window_id,
                    );
                },
@@ -179,13 +164,7 @@ impl PointerHandler for WinitState {
                        ElementState::Released
                    };
                    self.events_sink.push_window_event(
-                        WindowEvent::PointerButton {
-                            primary: true,
-                            device_id: None,
-                            state,
-                            position,
-                            button: button.into(),
-                        },
+                        WindowEvent::MouseInput { device_id, state, button },
                        window_id,
                    );
                },
@@ -230,7 +209,7 @@ impl PointerHandler for WinitState {
                    };

                    self.events_sink.push_window_event(
-                        WindowEvent::MouseWheel { device_id: None, delta, phase },
+                        WindowEvent::MouseWheel { device_id, delta, phase },
                        window_id,
                    )
                },
--- a/src/platform_impl/linux/wayland/seat/pointer/relative_pointer.rs
+++ b/src/platform_impl/linux/wayland/seat/pointer/relative_pointer.rs
@@ -66,9 +66,10 @@ impl Dispatch<ZwpRelativePointerV1, GlobalData, WinitState> for RelativePointerS
            },
            _ => return,
        };
-        state
-            .events_sink
-            .push_device_event(DeviceEvent::PointerMotion { delta: (dx_unaccel, dy_unaccel) });
+        state.events_sink.push_device_event(
+            DeviceEvent::MouseMotion { delta: (dx_unaccel, dy_unaccel) },
+            super::DeviceId,
+        );
    }
 }

--- a/src/platform_impl/linux/wayland/seat/touch/mod.rs
+++ b/src/platform_impl/linux/wayland/seat/touch/mod.rs
@@ -8,9 +8,9 @@ use sctk::seat::touch::{TouchData, TouchHandler};
 use tracing::warn;

 use crate::dpi::LogicalPosition;
-use crate::event::{ButtonSource, ElementState, FingerId, PointerKind, PointerSource, WindowEvent};
-use crate::platform_impl::wayland;
+use crate::event::{Touch, TouchPhase, WindowEvent};
 use crate::platform_impl::wayland::state::WinitState;
+use crate::platform_impl::wayland::{self, DeviceId, FingerId};

 impl TouchHandler for WinitState {
    fn down(
@@ -40,33 +40,20 @@ impl TouchHandler for WinitState {

        // Update the state of the point.
        let location = LogicalPosition::<f64>::from(position);
-        // Only update primary finger once we don't have any touch.
-        if seat_state.touch_map.is_empty() {
-            seat_state.first_touch_id = Some(id);
-        }
-        let primary = seat_state.first_touch_id == Some(id);
        seat_state.touch_map.insert(id, TouchPoint { surface, location });

-        let position = location.to_physical(scale_factor);
-        let finger_id = FingerId::from_raw(id as usize);
-
        self.events_sink.push_window_event(
-            WindowEvent::PointerEntered {
-                device_id: None,
-                primary,
-                position,
-                kind: PointerKind::Touch(finger_id),
-            },
-            window_id,
-        );
-        self.events_sink.push_window_event(
-            WindowEvent::PointerButton {
-                device_id: None,
-                primary,
-                state: ElementState::Pressed,
-                position,
-                button: ButtonSource::Touch { finger_id, force: None },
-            },
+            WindowEvent::Touch(Touch {
+                device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
+                    DeviceId,
+                )),
+                phase: TouchPhase::Started,
+                location: location.to_physical(scale_factor),
+                force: None,
+                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
+                    FingerId(id),
+                )),
+            }),
            window_id,
        );
    }
@@ -94,41 +81,24 @@ impl TouchHandler for WinitState {
            None => return,
        };

-        // Update the primary touch point.
-        let primary = seat_state.first_touch_id == Some(id);
-        // Reset primary finger once all the other fingers are lifted to not transfer primary
-        // finger to some other finger and still accept it when it's briefly moved between the
-        // windows.
-        if seat_state.touch_map.is_empty() {
-            seat_state.first_touch_id = None;
-        }
-
        let window_id = wayland::make_wid(&touch_point.surface);
        let scale_factor = match self.windows.get_mut().get(&window_id) {
            Some(window) => window.lock().unwrap().scale_factor(),
            None => return,
        };

-        let position = touch_point.location.to_physical(scale_factor);
-        let finger_id = FingerId::from_raw(id as usize);
-
        self.events_sink.push_window_event(
-            WindowEvent::PointerButton {
-                device_id: None,
-                primary,
-                state: ElementState::Released,
-                position,
-                button: ButtonSource::Touch { finger_id, force: None },
-            },
-            window_id,
-        );
-        self.events_sink.push_window_event(
-            WindowEvent::PointerLeft {
-                device_id: None,
-                primary,
-                position: Some(position),
-                kind: PointerKind::Touch(finger_id),
-            },
+            WindowEvent::Touch(Touch {
+                device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
+                    DeviceId,
+                )),
+                phase: TouchPhase::Ended,
+                location: touch_point.location.to_physical(scale_factor),
+                force: None,
+                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
+                    FingerId(id),
+                )),
+            }),
            window_id,
        );
    }
@@ -156,8 +126,6 @@ impl TouchHandler for WinitState {
            None => return,
        };

-        let primary = seat_state.first_touch_id == Some(id);
-
        let window_id = wayland::make_wid(&touch_point.surface);
        let scale_factor = match self.windows.get_mut().get(&window_id) {
            Some(window) => window.lock().unwrap().scale_factor(),
@@ -167,15 +135,17 @@ impl TouchHandler for WinitState {
        touch_point.location = LogicalPosition::<f64>::from(position);

        self.events_sink.push_window_event(
-            WindowEvent::PointerMoved {
-                device_id: None,
-                primary,
-                position: touch_point.location.to_physical(scale_factor),
-                source: PointerSource::Touch {
-                    finger_id: FingerId::from_raw(id as usize),
-                    force: None,
-                },
-            },
+            WindowEvent::Touch(Touch {
+                device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
+                    DeviceId,
+                )),
+                phase: TouchPhase::Moved,
+                location: touch_point.location.to_physical(scale_factor),
+                force: None,
+                finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
+                    FingerId(id),
+                )),
+            }),
            window_id,
        );
    }
@@ -196,21 +166,23 @@ impl TouchHandler for WinitState {
                None => return,
            };

-            let primary = seat_state.first_touch_id == Some(id);
-            let position = touch_point.location.to_physical(scale_factor);
+            let location = touch_point.location.to_physical(scale_factor);

            self.events_sink.push_window_event(
-                WindowEvent::PointerLeft {
-                    device_id: None,
-                    primary,
-                    position: Some(position),
-                    kind: PointerKind::Touch(FingerId::from_raw(id as usize)),
-                },
+                WindowEvent::Touch(Touch {
+                    device_id: crate::event::DeviceId(crate::platform_impl::DeviceId::Wayland(
+                        DeviceId,
+                    )),
+                    phase: TouchPhase::Cancelled,
+                    location,
+                    force: None,
+                    finger_id: crate::event::FingerId(crate::platform_impl::FingerId::Wayland(
+                        FingerId(id),
+                    )),
+                }),
                window_id,
            );
        }
-
-        seat_state.first_touch_id = None;
    }

    fn shape(
--- a/src/platform_impl/linux/wayland/types/xdg_activation.rs
+++ b/src/platform_impl/linux/wayland/types/xdg_activation.rs
@@ -14,7 +14,8 @@ use sctk::reexports::protocols::xdg::activation::v1::client::xdg_activation_v1::

 use crate::event_loop::AsyncRequestSerial;
 use crate::platform_impl::wayland::state::WinitState;
-use crate::window::{ActivationToken, WindowId};
+use crate::platform_impl::WindowId;
+use crate::window::ActivationToken;

 pub struct XdgActivationState {
    xdg_activation: XdgActivationV1,
--- a/src/platform_impl/linux/wayland/window/mod.rs
+++ b/src/platform_impl/linux/wayland/window/mod.rs
@@ -16,8 +16,8 @@ use super::event_loop::sink::EventSink;
 use super::output::MonitorHandle;
 use super::state::WinitState;
 use super::types::xdg_activation::XdgActivationTokenData;
-use super::ActiveEventLoop;
-use crate::dpi::{LogicalSize, PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use super::{ActiveEventLoop, WindowId};
+use crate::dpi::{LogicalSize, PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::event::{Ime, WindowEvent};
 use crate::event_loop::AsyncRequestSerial;
@@ -25,8 +25,8 @@ use crate::monitor::MonitorHandle as CoreMonitorHandle;
 use crate::platform_impl::{Fullscreen, MonitorHandle as PlatformMonitorHandle};
 use crate::window::{
    Cursor, CursorGrabMode, Fullscreen as CoreFullscreen, ImePurpose, ResizeDirection, Theme,
-    UserAttentionType, Window as CoreWindow, WindowAttributes, WindowButtons, WindowId,
-    WindowLevel,
+    UserAttentionType, Window as CoreWindow, WindowAttributes, WindowButtons,
+    WindowId as CoreWindowId, WindowLevel,
 };

 pub(crate) mod state;
@@ -87,7 +87,7 @@ impl Window {
        let compositor = state.compositor_state.clone();
        let xdg_activation =
            state.xdg_activation.as_ref().map(|activation_state| activation_state.global().clone());
-        let display = event_loop_window_target.handle.connection.display();
+        let display = event_loop_window_target.connection.display();

        let size: Size = attributes.surface_size.unwrap_or(LogicalSize::new(800., 600.).into());

@@ -103,7 +103,7 @@ impl Window {
            state.xdg_shell.create_window(surface.clone(), default_decorations, &queue_handle);

        let mut window_state = WindowState::new(
-            event_loop_window_target.handle.clone(),
+            event_loop_window_target.connection.clone(),
            &event_loop_window_target.queue_handle,
            &state,
            size,
@@ -248,6 +248,7 @@ impl Drop for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::WaylandWindowHandle::new({
@@ -259,6 +260,7 @@ impl rwh_06::HasWindowHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::WaylandDisplayHandle::new({
@@ -271,8 +273,8 @@ impl rwh_06::HasDisplayHandle for Window {
 }

 impl CoreWindow for Window {
-    fn id(&self) -> WindowId {
-        self.window_id
+    fn id(&self) -> CoreWindowId {
+        CoreWindowId(self.window_id)
    }

    fn request_redraw(&self) {
@@ -303,8 +305,9 @@ impl CoreWindow for Window {
        crate::platform_impl::common::xkb::reset_dead_keys()
    }

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        (0, 0).into()
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        Err(NotSupportedError::new("window position information is not available on Wayland")
+            .into())
    }

    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
@@ -335,10 +338,6 @@ impl CoreWindow for Window {
        super::logical_to_physical_rounded(window_state.outer_size(), scale_factor)
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        PhysicalInsets::new(0, 0, 0, 0)
-    }
-
    fn set_min_surface_size(&self, min_size: Option<Size>) {
        let scale_factor = self.scale_factor();
        let min_size = min_size.map(|size| size.to_logical(scale_factor));
@@ -649,11 +648,13 @@ impl CoreWindow for Window {
    }

    /// Get the raw-window-handle v0.6 display handle.
+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

    /// Get the raw-window-handle v0.6 window handle.
+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
--- a/src/platform_impl/linux/wayland/window/state.rs
+++ b/src/platform_impl/linux/wayland/window/state.rs
@@ -10,7 +10,7 @@ use sctk::reexports::client::backend::ObjectId;
 use sctk::reexports::client::protocol::wl_seat::WlSeat;
 use sctk::reexports::client::protocol::wl_shm::WlShm;
 use sctk::reexports::client::protocol::wl_surface::WlSurface;
-use sctk::reexports::client::{Proxy, QueueHandle};
+use sctk::reexports::client::{Connection, Proxy, QueueHandle};
 use sctk::reexports::csd_frame::{
    DecorationsFrame, FrameAction, FrameClick, ResizeEdge, WindowState as XdgWindowState,
 };
@@ -31,7 +31,6 @@ use wayland_protocols_plasma::blur::client::org_kde_kwin_blur::OrgKdeKwinBlur;
 use crate::cursor::CustomCursor as RootCustomCursor;
 use crate::dpi::{LogicalPosition, LogicalSize, PhysicalSize, Size};
 use crate::error::{NotSupportedError, RequestError};
-use crate::platform_impl::wayland::event_loop::OwnedDisplayHandle;
 use crate::platform_impl::wayland::logical_to_physical_rounded;
 use crate::platform_impl::wayland::seat::{
    PointerConstraintsState, WinitPointerData, WinitPointerDataExt, ZwpTextInputV3Ext,
@@ -39,8 +38,8 @@ use crate::platform_impl::wayland::seat::{
 use crate::platform_impl::wayland::state::{WindowCompositorUpdate, WinitState};
 use crate::platform_impl::wayland::types::cursor::{CustomCursor, SelectedCursor};
 use crate::platform_impl::wayland::types::kwin_blur::KWinBlurManager;
-use crate::platform_impl::PlatformCustomCursor;
-use crate::window::{CursorGrabMode, CursorIcon, ImePurpose, ResizeDirection, Theme, WindowId};
+use crate::platform_impl::{PlatformCustomCursor, WindowId};
+use crate::window::{CursorGrabMode, CursorIcon, ImePurpose, ResizeDirection, Theme};

 #[cfg(feature = "sctk-adwaita")]
 pub type WinitFrame = sctk_adwaita::AdwaitaFrame<WinitState>;
@@ -53,7 +52,7 @@ const MIN_WINDOW_SIZE: LogicalSize<u32> = LogicalSize::new(2, 1);
 /// The state of the window which is being updated from the [`WinitState`].
 pub struct WindowState {
    /// The connection to Wayland server.
-    pub handle: Arc<OwnedDisplayHandle>,
+    pub connection: Connection,

    /// The `Shm` to set cursor.
    pub shm: WlShm,
@@ -162,7 +161,7 @@ pub struct WindowState {
 impl WindowState {
    /// Create new window state.
    pub fn new(
-        handle: Arc<OwnedDisplayHandle>,
+        connection: Connection,
        queue_handle: &QueueHandle<WinitState>,
        winit_state: &WinitState,
        initial_size: Size,
@@ -184,7 +183,7 @@ impl WindowState {
            blur: None,
            blur_manager: winit_state.kwin_blur_manager.clone(),
            compositor,
-            handle,
+            connection,
            csd_fails: false,
            cursor_grab_mode: GrabState::new(),
            selected_cursor: Default::default(),
@@ -694,7 +693,7 @@ impl WindowState {
        }

        self.apply_on_pointer(|pointer, _| {
-            if pointer.set_cursor(&self.handle.connection, cursor_icon).is_err() {
+            if pointer.set_cursor(&self.connection, cursor_icon).is_err() {
                warn!("Failed to set cursor to {:?}", cursor_icon);
            }
        })
--- a/src/platform_impl/linux/x11/activation.rs
+++ b/src/platform_impl/linux/x11/activation.rs
@@ -172,7 +172,7 @@ fn push_display(buffer: &mut Vec<u8>, display: &impl std::fmt::Display) {
        }
    }

-    write!(Writer { buffer }, "{display}").unwrap();
+    write!(Writer { buffer }, "{}", display).unwrap();
 }

 #[cfg(test)]
--- a/src/platform_impl/linux/x11/event_processor.rs
+++ b/src/platform_impl/linux/x11/event_processor.rs
@@ -22,9 +22,8 @@ use xkbcommon_dl::xkb_mod_mask_t;

 use crate::dpi::{PhysicalPosition, PhysicalSize};
 use crate::event::{
-    ButtonSource, DeviceEvent, DeviceId, ElementState, Event, FingerId, Ime, MouseButton,
-    MouseScrollDelta, PointerKind, PointerSource, RawKeyEvent, SurfaceSizeWriter, TouchPhase,
-    WindowEvent,
+    DeviceEvent, ElementState, Event, Ime, MouseButton, MouseScrollDelta, RawKeyEvent,
+    SurfaceSizeWriter, Touch, TouchPhase, WindowEvent,
 };
 use crate::keyboard::ModifiersState;
 use crate::platform_impl::common::xkb::{self, XkbState};
@@ -34,8 +33,8 @@ use crate::platform_impl::platform::x11::ActiveEventLoop;
 use crate::platform_impl::x11::atoms::*;
 use crate::platform_impl::x11::util::cookie::GenericEventCookie;
 use crate::platform_impl::x11::{
-    mkdid, mkwid, util, CookieResultExt, Device, DeviceInfo, Dnd, DndState, ImeReceiver,
-    ScrollOrientation, UnownedWindow, WindowId,
+    mkdid, mkfid, mkwid, util, CookieResultExt, Device, DeviceId, DeviceInfo, Dnd, DndState,
+    ImeReceiver, ScrollOrientation, UnownedWindow, WindowId,
 };

 /// The maximum amount of X modifiers to replay.
@@ -143,18 +142,8 @@ impl EventProcessor {
    {
        let event_type = xev.get_type();

-        // If we have IME disabled, don't try to `filter_event`, since only IME can consume them
-        // and forward back. This is not desired for e.g. games since some IMEs may delay the input
-        // and game can toggle IME back when e.g. typing into some field where latency won't really
-        // matter.
-        if event_type == xlib::KeyPress || event_type == xlib::KeyRelease {
-            let ime = self.target.ime.as_ref();
-            let window = self.active_window.map(|window| window as XWindow);
-            let forward_to_ime = ime
-                .and_then(|ime| window.map(|window| ime.borrow().is_ime_allowed(window)))
-                .unwrap_or(false);
-
-            if forward_to_ime && self.filter_event(xev) {
+        if self.filter_event(xev) {
+            if event_type == xlib::KeyPress || event_type == xlib::KeyRelease {
                let xev: &XKeyEvent = xev.as_ref();
                if self.xmodmap.is_modifier(xev.keycode as u8) {
                    // Don't grow the buffer past the `MAX_MOD_REPLAY_LEN`. This could happen
@@ -167,8 +156,7 @@ impl EventProcessor {
                    self.xfiltered_modifiers.push_front(xev.serial);
                }
            }
-        } else {
-            self.filter_event(xev);
+            return;
        }

        match event_type {
@@ -250,8 +238,15 @@ impl EventProcessor {
                        self.xinput2_unfocused(xev, &mut callback);
                    },
                    xinput2::XI_TouchBegin | xinput2::XI_TouchUpdate | xinput2::XI_TouchEnd => {
+                        let phase = match evtype {
+                            xinput2::XI_TouchBegin => TouchPhase::Started,
+                            xinput2::XI_TouchUpdate => TouchPhase::Moved,
+                            xinput2::XI_TouchEnd => TouchPhase::Ended,
+                            _ => unreachable!(),
+                        };
+
                        let xev: &XIDeviceEvent = unsafe { xev.as_event() };
-                        self.xinput2_touch(xev, evtype, &mut callback);
+                        self.xinput2_touch(xev, phase, &mut callback);
                    },
                    xinput2::XI_RawButtonPress | xinput2::XI_RawButtonRelease => {
                        let state = match evtype {
@@ -331,7 +326,7 @@ impl EventProcessor {
        let mut devices = self.devices.borrow_mut();
        if let Some(info) = DeviceInfo::get(&self.target.xconn, device as _) {
            for info in info.iter() {
-                devices.insert(mkdid(info.deviceid as xinput::DeviceId), Device::new(info));
+                devices.insert(DeviceId(info.deviceid as _), Device::new(info));
            }
        }
    }
@@ -341,7 +336,7 @@ impl EventProcessor {
        F: Fn(&Arc<UnownedWindow>) -> Ret,
    {
        let mut deleted = false;
-        let window_id = WindowId::from_raw(window_id as _);
+        let window_id = WindowId(window_id as _);
        let result = self
            .target
            .windows
@@ -810,7 +805,7 @@ impl EventProcessor {

        // In the event that the window's been destroyed without being dropped first, we
        // cleanup again here.
-        self.target.windows.borrow_mut().remove(&WindowId::from_raw(window as _));
+        self.target.windows.borrow_mut().remove(&WindowId(window as _));

        // Since all XIM stuff needs to happen from the same thread, we destroy the input
        // context here instead of when dropping the window.
@@ -883,6 +878,7 @@ impl EventProcessor {
        };

        let window_id = mkwid(window);
+        let device_id = mkdid(util::VIRTUAL_CORE_KEYBOARD);

        let keycode = xev.keycode as _;

@@ -946,11 +942,7 @@ impl EventProcessor {
                let event = key_processor.process_key_event(keycode, state, repeat);
                let event = Event::WindowEvent {
                    window_id,
-                    event: WindowEvent::KeyboardInput {
-                        device_id: None,
-                        event,
-                        is_synthetic: false,
-                    },
+                    event: WindowEvent::KeyboardInput { device_id, event, is_synthetic: false },
                };
                callback(&self.target, event);
            }
@@ -1020,7 +1012,7 @@ impl EventProcessor {
        F: FnMut(&ActiveEventLoop, Event),
    {
        let window_id = mkwid(event.event as xproto::Window);
-        let device_id = Some(mkdid(event.deviceid as xinput::DeviceId));
+        let device_id = mkdid(event.deviceid as xinput::DeviceId);

        // Set the timestamp.
        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);
@@ -1030,30 +1022,16 @@ impl EventProcessor {
            return;
        }

-        let position = PhysicalPosition::new(event.event_x, event.event_y);
-
        let event = match event.detail as u32 {
-            xlib::Button1 => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Left.into(),
+            xlib::Button1 => {
+                WindowEvent::MouseInput { device_id, state, button: MouseButton::Left }
            },
-            xlib::Button2 => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Middle.into(),
+            xlib::Button2 => {
+                WindowEvent::MouseInput { device_id, state, button: MouseButton::Middle }
            },

-            xlib::Button3 => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Right.into(),
+            xlib::Button3 => {
+                WindowEvent::MouseInput { device_id, state, button: MouseButton::Right }
            },

            // Suppress emulated scroll wheel clicks, since we handle the real motion events for
@@ -1071,28 +1049,10 @@ impl EventProcessor {
                },
                phase: TouchPhase::Moved,
            },
-            8 => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Back.into(),
-            },
+            8 => WindowEvent::MouseInput { device_id, state, button: MouseButton::Back },

-            9 => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Forward.into(),
-            },
-            x => WindowEvent::PointerButton {
-                device_id,
-                primary: true,
-                state,
-                position,
-                button: MouseButton::Other(x as u16).into(),
-            },
+            9 => WindowEvent::MouseInput { device_id, state, button: MouseButton::Forward },
+            x => WindowEvent::MouseInput { device_id, state, button: MouseButton::Other(x as u16) },
        };

        let event = Event::WindowEvent { window_id, event };
@@ -1106,7 +1066,7 @@ impl EventProcessor {
        // Set the timestamp.
        self.target.xconn.set_timestamp(event.time as xproto::Timestamp);

-        let device_id = Some(mkdid(event.deviceid as xinput::DeviceId));
+        let device_id = mkdid(event.deviceid as xinput::DeviceId);
        let window = event.event as xproto::Window;
        let window_id = mkwid(window);
        let new_cursor_pos = (event.event_x, event.event_y);
@@ -1121,12 +1081,7 @@ impl EventProcessor {

            let event = Event::WindowEvent {
                window_id,
-                event: WindowEvent::PointerMoved {
-                    device_id,
-                    primary: true,
-                    position,
-                    source: PointerSource::Mouse,
-                },
+                event: WindowEvent::CursorMoved { device_id, position },
            };
            callback(&self.target, event);
        } else if cursor_moved.is_none() {
@@ -1138,7 +1093,7 @@ impl EventProcessor {
            slice::from_raw_parts(event.valuators.mask, event.valuators.mask_len as usize)
        };
        let mut devices = self.devices.borrow_mut();
-        let physical_device = match devices.get_mut(&mkdid(event.sourceid as xinput::DeviceId)) {
+        let physical_device = match devices.get_mut(&DeviceId(event.sourceid as xinput::DeviceId)) {
            Some(device) => device,
            None => return,
        };
@@ -1197,7 +1152,7 @@ impl EventProcessor {
                if device_info.deviceid == event.sourceid
                    || device_info.attachment == event.sourceid
                {
-                    let device_id = mkdid(device_info.deviceid as xinput::DeviceId);
+                    let device_id = DeviceId(device_info.deviceid as _);
                    if let Some(device) = devices.get_mut(&device_id) {
                        device.reset_scroll_position(device_info);
                    }
@@ -1206,17 +1161,15 @@ impl EventProcessor {
        }

        if self.window_exists(window) {
-            let device_id = Some(device_id);
            let position = PhysicalPosition::new(event.event_x, event.event_y);

+            let event =
+                Event::WindowEvent { window_id, event: WindowEvent::CursorEntered { device_id } };
+            callback(&self.target, event);
+
            let event = Event::WindowEvent {
                window_id,
-                event: WindowEvent::PointerEntered {
-                    device_id,
-                    primary: true,
-                    position,
-                    kind: PointerKind::Mouse,
-                },
+                event: WindowEvent::CursorMoved { device_id, position },
            };
            callback(&self.target, event);
        }
@@ -1236,11 +1189,8 @@ impl EventProcessor {
        if self.window_exists(window) {
            let event = Event::WindowEvent {
                window_id: mkwid(window),
-                event: WindowEvent::PointerLeft {
-                    device_id: Some(mkdid(event.deviceid as xinput::DeviceId)),
-                    primary: true,
-                    position: Some(PhysicalPosition::new(event.event_x, event.event_y)),
-                    kind: PointerKind::Mouse,
+                event: WindowEvent::CursorLeft {
+                    device_id: mkdid(event.deviceid as xinput::DeviceId),
                },
            };
            callback(&self.target, event);
@@ -1291,20 +1241,16 @@ impl EventProcessor {

        // The deviceid for this event is for a keyboard instead of a pointer,
        // so we have to do a little extra work.
-        let device_id = self
+        let pointer_id = self
            .devices
            .borrow()
-            .get(&mkdid(xev.deviceid as xinput::DeviceId))
-            .map(|device| mkdid(device.attachment as xinput::DeviceId));
+            .get(&DeviceId(xev.deviceid as xinput::DeviceId))
+            .map(|device| device.attachment)
+            .unwrap_or(2);

        let event = Event::WindowEvent {
            window_id,
-            event: WindowEvent::PointerMoved {
-                device_id,
-                primary: true,
-                position,
-                source: PointerSource::Mouse,
-            },
+            event: WindowEvent::CursorMoved { device_id: mkdid(pointer_id as _), position },
        };
        callback(&self.target, event);
    }
@@ -1360,7 +1306,7 @@ impl EventProcessor {
        }
    }

-    fn xinput2_touch<F>(&mut self, xev: &XIDeviceEvent, phase: i32, mut callback: F)
+    fn xinput2_touch<F>(&mut self, xev: &XIDeviceEvent, phase: TouchPhase, mut callback: F)
    where
        F: FnMut(&ActiveEventLoop, Event),
    {
@@ -1371,89 +1317,32 @@ impl EventProcessor {
        if self.window_exists(window) {
            let window_id = mkwid(window);
            let id = xev.detail as u32;
-            let position = PhysicalPosition::new(xev.event_x, xev.event_y);
+            let location = PhysicalPosition::new(xev.event_x, xev.event_y);

            // Mouse cursor position changes when touch events are received.
            // Only the first concurrently active touch ID moves the mouse cursor.
-            let is_first_touch =
-                is_first_touch(&mut self.first_touch, &mut self.num_touch, id, phase);
-            if is_first_touch {
+            if is_first_touch(&mut self.first_touch, &mut self.num_touch, id, phase) {
                let event = Event::WindowEvent {
                    window_id,
-                    event: WindowEvent::PointerMoved {
-                        device_id: None,
-                        primary: true,
-                        position: position.cast(),
-                        source: PointerSource::Mouse,
+                    event: WindowEvent::CursorMoved {
+                        device_id: mkdid(util::VIRTUAL_CORE_POINTER),
+                        position: location.cast(),
                    },
                };
                callback(&self.target, event);
            }

-            let device_id = Some(mkdid(xev.deviceid as xinput::DeviceId));
-            let finger_id = FingerId::from_raw(id as usize);
-
-            match phase {
-                xinput2::XI_TouchBegin => {
-                    let event = Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerEntered {
-                            device_id,
-                            primary: is_first_touch,
-                            position,
-                            kind: PointerKind::Touch(finger_id),
-                        },
-                    };
-                    callback(&self.target, event);
-                    let event = Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerButton {
-                            device_id,
-                            primary: is_first_touch,
-                            state: ElementState::Pressed,
-                            position,
-                            button: ButtonSource::Touch { finger_id, force: None },
-                        },
-                    };
-                    callback(&self.target, event);
-                },
-                xinput2::XI_TouchUpdate => {
-                    let event = Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerMoved {
-                            device_id,
-                            primary: is_first_touch,
-                            position,
-                            source: PointerSource::Touch { finger_id, force: None },
-                        },
-                    };
-                    callback(&self.target, event);
-                },
-                xinput2::XI_TouchEnd => {
-                    let event = Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerButton {
-                            device_id,
-                            primary: is_first_touch,
-                            state: ElementState::Released,
-                            position,
-                            button: ButtonSource::Touch { finger_id, force: None },
-                        },
-                    };
-                    callback(&self.target, event);
-                    let event = Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerLeft {
-                            device_id,
-                            primary: is_first_touch,
-                            position: Some(position),
-                            kind: PointerKind::Touch(finger_id),
-                        },
-                    };
-                    callback(&self.target, event);
-                },
-                _ => unreachable!(),
-            }
+            let event = Event::WindowEvent {
+                window_id,
+                event: WindowEvent::Touch(Touch {
+                    device_id: mkdid(xev.deviceid as xinput::DeviceId),
+                    phase,
+                    location,
+                    force: None, // TODO
+                    finger_id: mkfid(id),
+                }),
+            };
+            callback(&self.target, event)
        }
    }

@@ -1466,7 +1355,7 @@ impl EventProcessor {

        if xev.flags & xinput2::XIPointerEmulated == 0 {
            let event = Event::DeviceEvent {
-                device_id: Some(mkdid(xev.deviceid as xinput::DeviceId)),
+                device_id: mkdid(xev.deviceid as xinput::DeviceId),
                event: DeviceEvent::Button { state, button: xev.detail as u32 },
            };
            callback(&self.target, event);
@@ -1480,7 +1369,7 @@ impl EventProcessor {
        // Set the timestamp.
        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);

-        let did = Some(mkdid(xev.deviceid as xinput::DeviceId));
+        let did = mkdid(xev.deviceid as xinput::DeviceId);

        let mask =
            unsafe { slice::from_raw_parts(xev.valuators.mask, xev.valuators.mask_len as usize) };
@@ -1509,7 +1398,7 @@ impl EventProcessor {
        if let Some(mouse_delta) = mouse_delta.consume() {
            let event = Event::DeviceEvent {
                device_id: did,
-                event: DeviceEvent::PointerMotion { delta: mouse_delta },
+                event: DeviceEvent::MouseMotion { delta: mouse_delta },
            };
            callback(&self.target, event);
        }
@@ -1532,7 +1421,7 @@ impl EventProcessor {
        // Set the timestamp.
        self.target.xconn.set_timestamp(xev.time as xproto::Timestamp);

-        let device_id = Some(mkdid(xev.sourceid as xinput::DeviceId));
+        let device_id = mkdid(xev.sourceid as xinput::DeviceId);
        let keycode = xev.detail as u32;
        if keycode < KEYCODE_OFFSET as u32 {
            return;
@@ -1554,7 +1443,7 @@ impl EventProcessor {
                self.init_device(info.deviceid as xinput::DeviceId);
            } else if 0 != info.flags & (xinput2::XISlaveRemoved | xinput2::XIMasterRemoved) {
                let mut devices = self.devices.borrow_mut();
-                devices.remove(&mkdid(info.deviceid as xinput::DeviceId));
+                devices.remove(&DeviceId(info.deviceid as xinput::DeviceId));
            }
        }
    }
@@ -1806,6 +1695,8 @@ impl EventProcessor {
    ) where
        F: FnMut(&ActiveEventLoop, Event),
    {
+        let device_id = mkdid(util::VIRTUAL_CORE_KEYBOARD);
+
        // Update modifiers state and emit key events based on which keys are currently pressed.
        let xcb = target.xconn.xcb_connection().get_raw_xcb_connection();

@@ -1828,7 +1719,7 @@ impl EventProcessor {
            let event = key_processor.process_key_event(keycode as u32, state, false);
            let event = Event::WindowEvent {
                window_id,
-                event: WindowEvent::KeyboardInput { device_id: None, event, is_synthetic: true },
+                event: WindowEvent::KeyboardInput { device_id, event, is_synthetic: true },
            };
            callback(target, event);
        }
@@ -1873,15 +1764,15 @@ impl EventProcessor {
    }
 }

-fn is_first_touch(first: &mut Option<u32>, num: &mut u32, id: u32, phase: i32) -> bool {
+fn is_first_touch(first: &mut Option<u32>, num: &mut u32, id: u32, phase: TouchPhase) -> bool {
    match phase {
-        xinput2::XI_TouchBegin => {
+        TouchPhase::Started => {
            if *num == 0 {
                *first = Some(id);
            }
            *num += 1;
        },
-        xinput2::XI_TouchEnd => {
+        TouchPhase::Cancelled | TouchPhase::Ended => {
            if *first == Some(id) {
                *first = None;
            }
--- a/src/platform_impl/linux/x11/ime/mod.rs
+++ b/src/platform_impl/linux/x11/ime/mod.rs
@@ -225,16 +225,6 @@ impl Ime {
        // Create new context supporting IME input.
        let _ = self.create_context(window, allowed);
    }
-
-    pub fn is_ime_allowed(&self, window: ffi::Window) -> bool {
-        if self.is_destroyed() {
-            false
-        } else if let Some(Some(context)) = self.inner.contexts.get(&window) {
-            context.is_allowed()
-        } else {
-            false
-        }
-    }
 }

 impl Drop for Ime {
--- a/src/platform_impl/linux/x11/mod.rs
+++ b/src/platform_impl/linux/x11/mod.rs
@@ -24,20 +24,19 @@ use x11rb::xcb_ffi::ReplyOrIdError;

 use crate::application::ApplicationHandler;
 use crate::error::{EventLoopError, RequestError};
-use crate::event::{DeviceId, Event, StartCause, WindowEvent};
+use crate::event::{Event, StartCause, WindowEvent};
 use crate::event_loop::{
    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
+    OwnedDisplayHandle as RootOwnedDisplayHandle,
 };
 use crate::platform::pump_events::PumpStatus;
 use crate::platform_impl::common::xkb::Context;
-use crate::platform_impl::platform::min_timeout;
+use crate::platform_impl::platform::{min_timeout, WindowId};
 use crate::platform_impl::x11::window::Window;
-use crate::platform_impl::PlatformCustomCursor;
+use crate::platform_impl::{OwnedDisplayHandle, PlatformCustomCursor};
 use crate::window::{
    CustomCursor as RootCustomCursor, CustomCursorSource, Theme, Window as CoreWindow,
-    WindowAttributes, WindowId,
+    WindowAttributes,
 };

 mod activation;
@@ -140,7 +139,7 @@ pub struct ActiveEventLoop {
    windows: RefCell<HashMap<WindowId, Weak<UnownedWindow>>>,
    redraw_sender: WakeSender<WindowId>,
    activation_sender: WakeSender<ActivationToken>,
-    event_loop_proxy: CoreEventLoopProxy,
+    event_loop_proxy: EventLoopProxy,
    device_events: Cell<DeviceEvents>,
 }

@@ -307,7 +306,7 @@ impl EventLoop {
                sender: activation_token_sender, // not used again so no clone
                waker: waker.clone(),
            },
-            event_loop_proxy: event_loop_proxy.into(),
+            event_loop_proxy,
            device_events: Default::default(),
        };

@@ -522,14 +521,13 @@ impl EventLoop {

        // Empty activation tokens.
        while let Ok((window_id, serial)) = self.activation_receiver.try_recv() {
-            let token = self
-                .event_processor
-                .with_window(window_id.into_raw() as xproto::Window, |window| {
-                    window.generate_activation_token()
-                });
+            let token = self.event_processor.with_window(window_id.0 as xproto::Window, |window| {
+                window.generate_activation_token()
+            });

            match token {
                Some(Ok(token)) => {
+                    let window_id = crate::window::WindowId(window_id);
                    let event = WindowEvent::ActivationTokenDone {
                        serial,
                        token: crate::window::ActivationToken::_new(token),
@@ -557,6 +555,7 @@ impl EventLoop {
            }

            for window_id in windows {
+                let window_id = crate::window::WindowId(window_id);
                app.window_event(
                    &self.event_processor.target,
                    window_id,
@@ -575,9 +574,12 @@ impl EventLoop {
        while unsafe { self.event_processor.poll_one_event(xev.as_mut_ptr()) } {
            let mut xev = unsafe { xev.assume_init() };
            self.event_processor.process_event(&mut xev, |window_target, event: Event| {
-                if let Event::WindowEvent { window_id, event: WindowEvent::RedrawRequested } = event
+                if let Event::WindowEvent {
+                    window_id: crate::window::WindowId(wid),
+                    event: WindowEvent::RedrawRequested,
+                } = event
                {
-                    window_target.redraw_sender.send(window_id);
+                    window_target.redraw_sender.send(wid);
                } else {
                    match event {
                        Event::WindowEvent { window_id, event } => {
@@ -648,6 +650,21 @@ impl ActiveEventLoop {
            .expect_then_ignore_error("Failed to update device event filter");
    }

+    #[cfg(feature = "rwh_06")]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        let display_handle = rwh_06::XlibDisplayHandle::new(
+            // SAFETY: display will never be null
+            Some(
+                std::ptr::NonNull::new(self.xconn.display as *mut _)
+                    .expect("X11 display should never be null"),
+            ),
+            self.xconn.default_screen_index() as c_int,
+        );
+        Ok(display_handle.into())
+    }
+
    pub(crate) fn clear_exit(&self) {
        self.exit.set(None)
    }
@@ -662,8 +679,12 @@ impl ActiveEventLoop {
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        self.event_loop_proxy.clone()
+    fn create_proxy(&self) -> crate::event_loop::EventLoopProxy {
+        crate::event_loop::EventLoopProxy {
+            event_loop_proxy: crate::platform_impl::EventLoopProxy::X(
+                self.event_loop_proxy.clone(),
+            ),
+        }
    }

    fn create_window(
@@ -725,18 +746,28 @@ impl RootActiveEventLoop for ActiveEventLoop {
        self.exit.get().is_some()
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(self.x_connection().clone())
+    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
+        let handle = OwnedDisplayHandle::X(self.x_connection().clone());
+        RootOwnedDisplayHandle { platform: handle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        self.xconn.display_handle()
+        let raw = self.raw_display_handle_rwh_06()?;
+        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
+    }
+}
+
+impl EventLoopProxy {
+    pub fn wake_up(&self) {
+        self.ping.ping();
    }
 }

@@ -777,29 +808,37 @@ impl<'a> Deref for DeviceInfo<'a> {
    }
 }

+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(xinput::DeviceId);
+
+impl DeviceId {
+    #[allow(unused)]
+    pub const fn dummy() -> Self {
+        DeviceId(0)
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId(u32);
+
+impl FingerId {
+    #[allow(unused)]
+    pub const fn dummy() -> Self {
+        FingerId(0)
+    }
+}
+
 #[derive(Clone)]
 pub struct EventLoopProxy {
    ping: Ping,
 }

-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.ping.ping();
-    }
-}
-
 impl EventLoopProxy {
    fn new(ping: Ping) -> Self {
        Self { ping }
    }
 }

-impl From<EventLoopProxy> for CoreEventLoopProxy {
-    fn from(value: EventLoopProxy) -> Self {
-        CoreEventLoopProxy::new(Arc::new(value))
-    }
-}
-
 /// Generic sum error type for X11 errors.
 #[derive(Debug)]
 pub enum X11Error {
@@ -843,24 +882,24 @@ pub enum X11Error {
 impl fmt::Display for X11Error {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
-            X11Error::Xlib(e) => write!(f, "Xlib error: {e}"),
-            X11Error::Connect(e) => write!(f, "X11 connection error: {e}"),
-            X11Error::Connection(e) => write!(f, "X11 connection error: {e}"),
-            X11Error::XidsExhausted(e) => write!(f, "XID range exhausted: {e}"),
-            X11Error::GetProperty(e) => write!(f, "Failed to get X property {e}"),
-            X11Error::X11(e) => write!(f, "X11 error: {e:?}"),
-            X11Error::UnexpectedNull(s) => write!(f, "Xlib function returned null: {s}"),
+            X11Error::Xlib(e) => write!(f, "Xlib error: {}", e),
+            X11Error::Connect(e) => write!(f, "X11 connection error: {}", e),
+            X11Error::Connection(e) => write!(f, "X11 connection error: {}", e),
+            X11Error::XidsExhausted(e) => write!(f, "XID range exhausted: {}", e),
+            X11Error::GetProperty(e) => write!(f, "Failed to get X property {}", e),
+            X11Error::X11(e) => write!(f, "X11 error: {:?}", e),
+            X11Error::UnexpectedNull(s) => write!(f, "Xlib function returned null: {}", s),
            X11Error::InvalidActivationToken(s) => write!(
                f,
                "Invalid activation token: {}",
                std::str::from_utf8(s).unwrap_or("<invalid utf8>")
            ),
-            X11Error::MissingExtension(s) => write!(f, "Missing X11 extension: {s}"),
+            X11Error::MissingExtension(s) => write!(f, "Missing X11 extension: {}", s),
            X11Error::NoSuchVisual(visualid) => {
-                write!(f, "Could not find a matching X11 visual for ID `{visualid:x}`")
+                write!(f, "Could not find a matching X11 visual for ID `{:x}`", visualid)
            },
            X11Error::XsettingsParse(err) => {
-                write!(f, "Failed to parse xsettings: {err:?}")
+                write!(f, "Failed to parse xsettings: {:?}", err)
            },
            X11Error::NoArgb32Format => {
                f.write_str("winit only supports X11 displays with ARGB32 picture formats")
@@ -961,10 +1000,14 @@ impl<'a, E: fmt::Debug> CookieResultExt for Result<VoidCookie<'a>, E> {
 }

 fn mkwid(w: xproto::Window) -> crate::window::WindowId {
-    crate::window::WindowId::from_raw(w as _)
+    crate::window::WindowId(crate::platform_impl::platform::WindowId(w as _))
 }
-fn mkdid(w: xinput::DeviceId) -> DeviceId {
-    DeviceId::from_raw(w as i64)
+fn mkdid(w: xinput::DeviceId) -> crate::event::DeviceId {
+    crate::event::DeviceId(crate::platform_impl::DeviceId::X(DeviceId(w)))
+}
+
+fn mkfid(w: u32) -> crate::event::FingerId {
+    crate::event::FingerId(crate::platform_impl::FingerId::X(FingerId(w)))
 }

 #[derive(Debug)]
--- a/src/platform_impl/linux/x11/util/geometry.rs
+++ b/src/platform_impl/linux/x11/util/geometry.rs
@@ -67,20 +67,15 @@ pub struct FrameExtentsHeuristic {
 }

 impl FrameExtentsHeuristic {
-    pub fn surface_position(&self) -> (i32, i32) {
+    pub fn inner_pos_to_outer(&self, x: i32, y: i32) -> (i32, i32) {
        use self::FrameExtentsHeuristicPath::*;
        if self.heuristic_path != UnsupportedBordered {
-            (self.frame_extents.left as i32, self.frame_extents.top as i32)
+            (x - self.frame_extents.left as i32, y - self.frame_extents.top as i32)
        } else {
-            (0, 0)
+            (x, y)
        }
    }

-    pub fn inner_pos_to_outer(&self, x: i32, y: i32) -> (i32, i32) {
-        let (left, top) = self.surface_position();
-        (x - left, y - top)
-    }
-
    pub fn surface_size_to_outer(&self, width: u32, height: u32) -> (u32, u32) {
        (
            width.saturating_add(
--- a/src/platform_impl/linux/x11/util/input.rs
+++ b/src/platform_impl/linux/x11/util/input.rs
@@ -6,6 +6,7 @@ use x11rb::protocol::xkb;
 use super::*;

 pub const VIRTUAL_CORE_POINTER: u16 = 2;
+pub const VIRTUAL_CORE_KEYBOARD: u16 = 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.
--- a/src/platform_impl/linux/x11/window.rs
+++ b/src/platform_impl/linux/x11/window.rs
@@ -18,10 +18,10 @@ use x11rb::protocol::{randr, xinput};

 use super::util::{self, SelectedCursor};
 use super::{
-    ffi, ActiveEventLoop, CookieResultExt, ImeRequest, ImeSender, VoidCookie, XConnection,
+    ffi, ActiveEventLoop, CookieResultExt, ImeRequest, ImeSender, VoidCookie, WindowId, XConnection,
 };
 use crate::cursor::{Cursor, CustomCursor as RootCustomCursor};
-use crate::dpi::{PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::event::{Event, SurfaceSizeWriter, WindowEvent};
 use crate::event_loop::AsyncRequestSerial;
@@ -36,7 +36,7 @@ use crate::platform_impl::{
 };
 use crate::window::{
    CursorGrabMode, ImePurpose, ResizeDirection, Theme, UserAttentionType, Window as CoreWindow,
-    WindowAttributes, WindowButtons, WindowId, WindowLevel,
+    WindowAttributes, WindowButtons, WindowLevel,
 };

 pub(crate) struct Window(Arc<UnownedWindow>);
@@ -62,8 +62,8 @@ impl Window {
 }

 impl CoreWindow for Window {
-    fn id(&self) -> WindowId {
-        self.0.id()
+    fn id(&self) -> crate::window::WindowId {
+        crate::window::WindowId(self.0.id())
    }

    fn scale_factor(&self) -> f64 {
@@ -82,8 +82,8 @@ impl CoreWindow for Window {
        common::xkb::reset_dead_keys();
    }

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        self.0.surface_position()
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        self.0.inner_position()
    }

    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
@@ -106,10 +106,6 @@ impl CoreWindow for Window {
        self.0.outer_size()
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        self.0.safe_area()
-    }
-
    fn set_min_surface_size(&self, min_size: Option<Size>) {
        self.0.set_min_surface_size(min_size)
    }
@@ -298,15 +294,18 @@ impl CoreWindow for Window {
            .map(|inner| crate::monitor::MonitorHandle { inner })
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.0.raw_display_handle_rwh_06()?;
@@ -314,6 +313,7 @@ impl rwh_06::HasDisplayHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.0.raw_window_handle_rwh_06()?;
@@ -331,9 +331,7 @@ impl Drop for Window {
            window.set_fullscreen(None);
        }

-        if let Ok(c) =
-            xconn.xcb_connection().destroy_window(window.id().into_raw() as xproto::Window)
-        {
+        if let Ok(c) = xconn.xcb_connection().destroy_window(window.id().0 as xproto::Window) {
            c.ignore_error();
        }
    }
@@ -443,26 +441,15 @@ impl UnownedWindow {
    ) -> Result<UnownedWindow, RequestError> {
        let xconn = &event_loop.xconn;
        let atoms = xconn.atoms();
-
-        let screen_id = match window_attrs.platform_specific.x11.screen_id {
-            Some(id) => id,
-            None => xconn.default_screen_index() as c_int,
-        };
-
-        let screen = {
-            let screen_id_usize = usize::try_from(screen_id)
-                .map_err(|_| NotSupportedError::new("screen id must be non-negative"))?;
-            xconn.xcb_connection().setup().roots.get(screen_id_usize).ok_or(
-                NotSupportedError::new("requested screen id not present in server's response"),
-            )?
-        };
-
+        #[cfg(feature = "rwh_06")]
        let root = match window_attrs.parent_window.as_ref().map(|handle| handle.0) {
            Some(rwh_06::RawWindowHandle::Xlib(handle)) => handle.window as xproto::Window,
            Some(rwh_06::RawWindowHandle::Xcb(handle)) => handle.window.get(),
            Some(raw) => unreachable!("Invalid raw window handle {raw:?} on X11"),
-            None => screen.root,
+            None => event_loop.root,
        };
+        #[cfg(not(feature = "rwh_06"))]
+        let root = event_loop.root;

        let mut monitors = leap!(xconn.available_monitors());
        let guessed_monitor = if monitors.is_empty() {
@@ -517,10 +504,18 @@ impl UnownedWindow {
            dimensions
        };

-        // An iterator over the visuals matching screen id combined with their depths.
-        let mut all_visuals = screen
-            .allowed_depths
+        let screen_id = match window_attrs.platform_specific.x11.screen_id {
+            Some(id) => id,
+            None => xconn.default_screen_index() as c_int,
+        };
+
+        // An iterator over all of the visuals combined with their depths.
+        let mut all_visuals = xconn
+            .xcb_connection()
+            .setup()
+            .roots
            .iter()
+            .flat_map(|root| &root.allowed_depths)
            .flat_map(|depth| depth.visuals.iter().map(move |visual| (visual, depth.depth)));

        // creating
@@ -809,20 +804,6 @@ impl UnownedWindow {
                leap!(result).ignore_error();
            }

-            // Select XInput2 events
-            let mask = xinput::XIEventMask::MOTION
-                | xinput::XIEventMask::BUTTON_PRESS
-                | xinput::XIEventMask::BUTTON_RELEASE
-                | xinput::XIEventMask::ENTER
-                | xinput::XIEventMask::LEAVE
-                | xinput::XIEventMask::FOCUS_IN
-                | xinput::XIEventMask::FOCUS_OUT
-                | xinput::XIEventMask::TOUCH_BEGIN
-                | xinput::XIEventMask::TOUCH_UPDATE
-                | xinput::XIEventMask::TOUCH_END;
-            leap!(xconn.select_xinput_events(window.xwindow, super::ALL_MASTER_DEVICES, mask))
-                .ignore_error();
-
            // Set visibility (map window)
            if window_attrs.visible {
                leap!(xconn.xcb_connection().map_window(window.xwindow)).ignore_error();
@@ -846,6 +827,20 @@ impl UnownedWindow {
                }
            }

+            // Select XInput2 events
+            let mask = xinput::XIEventMask::MOTION
+                | xinput::XIEventMask::BUTTON_PRESS
+                | xinput::XIEventMask::BUTTON_RELEASE
+                | xinput::XIEventMask::ENTER
+                | xinput::XIEventMask::LEAVE
+                | xinput::XIEventMask::FOCUS_IN
+                | xinput::XIEventMask::FOCUS_OUT
+                | xinput::XIEventMask::TOUCH_BEGIN
+                | xinput::XIEventMask::TOUCH_UPDATE
+                | xinput::XIEventMask::TOUCH_END;
+            leap!(xconn.select_xinput_events(window.xwindow, super::ALL_MASTER_DEVICES, mask))
+                .ignore_error();
+
            // Try to create input context for the window.
            if let Some(ime) = event_loop.ime.as_ref() {
                ime.borrow_mut()
@@ -1225,10 +1220,11 @@ impl UnownedWindow {
                &self.shared_state_lock(),
            );

+            let window_id = crate::window::WindowId(self.id());
            let old_surface_size = PhysicalSize::new(width, height);
            let surface_size = Arc::new(Mutex::new(PhysicalSize::new(new_width, new_height)));
            callback(Event::WindowEvent {
-                window_id: self.id(),
+                window_id,
                event: WindowEvent::ScaleFactorChanged {
                    scale_factor: new_monitor.scale_factor,
                    surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(&surface_size)),
@@ -1512,7 +1508,7 @@ impl UnownedWindow {
        }
    }

-    fn inner_position_physical(&self) -> (i32, i32) {
+    pub(crate) fn inner_position_physical(&self) -> (i32, i32) {
        // This should be okay to unwrap since the only error XTranslateCoordinates can return
        // is BadWindow, and if the window handle is bad we have bigger problems.
        self.xconn
@@ -1522,14 +1518,8 @@ impl UnownedWindow {
    }

    #[inline]
-    pub fn surface_position(&self) -> PhysicalPosition<i32> {
-        let extents = self.shared_state_lock().frame_extents.clone();
-        if let Some(extents) = extents {
-            extents.surface_position().into()
-        } else {
-            self.update_cached_frame_extents();
-            self.surface_position()
-        }
+    pub fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        Ok(self.inner_position_physical().into())
    }

    pub(crate) fn set_position_inner(
@@ -1592,10 +1582,6 @@ impl UnownedWindow {
        }
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        PhysicalInsets::new(0, 0, 0, 0)
-    }
-
    pub(crate) fn request_surface_size_physical(&self, width: u32, height: u32) {
        self.xconn
            .xcb_connection()
@@ -2003,7 +1989,7 @@ impl UnownedWindow {
            .query_pointer(self.xwindow, util::VIRTUAL_CORE_POINTER)
            .map_err(|err| os_error!(err))?;

-        let window_position = self.inner_position_physical();
+        let window_position = self.inner_position()?;

        let atoms = self.xconn.atoms();
        let message = atoms[_NET_WM_MOVERESIZE];
@@ -2030,8 +2016,8 @@ impl UnownedWindow {
                        | xproto::EventMask::SUBSTRUCTURE_NOTIFY,
                ),
                [
-                    (window_position.0 + xinput_fp1616_to_float(pointer.win_x) as i32) as u32,
-                    (window_position.1 + xinput_fp1616_to_float(pointer.win_y) as i32) as u32,
+                    (window_position.x + xinput_fp1616_to_float(pointer.win_x) as i32) as u32,
+                    (window_position.y + xinput_fp1616_to_float(pointer.win_y) as i32) as u32,
                    action.try_into().unwrap(),
                    1, // Button 1
                    1,
@@ -2045,19 +2031,12 @@ impl UnownedWindow {
    }

    #[inline]
-    pub fn set_ime_cursor_area(&self, spot: Position, size: Size) {
-        let PhysicalPosition { x, y } = spot.to_physical::<i16>(self.scale_factor());
-        let PhysicalSize { width, height } = size.to_physical::<i16>(self.scale_factor());
-        // We only currently support reporting a caret position via XIM.
-        // No IM servers currently process preedit area information from XIM clients
-        // and it is unclear this is even part of the standard protocol.
-        // Fcitx and iBus both assume that the position reported is at the insertion
-        // caret, and by default will place the candidate window under and to the
-        // right of the reported point.
+    pub fn set_ime_cursor_area(&self, spot: Position, _size: Size) {
+        let (x, y) = spot.to_physical::<i32>(self.scale_factor()).into();
        let _ = self.ime_sender.lock().unwrap().send(ImeRequest::Position(
            self.xwindow as ffi::Window,
-            x.saturating_add(width),
-            y.saturating_add(height),
+            x,
+            y,
        ));
    }

@@ -2155,7 +2134,7 @@ impl UnownedWindow {

    #[inline]
    pub fn id(&self) -> WindowId {
-        WindowId::from_raw(self.xwindow as _)
+        WindowId(self.xwindow as _)
    }

    pub(super) fn sync_counter_id(&self) -> Option<NonZeroU32> {
@@ -2164,7 +2143,7 @@ impl UnownedWindow {

    #[inline]
    pub fn request_redraw(&self) {
-        self.redraw_sender.send(WindowId::from_raw(self.xwindow as _));
+        self.redraw_sender.send(WindowId(self.xwindow as _));
    }

    #[inline]
@@ -2172,6 +2151,7 @@ impl UnownedWindow {
        // TODO timer
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
        let mut window_handle = rwh_06::XlibWindowHandle::new(self.xlib_window());
@@ -2179,6 +2159,7 @@ impl UnownedWindow {
        Ok(window_handle.into())
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub fn raw_display_handle_rwh_06(
        &self,
--- a/src/platform_impl/linux/x11/xdisplay.rs
+++ b/src/platform_impl/linux/x11/xdisplay.rs
@@ -1,11 +1,9 @@
 use std::collections::HashMap;
 use std::error::Error;
-use std::ffi::c_int;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{Arc, Mutex, RwLock, RwLockReadGuard};
 use std::{fmt, ptr};

-use rwh_06::HasDisplayHandle;
 use x11rb::connection::Connection;
 use x11rb::protocol::randr::ConnectionExt as _;
 use x11rb::protocol::render;
@@ -64,13 +62,6 @@ pub struct XConnection {
    pub cursor_cache: Mutex<HashMap<Option<CursorIcon>, xproto::Cursor>>,
 }

-impl HasDisplayHandle for XConnection {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = self.raw_display_handle()?;
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
-    }
-}
-
 unsafe impl Send for XConnection {}
 unsafe impl Sync for XConnection {}

@@ -164,7 +155,7 @@ impl XConnection {
    fn new_xsettings_screen(xcb: &XCBConnection, default_screen: usize) -> Option<xproto::Atom> {
        // Fetch the _XSETTINGS_S[screen number] atom.
        let xsettings_screen = xcb
-            .intern_atom(false, format!("_XSETTINGS_S{default_screen}").as_bytes())
+            .intern_atom(false, format!("_XSETTINGS_S{}", default_screen).as_bytes())
            .ok()?
            .reply()
            .ok()?
@@ -293,19 +284,6 @@ impl XConnection {

        self.xcb_connection().setup().image_byte_order != endian
    }
-
-    pub fn raw_display_handle(&self) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
-        let display_handle = rwh_06::XlibDisplayHandle::new(
-            // SAFETY: display will never be null
-            Some(
-                std::ptr::NonNull::new(self.display as *mut _)
-                    .expect("X11 display should never be null"),
-            ),
-            self.default_screen_index() as c_int,
-        );
-
-        Ok(display_handle.into())
-    }
 }

 impl fmt::Debug for XConnection {
--- a/src/platform_impl/mod.rs
+++ b/src/platform_impl/mod.rs
@@ -22,7 +22,6 @@ use self::apple as platform;
 use self::linux as platform;
 #[cfg(orbital_platform)]
 use self::orbital as platform;
-#[allow(unused_imports)]
 pub use self::platform::*;
 #[cfg(web_platform)]
 use self::web as platform;
--- a/src/platform_impl/orbital/event_loop.rs
+++ b/src/platform_impl/orbital/event_loop.rs
@@ -12,24 +12,21 @@ use orbclient::{
 use smol_str::SmolStr;

 use super::{
-    KeyEventExtra, MonitorHandle, PlatformSpecificEventLoopAttributes, RedoxSocket, TimeSocket,
-    WindowProperties,
+    DeviceId, KeyEventExtra, MonitorHandle, PlatformSpecificEventLoopAttributes, RedoxSocket,
+    TimeSocket, WindowId, WindowProperties,
 };
 use crate::application::ApplicationHandler;
 use crate::error::{EventLoopError, NotSupportedError, RequestError};
 use crate::event::{self, Ime, Modifiers, StartCause};
-use crate::event_loop::{
-    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
-    OwnedDisplayHandle as CoreOwnedDisplayHandle,
-};
+use crate::event_loop::{self, ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents};
 use crate::keyboard::{
    Key, KeyCode, KeyLocation, ModifiersKeys, ModifiersState, NamedKey, NativeKey, NativeKeyCode,
    PhysicalKey,
 };
 use crate::platform_impl::Window;
 use crate::window::{
-    CustomCursor as RootCustomCursor, CustomCursorSource, Theme, Window as CoreWindow, WindowId,
+    CustomCursor as RootCustomCursor, CustomCursorSource, Theme, Window as CoreWindow,
+    WindowId as RootWindowId,
 };

 fn convert_scancode(scancode: u8) -> (PhysicalKey, Option<NamedKey>) {
@@ -290,7 +287,8 @@ impl EventLoop {
        let event_socket =
            Arc::new(RedoxSocket::event().map_err(|error| os_error!(format!("{error}")))?);

-        let wake_socket = TimeSocket::open().map_err(|error| os_error!(format!("{error}")))?;
+        let wake_socket =
+            Arc::new(TimeSocket::open().map_err(|error| os_error!(format!("{error}")))?);

        event_socket
            .write(&syscall::Event {
@@ -309,7 +307,8 @@ impl EventLoop {
                redraws: Arc::new(Mutex::new(VecDeque::new())),
                destroys: Arc::new(Mutex::new(VecDeque::new())),
                event_socket,
-                event_loop_proxy: Arc::new(EventLoopProxy { wake_socket, user_events_sender }),
+                wake_socket,
+                user_events_sender,
            },
            user_events_receiver,
        })
@@ -363,8 +362,9 @@ impl EventLoop {
                    key_without_modifiers = logical_key.clone();
                }

+                let window_id = RootWindowId(window_id);
                let event = event::WindowEvent::KeyboardInput {
-                    device_id: None,
+                    device_id: event::DeviceId(DeviceId),
                    event: event::KeyEvent {
                        logical_key,
                        physical_key,
@@ -394,63 +394,81 @@ impl EventLoop {
            EventOption::TextInput(TextInputEvent { character }) => {
                app.window_event(
                    window_target,
-                    window_id,
+                    RootWindowId(window_id),
                    event::WindowEvent::Ime(Ime::Preedit("".into(), None)),
                );
                app.window_event(
                    window_target,
-                    window_id,
+                    RootWindowId(window_id),
                    event::WindowEvent::Ime(Ime::Commit(character.into())),
                );
            },
            EventOption::Mouse(MouseEvent { x, y }) => {
-                app.window_event(window_target, window_id, event::WindowEvent::PointerMoved {
-                    device_id: None,
-                    primary: true,
-                    position: (x, y).into(),
-                    source: event::PointerSource::Mouse,
-                });
+                app.window_event(
+                    window_target,
+                    RootWindowId(window_id),
+                    event::WindowEvent::CursorMoved {
+                        device_id: event::DeviceId(DeviceId),
+                        position: (x, y).into(),
+                    },
+                );
            },
            EventOption::MouseRelative(MouseRelativeEvent { dx, dy }) => {
-                app.device_event(window_target, None, event::DeviceEvent::PointerMotion {
-                    delta: (dx as f64, dy as f64),
-                });
+                app.device_event(
+                    window_target,
+                    event::DeviceId(DeviceId),
+                    event::DeviceEvent::MouseMotion { delta: (dx as f64, dy as f64) },
+                );
            },
            EventOption::Button(ButtonEvent { left, middle, right }) => {
                while let Some((button, state)) = event_state.mouse(left, middle, right) {
-                    app.window_event(window_target, window_id, event::WindowEvent::PointerButton {
-                        device_id: None,
-                        primary: true,
-                        state,
-                        position: dpi::PhysicalPosition::default(),
-                        button: button.into(),
-                    });
+                    app.window_event(
+                        window_target,
+                        RootWindowId(window_id),
+                        event::WindowEvent::MouseInput {
+                            device_id: event::DeviceId(DeviceId),
+                            state,
+                            button,
+                        },
+                    );
                }
            },
            EventOption::Scroll(ScrollEvent { x, y }) => {
-                app.window_event(window_target, window_id, event::WindowEvent::MouseWheel {
-                    device_id: None,
-                    delta: event::MouseScrollDelta::LineDelta(x as f32, y as f32),
-                    phase: event::TouchPhase::Moved,
-                });
+                app.window_event(
+                    window_target,
+                    RootWindowId(window_id),
+                    event::WindowEvent::MouseWheel {
+                        device_id: event::DeviceId(DeviceId),
+                        delta: event::MouseScrollDelta::LineDelta(x as f32, y as f32),
+                        phase: event::TouchPhase::Moved,
+                    },
+                );
            },
            EventOption::Quit(QuitEvent {}) => {
-                app.window_event(window_target, window_id, event::WindowEvent::CloseRequested);
+                app.window_event(
+                    window_target,
+                    RootWindowId(window_id),
+                    event::WindowEvent::CloseRequested,
+                );
            },
            EventOption::Focus(FocusEvent { focused }) => {
-                app.window_event(window_target, window_id, event::WindowEvent::Focused(focused));
+                app.window_event(
+                    window_target,
+                    RootWindowId(window_id),
+                    event::WindowEvent::Focused(focused),
+                );
            },
            EventOption::Move(MoveEvent { x, y }) => {
                app.window_event(
                    window_target,
-                    window_id,
+                    RootWindowId(window_id),
                    event::WindowEvent::Moved((x, y).into()),
                );
            },
            EventOption::Resize(ResizeEvent { width, height }) => {
                app.window_event(
                    window_target,
-                    window_id,
+                    RootWindowId(window_id),
                    event::WindowEvent::SurfaceResized((width, height).into()),
                );

@@ -460,22 +478,12 @@ impl EventLoop {
            // TODO: Screen, Clipboard, Drop
            EventOption::Hover(HoverEvent { entered }) => {
                let event = if entered {
-                    event::WindowEvent::PointerEntered {
-                        device_id: None,
-                        primary: true,
-                        position: dpi::PhysicalPosition::default(),
-                        kind: event::PointerKind::Mouse,
-                    }
+                    event::WindowEvent::CursorEntered { device_id: event::DeviceId(DeviceId) }
                } else {
-                    event::WindowEvent::PointerLeft {
-                        device_id: None,
-                        primary: true,
-                        position: None,
-                        kind: event::PointerKind::Mouse,
-                    }
+                    event::WindowEvent::CursorLeft { device_id: event::DeviceId(DeviceId) }
                };

-                app.window_event(window_target, window_id, event);
+                app.window_event(window_target, RootWindowId(window_id), event);
            },
            other => {
                tracing::warn!("unhandled event: {:?}", other);
@@ -497,7 +505,7 @@ impl EventLoop {
                let mut creates = self.window_target.creates.lock().unwrap();
                creates.pop_front()
            } {
-                let window_id = WindowId::from_raw(window.fd);
+                let window_id = WindowId { fd: window.fd as u64 };

                let mut buf: [u8; 4096] = [0; 4096];
                let path = window.fpath(&mut buf).expect("failed to read properties");
@@ -505,6 +513,8 @@ impl EventLoop {

                self.windows.push((window, EventState::default()));

+                let window_id = RootWindowId(window_id);
+
                // Send resize event on create to indicate first size.
                let event = event::WindowEvent::SurfaceResized((properties.w, properties.h).into());
                app.window_event(&self.window_target, window_id, event);
@@ -519,16 +529,16 @@ impl EventLoop {
                let mut destroys = self.window_target.destroys.lock().unwrap();
                destroys.pop_front()
            } {
-                app.window_event(&self.window_target, destroy_id, event::WindowEvent::Destroyed);
-                self.windows
-                    .retain(|(window, _event_state)| WindowId::from_raw(window.fd) != destroy_id);
+                let window_id = RootWindowId(destroy_id);
+                app.window_event(&self.window_target, window_id, event::WindowEvent::Destroyed);
+                self.windows.retain(|(window, _event_state)| window.fd as u64 != destroy_id.fd);
            }

            // Handle window events.
            let mut i = 0;
            // While loop is used here because the same window may be processed more than once.
            while let Some((window, event_state)) = self.windows.get_mut(i) {
-                let window_id = WindowId::from_raw(window.fd);
+                let window_id = WindowId { fd: window.fd as u64 };

                let mut event_buf = [0u8; 16 * mem::size_of::<orbclient::Event>()];
                let count =
@@ -586,7 +596,7 @@ impl EventLoop {
            } {
                app.window_event(
                    &self.window_target,
-                    window_id,
+                    RootWindowId(window_id),
                    event::WindowEvent::RedrawRequested,
                );
            }
@@ -666,11 +676,11 @@ impl EventLoop {

 pub struct EventLoopProxy {
    user_events_sender: mpsc::SyncSender<()>,
-    pub(super) wake_socket: TimeSocket,
+    wake_socket: Arc<TimeSocket>,
 }

-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
+impl EventLoopProxy {
+    pub fn wake_up(&self) {
        // When we fail to send the event it means that we haven't woken up to read the previous
        // event.
        if self.user_events_sender.try_send(()).is_ok() {
@@ -679,6 +689,15 @@ impl EventLoopProxyProvider for EventLoopProxy {
    }
 }

+impl Clone for EventLoopProxy {
+    fn clone(&self) -> Self {
+        Self {
+            user_events_sender: self.user_events_sender.clone(),
+            wake_socket: self.wake_socket.clone(),
+        }
+    }
+}
+
 impl Unpin for EventLoopProxy {}

 pub struct ActiveEventLoop {
@@ -688,12 +707,18 @@ pub struct ActiveEventLoop {
    pub(super) redraws: Arc<Mutex<VecDeque<WindowId>>>,
    pub(super) destroys: Arc<Mutex<VecDeque<WindowId>>>,
    pub(super) event_socket: Arc<RedoxSocket>,
-    pub(super) event_loop_proxy: Arc<EventLoopProxy>,
+    pub(super) wake_socket: Arc<TimeSocket>,
+    user_events_sender: mpsc::SyncSender<()>,
 }

 impl RootActiveEventLoop for ActiveEventLoop {
-    fn create_proxy(&self) -> CoreEventLoopProxy {
-        CoreEventLoopProxy::new(self.event_loop_proxy.clone())
+    fn create_proxy(&self) -> event_loop::EventLoopProxy {
+        event_loop::EventLoopProxy {
+            event_loop_proxy: EventLoopProxy {
+                user_events_sender: self.user_events_sender.clone(),
+                wake_socket: self.wake_socket.clone(),
+            },
+        }
    }

    fn create_window(
@@ -742,15 +767,17 @@ impl RootActiveEventLoop for ActiveEventLoop {
        self.exit.get()
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(Arc::new(OwnedDisplayHandle))
+    fn owned_display_handle(&self) -> event_loop::OwnedDisplayHandle {
+        event_loop::OwnedDisplayHandle { platform: OwnedDisplayHandle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::RawDisplayHandle::Orbital(rwh_06::OrbitalDisplayHandle::new());
@@ -758,12 +785,15 @@ impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    }
 }

-#[derive(Clone)]
+#[derive(Clone, PartialEq, Eq)]
 pub(crate) struct OwnedDisplayHandle;

-impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::RawDisplayHandle::Orbital(rwh_06::OrbitalDisplayHandle::new());
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::OrbitalDisplayHandle::new().into())
    }
 }
--- a/src/platform_impl/orbital/mod.rs
+++ b/src/platform_impl/orbital/mod.rs
@@ -5,7 +5,7 @@ use std::{fmt, str};

 use smol_str::SmolStr;

-pub(crate) use self::event_loop::{ActiveEventLoop, EventLoop};
+pub(crate) use self::event_loop::{ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle};
 use crate::dpi::{PhysicalPosition, PhysicalSize};
 use crate::keyboard::Key;
 mod event_loop;
@@ -99,6 +99,47 @@ impl TimeSocket {
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PlatformSpecificEventLoopAttributes {}

+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct WindowId {
+    fd: u64,
+}
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        WindowId { fd: u64::MAX }
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(id: WindowId) -> Self {
+        id.fd
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(fd: u64) -> Self {
+        Self { fd }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct FingerId;
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId
+    }
+}
+
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub struct PlatformSpecificWindowAttributes;

--- a/src/platform_impl/orbital/window.rs
+++ b/src/platform_impl/orbital/window.rs
@@ -1,13 +1,12 @@
 use std::collections::VecDeque;
 use std::sync::{Arc, Mutex};

-use super::event_loop::EventLoopProxy;
-use super::{ActiveEventLoop, MonitorHandle, RedoxSocket, WindowProperties};
+use super::{ActiveEventLoop, MonitorHandle, RedoxSocket, TimeSocket, WindowId, WindowProperties};
 use crate::cursor::Cursor;
-use crate::dpi::{PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::monitor::MonitorHandle as CoreMonitorHandle;
-use crate::window::{self, Fullscreen, ImePurpose, Window as CoreWindow, WindowId};
+use crate::window::{self, Fullscreen, ImePurpose, Window as CoreWindow, WindowId as CoreWindowId};

 // These values match the values uses in the `window_new` function in orbital:
 // https://gitlab.redox-os.org/redox-os/orbital/-/blob/master/src/scheme.rs
@@ -24,7 +23,7 @@ pub struct Window {
    window_socket: Arc<RedoxSocket>,
    redraws: Arc<Mutex<VecDeque<WindowId>>>,
    destroys: Arc<Mutex<VecDeque<WindowId>>>,
-    event_loop_proxy: Arc<EventLoopProxy>,
+    wake_socket: Arc<TimeSocket>,
 }

 impl Window {
@@ -114,13 +113,13 @@ impl Window {
            creates.push_back(window_socket.clone());
        }

-        el.event_loop_proxy.wake_socket.wake().unwrap();
+        el.wake_socket.wake().unwrap();

        Ok(Self {
            window_socket,
            redraws: el.redraws.clone(),
            destroys: el.destroys.clone(),
-            event_loop_proxy: el.event_loop_proxy.clone(),
+            wake_socket: el.wake_socket.clone(),
        })
    }

@@ -138,6 +137,7 @@ impl Window {
        Ok(())
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
        let handle = rwh_06::OrbitalWindowHandle::new({
@@ -147,6 +147,7 @@ impl Window {
        Ok(rwh_06::RawWindowHandle::Orbital(handle))
    }

+    #[cfg(feature = "rwh_06")]
    #[inline]
    fn raw_display_handle_rwh_06(&self) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
        Ok(rwh_06::RawDisplayHandle::Orbital(rwh_06::OrbitalDisplayHandle::new()))
@@ -154,8 +155,8 @@ impl Window {
 }

 impl CoreWindow for Window {
-    fn id(&self) -> WindowId {
-        WindowId::from_raw(self.window_socket.fd)
+    fn id(&self) -> CoreWindowId {
+        CoreWindowId(WindowId { fd: self.window_socket.fd as u64 })
    }

    #[inline]
@@ -180,12 +181,12 @@ impl CoreWindow for Window {

    #[inline]
    fn request_redraw(&self) {
-        let window_id = self.id();
+        let window_id = self.id().0;
        let mut redraws = self.redraws.lock().unwrap();
        if !redraws.contains(&window_id) {
            redraws.push_back(window_id);

-            self.event_loop_proxy.wake_socket.wake().unwrap();
+            self.wake_socket.wake().unwrap();
        }
    }

@@ -198,19 +199,19 @@ impl CoreWindow for Window {
    }

    #[inline]
-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        // TODO: adjust for window decorations
-        (0, 0).into()
-    }
-
-    #[inline]
-    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
        let mut buf: [u8; 4096] = [0; 4096];
        let path = self.window_socket.fpath(&mut buf).expect("failed to read properties");
        let properties = WindowProperties::new(path);
        Ok((properties.x, properties.y).into())
    }

+    #[inline]
+    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        // TODO: adjust for window decorations
+        self.inner_position()
+    }
+
    #[inline]
    fn set_outer_position(&self, position: Position) {
        // TODO: adjust for window decorations
@@ -239,10 +240,6 @@ impl CoreWindow for Window {
        self.surface_size()
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        PhysicalInsets::new(0, 0, 0, 0)
-    }
-
    #[inline]
    fn set_min_surface_size(&self, _: Option<Size>) {}

@@ -414,7 +411,7 @@ impl CoreWindow for Window {
            window::ResizeDirection::West => "L",
        };
        self.window_socket
-            .write(format!("D,{arg}").as_bytes())
+            .write(format!("D,{}", arg).as_bytes())
            .map_err(|err| os_error!(format!("{err}")))?;
        Ok(())
    }
@@ -450,15 +447,18 @@ impl CoreWindow for Window {

    fn set_content_protected(&self, _protected: bool) {}

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_window_handle_rwh_06()?;
@@ -466,6 +466,7 @@ impl rwh_06::HasWindowHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_display_handle_rwh_06()?;
@@ -477,9 +478,9 @@ impl Drop for Window {
    fn drop(&mut self) {
        {
            let mut destroys = self.destroys.lock().unwrap();
-            destroys.push_back(self.id());
+            destroys.push_back(self.id().0);
        }

-        self.event_loop_proxy.wake_socket.wake().unwrap();
+        self.wake_socket.wake().unwrap();
    }
 }
--- a/src/platform_impl/web/async/mod.rs
+++ b/src/platform_impl/web/async/mod.rs
@@ -6,13 +6,15 @@ mod channel;
 mod concurrent_queue;
 mod dispatcher;
 mod notifier;
+mod waker;
 mod wrapper;

-pub(crate) use atomic_waker::AtomicWaker;
+use atomic_waker::AtomicWaker;
 use concurrent_queue::{ConcurrentQueue, PushError};

 pub use self::abortable::{AbortHandle, Abortable, DropAbortHandle};
 pub use self::channel::{channel, Receiver, Sender};
 pub use self::dispatcher::{DispatchRunner, Dispatcher};
 pub use self::notifier::{Notified, Notifier};
-pub(crate) use self::wrapper::Wrapper;
+pub use self::waker::{Waker, WakerSpawner};
+use self::wrapper::Wrapper;
--- a/src/platform_impl/web/async/waker.rs
+++ b/src/platform_impl/web/async/waker.rs
@@ -0,0 +1,117 @@
+use std::future;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use std::task::Poll;
+
+use super::super::main_thread::MainThreadMarker;
+use super::{AtomicWaker, Wrapper};
+
+pub struct WakerSpawner<T: 'static>(Wrapper<Handler<T>, Sender, ()>);
+
+pub struct Waker<T: 'static>(Wrapper<Handler<T>, Sender, ()>);
+
+struct Handler<T> {
+    value: T,
+    handler: fn(&T, bool),
+}
+
+#[derive(Clone)]
+struct Sender(Arc<Inner>);
+
+impl<T> WakerSpawner<T> {
+    pub fn new(main_thread: MainThreadMarker, value: T, handler: fn(&T, bool)) -> Self {
+        let inner = Arc::new(Inner {
+            awoken: AtomicBool::new(false),
+            waker: AtomicWaker::new(),
+            closed: AtomicBool::new(false),
+        });
+
+        let handler = Handler { value, handler };
+
+        let sender = Sender(Arc::clone(&inner));
+
+        Self(Wrapper::new(
+            main_thread,
+            handler,
+            |handler, _| {
+                let handler = handler.borrow();
+                let handler = handler.as_ref().unwrap();
+                (handler.handler)(&handler.value, true);
+            },
+            {
+                let inner = Arc::clone(&inner);
+
+                move |handler| async move {
+                    while future::poll_fn(|cx| {
+                        if inner.awoken.swap(false, Ordering::Relaxed) {
+                            Poll::Ready(true)
+                        } else {
+                            inner.waker.register(cx.waker());
+
+                            if inner.awoken.swap(false, Ordering::Relaxed) {
+                                Poll::Ready(true)
+                            } else {
+                                if inner.closed.load(Ordering::Relaxed) {
+                                    return Poll::Ready(false);
+                                }
+
+                                Poll::Pending
+                            }
+                        }
+                    })
+                    .await
+                    {
+                        let handler = handler.borrow();
+                        let handler = handler.as_ref().unwrap();
+                        (handler.handler)(&handler.value, false);
+                    }
+                }
+            },
+            sender,
+            |inner, _| {
+                inner.0.awoken.store(true, Ordering::Relaxed);
+                inner.0.waker.wake();
+            },
+        ))
+    }
+
+    pub fn waker(&self) -> Waker<T> {
+        Waker(self.0.clone())
+    }
+
+    pub fn take(&self) -> bool {
+        debug_assert!(
+            MainThreadMarker::new().is_some(),
+            "this should only be called from the main thread"
+        );
+
+        self.0.with_sender_data(|inner| inner.0.awoken.swap(false, Ordering::Relaxed))
+    }
+}
+
+impl<T> Drop for WakerSpawner<T> {
+    fn drop(&mut self) {
+        self.0.with_sender_data(|inner| {
+            inner.0.closed.store(true, Ordering::Relaxed);
+            inner.0.waker.wake();
+        });
+    }
+}
+
+impl<T> Waker<T> {
+    pub fn wake(&self) {
+        self.0.send(())
+    }
+}
+
+impl<T> Clone for Waker<T> {
+    fn clone(&self) -> Self {
+        Self(self.0.clone())
+    }
+}
+
+struct Inner {
+    awoken: AtomicBool,
+    waker: AtomicWaker,
+    closed: AtomicBool,
+}
--- a/src/platform_impl/web/event.rs
+++ b/src/platform_impl/web/event.rs
@@ -1,12 +1,32 @@
-use crate::event::DeviceId;
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(i32);

-pub(crate) fn mkdid(pointer_id: i32) -> Option<DeviceId> {
-    if let Ok(pointer_id) = u32::try_from(pointer_id) {
-        Some(DeviceId::from_raw(pointer_id as i64))
-    } else if pointer_id == -1 {
-        None
-    } else {
-        tracing::error!("found unexpected negative `PointerEvent.pointerId`: {pointer_id}");
-        None
+impl DeviceId {
+    pub fn new(pointer_id: i32) -> Self {
+        Self(pointer_id)
+    }
+
+    pub const fn dummy() -> Self {
+        Self(-1)
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId {
+    pointer_id: i32,
+    primary: bool,
+}
+
+impl FingerId {
+    pub fn new(pointer_id: i32, primary: bool) -> Self {
+        Self { pointer_id, primary }
+    }
+
+    pub const fn dummy() -> Self {
+        Self { pointer_id: -1, primary: false }
+    }
+
+    pub fn is_primary(self) -> bool {
+        self.primary
    }
 }
--- a/src/platform_impl/web/event_loop/mod.rs
+++ b/src/platform_impl/web/event_loop/mod.rs
@@ -1,4 +1,4 @@
-use super::{backend, HasMonitorPermissionFuture, MonitorPermissionFuture};
+use super::{backend, event, window, HasMonitorPermissionFuture, MonitorPermissionFuture};
 use crate::application::ApplicationHandler;
 use crate::error::{EventLoopError, NotSupportedError};
 use crate::event::Event;
@@ -10,7 +10,8 @@ pub(crate) mod runner;
 mod state;
 mod window_target;

-pub(crate) use window_target::ActiveEventLoop;
+pub(crate) use proxy::EventLoopProxy;
+pub(crate) use window_target::{ActiveEventLoop, OwnedDisplayHandle};

 pub struct EventLoop {
    elw: ActiveEventLoop,
--- a/src/platform_impl/web/event_loop/proxy.rs
+++ b/src/platform_impl/web/event_loop/proxy.rs
@@ -1,101 +1,17 @@
-use std::future;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::task::Poll;
+use super::runner::WeakShared;
+use crate::platform_impl::platform::r#async::Waker;

-use super::super::main_thread::MainThreadMarker;
-use crate::event_loop::EventLoopProxyProvider;
-use crate::platform_impl::web::event_loop::runner::WeakShared;
-use crate::platform_impl::web::r#async::{AtomicWaker, Wrapper};
-
-pub struct EventLoopProxy(Wrapper<WeakShared, Arc<State>, ()>);
-
-struct State {
-    awoken: AtomicBool,
-    waker: AtomicWaker,
-    closed: AtomicBool,
+#[derive(Clone)]
+pub struct EventLoopProxy {
+    runner: Waker<WeakShared>,
 }

 impl EventLoopProxy {
-    pub fn new(main_thread: MainThreadMarker, runner: WeakShared) -> Self {
-        let state = Arc::new(State {
-            awoken: AtomicBool::new(false),
-            waker: AtomicWaker::new(),
-            closed: AtomicBool::new(false),
-        });
-
-        Self(Wrapper::new(
-            main_thread,
-            runner,
-            |runner, _| {
-                let runner = runner.borrow();
-                let runner = runner.as_ref().unwrap();
-
-                if let Some(runner) = runner.upgrade() {
-                    runner.send_proxy_wake_up(true);
-                }
-            },
-            {
-                let state = Arc::clone(&state);
-
-                move |runner| async move {
-                    while future::poll_fn(|cx| {
-                        if state.awoken.swap(false, Ordering::Relaxed) {
-                            Poll::Ready(true)
-                        } else {
-                            state.waker.register(cx.waker());
-
-                            if state.awoken.swap(false, Ordering::Relaxed) {
-                                Poll::Ready(true)
-                            } else {
-                                if state.closed.load(Ordering::Relaxed) {
-                                    return Poll::Ready(false);
-                                }
-
-                                Poll::Pending
-                            }
-                        }
-                    })
-                    .await
-                    {
-                        let runner = runner.borrow();
-                        let runner = runner.as_ref().unwrap();
-
-                        if let Some(runner) = runner.upgrade() {
-                            runner.send_proxy_wake_up(false);
-                        }
-                    }
-                }
-            },
-            state,
-            |state, _| {
-                state.awoken.store(true, Ordering::Relaxed);
-                state.waker.wake();
-            },
-        ))
+    pub fn new(runner: Waker<WeakShared>) -> Self {
+        Self { runner }
    }

-    pub fn take(&self) -> bool {
-        debug_assert!(
-            MainThreadMarker::new().is_some(),
-            "this should only be called from the main thread"
-        );
-
-        self.0.with_sender_data(|state| state.awoken.swap(false, Ordering::Relaxed))
-    }
-}
-
-impl Drop for EventLoopProxy {
-    fn drop(&mut self) {
-        self.0.with_sender_data(|state| {
-            state.closed.store(true, Ordering::Relaxed);
-            state.waker.wake();
-        });
-    }
-}
-
-impl EventLoopProxyProvider for EventLoopProxy {
-    fn wake_up(&self) {
-        self.0.send(())
+    pub fn wake_up(&self) {
+        self.runner.wake();
    }
 }
--- a/src/platform_impl/web/event_loop/runner.rs
+++ b/src/platform_impl/web/event_loop/runner.rs
@@ -3,25 +3,26 @@ use std::collections::{HashSet, VecDeque};
 use std::iter;
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
-use std::sync::Arc;

 use wasm_bindgen::prelude::Closure;
 use wasm_bindgen::JsCast;
 use web_sys::{Document, KeyboardEvent, Navigator, PageTransitionEvent, PointerEvent, WheelEvent};
 use web_time::{Duration, Instant};

-use super::super::event;
 use super::super::main_thread::MainThreadMarker;
 use super::super::monitor::MonitorHandler;
+use super::super::DeviceId;
 use super::backend;
-use super::proxy::EventLoopProxy;
 use super::state::State;
 use crate::dpi::PhysicalSize;
-use crate::event::{DeviceEvent, ElementState, Event, RawKeyEvent, StartCause, WindowEvent};
+use crate::event::{
+    DeviceEvent, DeviceId as RootDeviceId, ElementState, Event, RawKeyEvent, StartCause,
+    WindowEvent,
+};
 use crate::event_loop::{ControlFlow, DeviceEvents};
 use crate::platform::web::{PollStrategy, WaitUntilStrategy};
-use crate::platform_impl::platform::backend::{EventListenerHandle, SafeAreaHandle};
-use crate::platform_impl::platform::r#async::DispatchRunner;
+use crate::platform_impl::platform::backend::EventListenerHandle;
+use crate::platform_impl::platform::r#async::{DispatchRunner, Waker, WakerSpawner};
 use crate::platform_impl::platform::window::Inner;
 use crate::window::WindowId;

@@ -39,7 +40,7 @@ type OnEventHandle<T> = RefCell<Option<EventListenerHandle<dyn FnMut(T)>>>;

 struct Execution {
    main_thread: MainThreadMarker,
-    event_loop_proxy: Arc<EventLoopProxy>,
+    proxy_spawner: WakerSpawner<WeakShared>,
    control_flow: Cell<ControlFlow>,
    poll_strategy: Cell<PollStrategy>,
    wait_until_strategy: Cell<WaitUntilStrategy>,
@@ -48,7 +49,7 @@ struct Execution {
    suspended: Cell<bool>,
    event_loop_recreation: Cell<bool>,
    events: RefCell<VecDeque<EventWrapper>>,
-    id: Cell<usize>,
+    id: RefCell<u32>,
    window: web_sys::Window,
    navigator: Navigator,
    document: Document,
@@ -57,7 +58,6 @@ struct Execution {
    redraw_pending: RefCell<HashSet<WindowId>>,
    destroy_pending: RefCell<VecDeque<WindowId>>,
    pub(crate) monitor: Rc<MonitorHandler>,
-    safe_area: Rc<SafeAreaHandle>,
    page_transition_event_handle: RefCell<Option<backend::PageTransitionEventHandle>>,
    device_events: Cell<DeviceEvents>,
    on_mouse_move: OnEventHandle<PointerEvent>,
@@ -143,7 +143,12 @@ impl Shared {
        let document = window.document().expect("Failed to obtain document");

        Shared(Rc::<Execution>::new_cyclic(|weak| {
-            let proxy_spawner = EventLoopProxy::new(main_thread, WeakShared(weak.clone()));
+            let proxy_spawner =
+                WakerSpawner::new(main_thread, WeakShared(weak.clone()), |runner, local| {
+                    if let Some(runner) = runner.upgrade() {
+                        runner.send_proxy_wake_up(local);
+                    }
+                });

            let monitor = MonitorHandler::new(
                main_thread,
@@ -152,11 +157,9 @@ impl Shared {
                WeakShared(weak.clone()),
            );

-            let safe_area = SafeAreaHandle::new(&window, &document);
-
            Execution {
                main_thread,
-                event_loop_proxy: Arc::new(proxy_spawner),
+                proxy_spawner,
                control_flow: Cell::new(ControlFlow::default()),
                poll_strategy: Cell::new(PollStrategy::default()),
                wait_until_strategy: Cell::new(WaitUntilStrategy::default()),
@@ -168,12 +171,11 @@ impl Shared {
                window,
                navigator,
                document,
-                id: Cell::new(0),
+                id: RefCell::new(0),
                all_canvases: RefCell::new(Vec::new()),
                redraw_pending: RefCell::new(HashSet::new()),
                destroy_pending: RefCell::new(VecDeque::new()),
                monitor: Rc::new(monitor),
-                safe_area: Rc::new(safe_area),
                page_transition_event_handle: RefCell::new(None),
                device_events: Cell::default(),
                on_mouse_move: RefCell::new(None),
@@ -284,7 +286,7 @@ impl Shared {
                }

                // chorded button event
-                let device_id = event::mkdid(event.pointer_id());
+                let device_id = RootDeviceId(DeviceId::new(event.pointer_id()));

                if let Some(button) = backend::event::mouse_button(&event) {
                    let state = if backend::event::mouse_buttons(&event).contains(button.into()) {
@@ -295,7 +297,7 @@ impl Shared {

                    runner.send_event(Event::DeviceEvent {
                        device_id,
-                        event: DeviceEvent::Button { button: button.to_id().into(), state },
+                        event: DeviceEvent::Button { button: button.to_id(), state },
                    });

                    return;
@@ -308,7 +310,7 @@ impl Shared {

                    Event::DeviceEvent {
                        device_id,
-                        event: DeviceEvent::PointerMotion { delta: (delta.x, delta.y) },
+                        event: DeviceEvent::MouseMotion { delta: (delta.x, delta.y) },
                    }
                }));
            }),
@@ -325,7 +327,7 @@ impl Shared {

                if let Some(delta) = backend::event::mouse_scroll_delta(&window, &event) {
                    runner.send_event(Event::DeviceEvent {
-                        device_id: None,
+                        device_id: RootDeviceId(DeviceId::dummy()),
                        event: DeviceEvent::MouseWheel { delta },
                    });
                }
@@ -342,9 +344,9 @@ impl Shared {

                let button = backend::event::mouse_button(&event).expect("no mouse button pressed");
                runner.send_event(Event::DeviceEvent {
-                    device_id: event::mkdid(event.pointer_id()),
+                    device_id: RootDeviceId(DeviceId::new(event.pointer_id())),
                    event: DeviceEvent::Button {
-                        button: button.to_id().into(),
+                        button: button.to_id(),
                        state: ElementState::Pressed,
                    },
                });
@@ -361,9 +363,9 @@ impl Shared {

                let button = backend::event::mouse_button(&event).expect("no mouse button pressed");
                runner.send_event(Event::DeviceEvent {
-                    device_id: event::mkdid(event.pointer_id()),
+                    device_id: RootDeviceId(DeviceId::new(event.pointer_id())),
                    event: DeviceEvent::Button {
-                        button: button.to_id().into(),
+                        button: button.to_id(),
                        state: ElementState::Released,
                    },
                });
@@ -379,7 +381,7 @@ impl Shared {
                }

                runner.send_event(Event::DeviceEvent {
-                    device_id: None,
+                    device_id: RootDeviceId(DeviceId::dummy()),
                    event: DeviceEvent::Key(RawKeyEvent {
                        physical_key: backend::event::key_code(&event),
                        state: ElementState::Pressed,
@@ -397,7 +399,7 @@ impl Shared {
                }

                runner.send_event(Event::DeviceEvent {
-                    device_id: None,
+                    device_id: RootDeviceId(DeviceId::dummy()),
                    event: DeviceEvent::Key(RawKeyEvent {
                        physical_key: backend::event::key_code(&event),
                        state: ElementState::Released,
@@ -436,11 +438,11 @@ impl Shared {

    // Generate a strictly increasing ID
    // This is used to differentiate windows when handling events
-    pub fn generate_id(&self) -> usize {
-        let id = self.0.id.get();
-        self.0.id.set(id.checked_add(1).expect("exhausted `WindowId`"));
+    pub fn generate_id(&self) -> u32 {
+        let mut id = self.0.id.borrow_mut();
+        *id += 1;

-        id
+        *id
    }

    pub fn request_redraw(&self, id: WindowId) {
@@ -654,7 +656,7 @@ impl Shared {
                // Pre-fetch `UserEvent`s to avoid having to wait until the next event loop cycle.
                events.extend(
                    self.0
-                        .event_loop_proxy
+                        .proxy_spawner
                        .take()
                        .then_some(Event::UserWakeUp)
                        .map(EventWrapper::from),
@@ -819,8 +821,8 @@ impl Shared {
        self.0.wait_until_strategy.get()
    }

-    pub(crate) fn event_loop_proxy(&self) -> &Arc<EventLoopProxy> {
-        &self.0.event_loop_proxy
+    pub(crate) fn waker(&self) -> Waker<WeakShared> {
+        self.0.proxy_spawner.waker()
    }

    pub(crate) fn weak(&self) -> WeakShared {
@@ -830,10 +832,6 @@ impl Shared {
    pub(crate) fn monitor(&self) -> &Rc<MonitorHandler> {
        &self.0.monitor
    }
-
-    pub(crate) fn safe_area(&self) -> &Rc<SafeAreaHandle> {
-        &self.0.safe_area
-    }
 }

 #[derive(Clone, Debug)]
--- a/src/platform_impl/web/event_loop/window_target.rs
+++ b/src/platform_impl/web/event_loop/window_target.rs
@@ -2,27 +2,33 @@ use std::cell::Cell;
 use std::clone::Clone;
 use std::iter;
 use std::rc::Rc;
-use std::sync::Arc;

 use web_sys::Element;

 use super::super::monitor::MonitorPermissionFuture;
 use super::super::{lock, KeyEventExtra};
-use super::runner::EventWrapper;
-use super::{backend, runner};
+use super::event::DeviceId;
+use super::runner::{EventWrapper, WeakShared};
+use super::window::WindowId;
+use super::{backend, runner, EventLoopProxy};
 use crate::error::{NotSupportedError, RequestError};
-use crate::event::{ElementState, Event, KeyEvent, TouchPhase, WindowEvent};
+use crate::event::{
+    DeviceId as RootDeviceId, ElementState, Event, FingerId as RootFingerId, KeyEvent, Touch,
+    TouchPhase, WindowEvent,
+};
 use crate::event_loop::{
    ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents,
-    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as CoreOwnedDisplayHandle,
+    EventLoopProxy as RootEventLoopProxy, OwnedDisplayHandle as RootOwnedDisplayHandle,
 };
 use crate::keyboard::ModifiersState;
 use crate::monitor::MonitorHandle as RootMonitorHandle;
 use crate::platform::web::{CustomCursorFuture, PollStrategy, WaitUntilStrategy};
 use crate::platform_impl::platform::cursor::CustomCursor;
-use crate::platform_impl::web::event_loop::proxy::EventLoopProxy;
+use crate::platform_impl::platform::r#async::Waker;
 use crate::platform_impl::Window;
-use crate::window::{CustomCursor as RootCustomCursor, CustomCursorSource, Theme, WindowId};
+use crate::window::{
+    CustomCursor as RootCustomCursor, CustomCursorSource, Theme, WindowId as RootWindowId,
+};

 #[derive(Default)]
 struct ModifiersShared(Rc<Cell<ModifiersState>>);
@@ -64,14 +70,14 @@ impl ActiveEventLoop {
    }

    pub fn generate_id(&self) -> WindowId {
-        WindowId::from_raw(self.runner.generate_id())
+        WindowId(self.runner.generate_id())
    }

    pub fn create_custom_cursor_async(&self, source: CustomCursorSource) -> CustomCursorFuture {
        CustomCursorFuture(CustomCursor::new_async(self, source.inner))
    }

-    pub fn register(&self, canvas: &Rc<backend::Canvas>, window_id: WindowId) {
+    pub fn register(&self, canvas: &Rc<backend::Canvas>, id: WindowId) {
        let canvas_clone = canvas.clone();

        canvas.on_touch_start();
@@ -85,13 +91,13 @@ impl ActiveEventLoop {
            let clear_modifiers = (!modifiers.get().is_empty()).then(|| {
                modifiers.set(ModifiersState::empty());
                Event::WindowEvent {
-                    window_id,
+                    window_id: RootWindowId(id),
                    event: WindowEvent::ModifiersChanged(ModifiersState::empty().into()),
                }
            });

            runner.send_events(clear_modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                window_id,
+                window_id: RootWindowId(id),
                event: WindowEvent::Focused(false),
            })));
        });
@@ -101,7 +107,7 @@ impl ActiveEventLoop {
        canvas.on_focus(move || {
            if !has_focus.replace(true) {
                runner.send_event(Event::WindowEvent {
-                    window_id,
+                    window_id: RootWindowId(id),
                    event: WindowEvent::Focused(true),
                });
            }
@@ -120,8 +126,10 @@ impl ActiveEventLoop {

        if focused {
            canvas.has_focus.set(true);
-            self.runner
-                .send_event(Event::WindowEvent { window_id, event: WindowEvent::Focused(true) })
+            self.runner.send_event(Event::WindowEvent {
+                window_id: RootWindowId(id),
+                event: WindowEvent::Focused(true),
+            })
        }

        let runner = self.runner.clone();
@@ -131,16 +139,18 @@ impl ActiveEventLoop {
                let modifiers_changed = (modifiers.get() != active_modifiers).then(|| {
                    modifiers.set(active_modifiers);
                    Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                    }
                });

+                let device_id = RootDeviceId(DeviceId::dummy());
+
                runner.send_events(
                    iter::once(Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::KeyboardInput {
-                            device_id: None,
+                            device_id,
                            event: KeyEvent {
                                physical_key,
                                logical_key,
@@ -165,16 +175,18 @@ impl ActiveEventLoop {
                let modifiers_changed = (modifiers.get() != active_modifiers).then(|| {
                    modifiers.set(active_modifiers);
                    Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                    }
                });

+                let device_id = RootDeviceId(DeviceId::dummy());
+
                runner.send_events(
                    iter::once(Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::KeyboardInput {
-                            device_id: None,
+                            device_id,
                            event: KeyEvent {
                                physical_key,
                                logical_key,
@@ -193,169 +205,286 @@ impl ActiveEventLoop {
        );

        let has_focus = canvas.has_focus.clone();
-        canvas.on_pointer_leave({
+        canvas.on_cursor_leave({
            let runner = self.runner.clone();
            let has_focus = has_focus.clone();
            let modifiers = self.modifiers.clone();

-            move |active_modifiers, device_id, primary, position, kind| {
+            move |active_modifiers, pointer_id| {
                let focus = (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
                    modifiers.set(active_modifiers);
                    Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                    }
                });

-                runner.send_events(focus.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::PointerLeft {
-                        device_id,
-                        primary,
-                        position: Some(position),
-                        kind,
-                    },
-                })))
-            }
-        });
-
-        canvas.on_pointer_enter({
-            let runner = self.runner.clone();
-            let has_focus = has_focus.clone();
-            let modifiers = self.modifiers.clone();
-
-            move |active_modifiers, device_id, primary, position, kind| {
-                let focus = (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
-                    modifiers.set(active_modifiers);
-                    Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
-                    }
+                let pointer = pointer_id.map(|device_id| Event::WindowEvent {
+                    window_id: RootWindowId(id),
+                    event: WindowEvent::CursorLeft { device_id: RootDeviceId(device_id) },
                });

-                runner.send_events(focus.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::PointerEntered { device_id, primary, position, kind },
-                })))
-            }
-        });
-
-        canvas.on_pointer_move(
-            {
-                let runner = self.runner.clone();
-                let has_focus = has_focus.clone();
-                let modifiers = self.modifiers.clone();
-
-                move |device_id, events| {
-                    runner.send_events(events.flat_map(
-                        |(active_modifiers, primary, position, source)| {
-                            let modifiers = (has_focus.get()
-                                && modifiers.get() != active_modifiers)
-                                .then(|| {
-                                    modifiers.set(active_modifiers);
-                                    Event::WindowEvent {
-                                        window_id,
-                                        event: WindowEvent::ModifiersChanged(
-                                            active_modifiers.into(),
-                                        ),
-                                    }
-                                });
-
-                            modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                                window_id,
-                                event: WindowEvent::PointerMoved {
-                                    device_id,
-                                    primary,
-                                    position,
-                                    source,
-                                },
-                            }))
-                        },
-                    ));
+                if focus.is_some() || pointer.is_some() {
+                    runner.send_events(focus.into_iter().chain(pointer))
                }
-            },
+            }
+        });
+
+        canvas.on_cursor_enter({
+            let runner = self.runner.clone();
+            let has_focus = has_focus.clone();
+            let modifiers = self.modifiers.clone();
+
+            move |active_modifiers, pointer_id| {
+                let focus = (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                    modifiers.set(active_modifiers);
+                    Event::WindowEvent {
+                        window_id: RootWindowId(id),
+                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                    }
+                });
+
+                let pointer = pointer_id.map(|device_id| Event::WindowEvent {
+                    window_id: RootWindowId(id),
+                    event: WindowEvent::CursorEntered { device_id: RootDeviceId(device_id) },
+                });
+
+                if focus.is_some() || pointer.is_some() {
+                    runner.send_events(focus.into_iter().chain(pointer))
+                }
+            }
+        });
+
+        canvas.on_cursor_move(
            {
                let runner = self.runner.clone();
                let has_focus = has_focus.clone();
                let modifiers = self.modifiers.clone();

-                move |active_modifiers, device_id, primary, position, state, button| {
+                move |active_modifiers, pointer_id, events| {
                    let modifiers =
                        (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
                            modifiers.set(active_modifiers);
                            Event::WindowEvent {
-                                window_id,
+                                window_id: RootWindowId(id),
                                event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                            }
                        });

-                    runner.send_events(modifiers.into_iter().chain([Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::PointerButton {
-                            device_id,
-                            primary,
-                            state,
-                            position,
-                            button,
+                    runner.send_events(modifiers.into_iter().chain(events.flat_map(|position| {
+                        let device_id = RootDeviceId(pointer_id);
+
+                        iter::once(Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved { device_id, position },
+                        })
+                    })));
+                }
+            },
+            {
+                let runner = self.runner.clone();
+                let has_focus = has_focus.clone();
+                let modifiers = self.modifiers.clone();
+
+                move |active_modifiers, device_id, finger_id, events| {
+                    let modifiers =
+                        (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                            modifiers.set(active_modifiers);
+                            Event::WindowEvent {
+                                window_id: RootWindowId(id),
+                                event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                            }
+                        });
+
+                    runner.send_events(modifiers.into_iter().chain(events.map(
+                        |(location, force)| Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::Touch(Touch {
+                                finger_id: RootFingerId(finger_id),
+                                device_id: RootDeviceId(device_id),
+                                phase: TouchPhase::Moved,
+                                force: Some(force),
+                                location,
+                            }),
                        },
-                    }]));
+                    )));
+                }
+            },
+            {
+                let runner = self.runner.clone();
+                let has_focus = has_focus.clone();
+                let modifiers = self.modifiers.clone();
+
+                move |active_modifiers,
+                      device_id,
+                      position: crate::dpi::PhysicalPosition<f64>,
+                      buttons,
+                      button| {
+                    let modifiers =
+                        (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                            modifiers.set(active_modifiers);
+                            Event::WindowEvent {
+                                window_id: RootWindowId(id),
+                                event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                            }
+                        });
+
+                    let device_id = RootDeviceId(device_id);
+
+                    let state = if buttons.contains(button.into()) {
+                        ElementState::Pressed
+                    } else {
+                        ElementState::Released
+                    };
+
+                    // A chorded button event may come in without any prior CursorMoved events,
+                    // therefore we should send a CursorMoved event to make sure that the
+                    // user code has the correct cursor position.
+                    runner.send_events(modifiers.into_iter().chain([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved { device_id, position },
+                        },
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::MouseInput { device_id, state, button },
+                        },
+                    ]));
                }
            },
        );

-        canvas.on_pointer_press({
-            let runner = self.runner.clone();
-            let modifiers = self.modifiers.clone();
+        canvas.on_mouse_press(
+            {
+                let runner = self.runner.clone();
+                let modifiers = self.modifiers.clone();

-            move |active_modifiers, device_id, primary, position, button| {
-                let modifiers = (modifiers.get() != active_modifiers).then(|| {
-                    modifiers.set(active_modifiers);
-                    Event::WindowEvent {
-                        window_id,
-                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
-                    }
-                });
-
-                runner.send_events(modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::PointerButton {
-                        device_id,
-                        primary,
-                        state: ElementState::Pressed,
-                        position,
-                        button,
-                    },
-                })));
-            }
-        });
-
-        canvas.on_pointer_release({
-            let runner = self.runner.clone();
-            let has_focus = has_focus.clone();
-            let modifiers = self.modifiers.clone();
-
-            move |active_modifiers, device_id, primary, position, button| {
-                let modifiers =
-                    (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                move |active_modifiers, pointer_id, position, button| {
+                    let modifiers = (modifiers.get() != active_modifiers).then(|| {
                        modifiers.set(active_modifiers);
                        Event::WindowEvent {
-                            window_id,
+                            window_id: RootWindowId(id),
                            event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                        }
                    });

-                runner.send_events(modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id,
-                    event: WindowEvent::PointerButton {
-                        device_id,
-                        primary,
-                        state: ElementState::Released,
-                        position,
-                        button,
-                    },
-                })));
-            }
-        });
+                    let device_id: RootDeviceId = RootDeviceId(pointer_id);
+
+                    // A mouse down event may come in without any prior CursorMoved events,
+                    // therefore we should send a CursorMoved event to make sure that the
+                    // user code has the correct cursor position.
+                    runner.send_events(modifiers.into_iter().chain([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved { device_id, position },
+                        },
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::MouseInput {
+                                device_id,
+                                state: ElementState::Pressed,
+                                button,
+                            },
+                        },
+                    ]));
+                }
+            },
+            {
+                let runner = self.runner.clone();
+                let modifiers = self.modifiers.clone();
+
+                move |active_modifiers, device_id, finger_id, location, force| {
+                    let modifiers = (modifiers.get() != active_modifiers).then(|| {
+                        modifiers.set(active_modifiers);
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                        }
+                    });
+
+                    runner.send_events(modifiers.into_iter().chain(iter::once(
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::Touch(Touch {
+                                finger_id: RootFingerId(finger_id),
+                                device_id: RootDeviceId(device_id),
+                                phase: TouchPhase::Started,
+                                force: Some(force),
+                                location,
+                            }),
+                        },
+                    )))
+                }
+            },
+        );
+
+        canvas.on_mouse_release(
+            {
+                let runner = self.runner.clone();
+                let has_focus = has_focus.clone();
+                let modifiers = self.modifiers.clone();
+
+                move |active_modifiers, pointer_id, position, button| {
+                    let modifiers =
+                        (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                            modifiers.set(active_modifiers);
+                            Event::WindowEvent {
+                                window_id: RootWindowId(id),
+                                event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                            }
+                        });
+
+                    let device_id: RootDeviceId = RootDeviceId(pointer_id);
+
+                    // A mouse up event may come in without any prior CursorMoved events,
+                    // therefore we should send a CursorMoved event to make sure that the
+                    // user code has the correct cursor position.
+                    runner.send_events(modifiers.into_iter().chain([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved { device_id, position },
+                        },
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::MouseInput {
+                                device_id,
+                                state: ElementState::Released,
+                                button,
+                            },
+                        },
+                    ]));
+                }
+            },
+            {
+                let runner_touch = self.runner.clone();
+                let has_focus = has_focus.clone();
+                let modifiers = self.modifiers.clone();
+
+                move |active_modifiers, device_id, finger_id, location, force| {
+                    let modifiers =
+                        (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
+                            modifiers.set(active_modifiers);
+                            Event::WindowEvent {
+                                window_id: RootWindowId(id),
+                                event: WindowEvent::ModifiersChanged(active_modifiers.into()),
+                            }
+                        });
+
+                    runner_touch.send_events(modifiers.into_iter().chain(iter::once(
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::Touch(Touch {
+                                finger_id: RootFingerId(finger_id),
+                                device_id: RootDeviceId(device_id),
+                                phase: TouchPhase::Ended,
+                                force: Some(force),
+                                location,
+                            }),
+                        },
+                    )));
+                }
+            },
+        );

        let runner = self.runner.clone();
        let modifiers = self.modifiers.clone();
@@ -364,16 +493,16 @@ impl ActiveEventLoop {
                (has_focus.get() && modifiers.get() != active_modifiers).then(|| {
                    modifiers.set(active_modifiers);
                    Event::WindowEvent {
-                        window_id,
+                        window_id: RootWindowId(id),
                        event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                    }
                });

            runner.send_events(modifiers_changed.into_iter().chain(iter::once(
                Event::WindowEvent {
-                    window_id,
+                    window_id: RootWindowId(id),
                    event: WindowEvent::MouseWheel {
-                        device_id: None,
+                        device_id: RootDeviceId(DeviceId::dummy()),
                        delta,
                        phase: TouchPhase::Moved,
                    },
@@ -381,11 +510,25 @@ impl ActiveEventLoop {
            )));
        });

+        let runner = self.runner.clone();
+        canvas.on_touch_cancel(move |device_id, finger_id, location, force| {
+            runner.send_event(Event::WindowEvent {
+                window_id: RootWindowId(id),
+                event: WindowEvent::Touch(Touch {
+                    finger_id: RootFingerId(finger_id),
+                    device_id: RootDeviceId(device_id),
+                    phase: TouchPhase::Cancelled,
+                    force: Some(force),
+                    location,
+                }),
+            });
+        });
+
        let runner = self.runner.clone();
        canvas.on_dark_mode(move |is_dark_mode| {
            let theme = if is_dark_mode { Theme::Dark } else { Theme::Light };
            runner.send_event(Event::WindowEvent {
-                window_id,
+                window_id: RootWindowId(id),
                event: WindowEvent::ThemeChanged(theme),
            });
        });
@@ -412,7 +555,7 @@ impl ActiveEventLoop {
                    if canvas.old_size() != new_size {
                        canvas.set_old_size(new_size);
                        runner.send_event(Event::WindowEvent {
-                            window_id,
+                            window_id: RootWindowId(id),
                            event: WindowEvent::SurfaceResized(new_size),
                        });
                        canvas.request_animation_frame();
@@ -428,7 +571,7 @@ impl ActiveEventLoop {
                && !(is_intersecting && canvas_clone.is_intersecting.get().is_none())
            {
                runner.send_event(Event::WindowEvent {
-                    window_id,
+                    window_id: RootWindowId(id),
                    event: WindowEvent::Occluded(!is_intersecting),
                });
            }
@@ -437,7 +580,7 @@ impl ActiveEventLoop {
        });

        let runner = self.runner.clone();
-        canvas.on_animation_frame(move || runner.request_redraw(window_id));
+        canvas.on_animation_frame(move || runner.request_redraw(RootWindowId(id)));

        canvas.on_context_menu();
    }
@@ -477,15 +620,15 @@ impl ActiveEventLoop {
        self.runner.monitor().has_detailed_monitor_permission()
    }

-    pub(crate) fn event_loop_proxy(&self) -> Arc<EventLoopProxy> {
-        self.runner.event_loop_proxy().clone()
+    pub(crate) fn waker(&self) -> Waker<WeakShared> {
+        self.runner.waker()
    }
 }

 impl RootActiveEventLoop for ActiveEventLoop {
    fn create_proxy(&self) -> RootEventLoopProxy {
-        let event_loop_proxy = self.event_loop_proxy();
-        RootEventLoopProxy::new(event_loop_proxy)
+        let event_loop_proxy = EventLoopProxy::new(self.waker());
+        RootEventLoopProxy { event_loop_proxy }
    }

    fn create_window(
@@ -547,15 +690,17 @@ impl RootActiveEventLoop for ActiveEventLoop {
        self.runner.exiting()
    }

-    fn owned_display_handle(&self) -> CoreOwnedDisplayHandle {
-        CoreOwnedDisplayHandle::new(Arc::new(OwnedDisplayHandle))
+    fn owned_display_handle(&self) -> RootOwnedDisplayHandle {
+        RootOwnedDisplayHandle { platform: OwnedDisplayHandle }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = rwh_06::RawDisplayHandle::Web(rwh_06::WebDisplayHandle::new());
@@ -563,12 +708,15 @@ impl rwh_06::HasDisplayHandle for ActiveEventLoop {
    }
 }

-#[derive(Clone)]
+#[derive(Clone, PartialEq, Eq)]
 pub(crate) struct OwnedDisplayHandle;

-impl rwh_06::HasDisplayHandle for OwnedDisplayHandle {
-    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
-        let raw = rwh_06::RawDisplayHandle::Web(rwh_06::WebDisplayHandle::new());
-        unsafe { Ok(rwh_06::DisplayHandle::borrow_raw(raw)) }
+impl OwnedDisplayHandle {
+    #[cfg(feature = "rwh_06")]
+    #[inline]
+    pub fn raw_display_handle_rwh_06(
+        &self,
+    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
+        Ok(rwh_06::WebDisplayHandle::new().into())
    }
 }
--- a/src/platform_impl/web/mod.rs
+++ b/src/platform_impl/web/mod.rs
@@ -37,8 +37,10 @@ pub(crate) use cursor::{
    CustomCursorSource as PlatformCustomCursorSource,
 };

+pub use self::event::{DeviceId, FingerId};
 pub(crate) use self::event_loop::{
-    ActiveEventLoop, EventLoop, PlatformSpecificEventLoopAttributes,
+    ActiveEventLoop, EventLoop, EventLoopProxy, OwnedDisplayHandle,
+    PlatformSpecificEventLoopAttributes,
 };
 pub(crate) use self::keyboard::KeyEventExtra;
 pub(crate) use self::monitor::{
@@ -46,5 +48,5 @@ pub(crate) use self::monitor::{
    VideoModeHandle,
 };
 use self::web_sys as backend;
-pub use self::window::{PlatformSpecificWindowAttributes, Window};
+pub use self::window::{PlatformSpecificWindowAttributes, Window, WindowId};
 pub(crate) use crate::icon::NoIcon as PlatformIcon;
--- a/src/platform_impl/web/web_sys/canvas.rs
+++ b/src/platform_impl/web/web_sys/canvas.rs
@@ -12,22 +12,21 @@ use web_sys::{
 };

 use super::super::cursor::CursorHandler;
+use super::super::event::{DeviceId, FingerId};
 use super::super::main_thread::MainThreadMarker;
+use super::super::WindowId;
 use super::animation_frame::AnimationFrameHandler;
 use super::event_handle::EventListenerHandle;
 use super::intersection_handle::IntersectionObserverHandle;
 use super::media_query_handle::MediaQueryListHandle;
 use super::pointer::PointerHandler;
-use super::{event, fullscreen, ResizeScaleHandle};
+use super::{event, fullscreen, ButtonsState, ResizeScaleHandle};
 use crate::dpi::{LogicalPosition, PhysicalPosition, PhysicalSize};
 use crate::error::RequestError;
-use crate::event::{
-    ButtonSource, DeviceId, ElementState, MouseScrollDelta, PointerKind, PointerSource,
-    SurfaceSizeWriter,
-};
+use crate::event::{Force, MouseButton, MouseScrollDelta, SurfaceSizeWriter};
 use crate::keyboard::{Key, KeyLocation, ModifiersState, PhysicalKey};
 use crate::platform_impl::Fullscreen;
-use crate::window::{WindowAttributes, WindowId};
+use crate::window::{WindowAttributes, WindowId as RootWindowId};

 #[allow(dead_code)]
 pub struct Canvas {
@@ -72,8 +71,8 @@ pub struct Common {

 #[derive(Clone, Debug)]
 pub struct Style {
-    pub(super) read: CssStyleDeclaration,
-    pub(super) write: CssStyleDeclaration,
+    read: CssStyleDeclaration,
+    write: CssStyleDeclaration,
 }

 impl Canvas {
@@ -329,69 +328,75 @@ impl Canvas {
            }));
    }

-    pub fn on_pointer_leave<F>(&self, handler: F)
+    pub fn on_cursor_leave<F>(&self, handler: F)
    where
-        F: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, PointerKind),
+        F: 'static + FnMut(ModifiersState, Option<DeviceId>),
    {
-        self.handlers.borrow_mut().pointer_handler.on_pointer_leave(&self.common, handler)
+        self.handlers.borrow_mut().pointer_handler.on_cursor_leave(&self.common, handler)
    }

-    pub fn on_pointer_enter<F>(&self, handler: F)
+    pub fn on_cursor_enter<F>(&self, handler: F)
    where
-        F: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, PointerKind),
+        F: 'static + FnMut(ModifiersState, Option<DeviceId>),
    {
-        self.handlers.borrow_mut().pointer_handler.on_pointer_enter(&self.common, handler)
+        self.handlers.borrow_mut().pointer_handler.on_cursor_enter(&self.common, handler)
    }

-    pub fn on_pointer_release<C>(&self, handler: C)
+    pub fn on_mouse_release<M, T>(&self, mouse_handler: M, touch_handler: T)
    where
-        C: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, ButtonSource),
+        M: 'static + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, MouseButton),
+        T: 'static + FnMut(ModifiersState, DeviceId, FingerId, PhysicalPosition<f64>, Force),
    {
-        self.handlers.borrow_mut().pointer_handler.on_pointer_release(&self.common, handler)
-    }
-
-    pub fn on_pointer_press<C>(&self, handler: C)
-    where
-        C: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, ButtonSource),
-    {
-        self.handlers.borrow_mut().pointer_handler.on_pointer_press(
+        self.handlers.borrow_mut().pointer_handler.on_mouse_release(
            &self.common,
-            handler,
+            mouse_handler,
+            touch_handler,
+        )
+    }
+
+    pub fn on_mouse_press<M, T>(&self, mouse_handler: M, touch_handler: T)
+    where
+        M: 'static + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, MouseButton),
+        T: 'static + FnMut(ModifiersState, DeviceId, FingerId, PhysicalPosition<f64>, Force),
+    {
+        self.handlers.borrow_mut().pointer_handler.on_mouse_press(
+            &self.common,
+            mouse_handler,
+            touch_handler,
            Rc::clone(&self.prevent_default),
        )
    }

-    pub fn on_pointer_move<C, B>(&self, cursor_handler: C, button_handler: B)
+    pub fn on_cursor_move<M, T, B>(&self, mouse_handler: M, touch_handler: T, button_handler: B)
    where
-        C: 'static
-            + FnMut(
-                Option<DeviceId>,
-                &mut dyn Iterator<
-                    Item = (ModifiersState, bool, PhysicalPosition<f64>, PointerSource),
-                >,
-            ),
-        B: 'static
+        M: 'static
+            + FnMut(ModifiersState, DeviceId, &mut dyn Iterator<Item = PhysicalPosition<f64>>),
+        T: 'static
            + FnMut(
                ModifiersState,
-                Option<DeviceId>,
-                bool,
-                PhysicalPosition<f64>,
-                ElementState,
-                ButtonSource,
+                DeviceId,
+                FingerId,
+                &mut dyn Iterator<Item = (PhysicalPosition<f64>, Force)>,
            ),
+        B: 'static
+            + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, ButtonsState, MouseButton),
    {
-        self.handlers.borrow_mut().pointer_handler.on_pointer_move(
+        self.handlers.borrow_mut().pointer_handler.on_cursor_move(
            &self.common,
-            cursor_handler,
+            mouse_handler,
+            touch_handler,
            button_handler,
            Rc::clone(&self.prevent_default),
        )
    }

+    pub fn on_touch_cancel<F>(&self, handler: F)
+    where
+        F: 'static + FnMut(DeviceId, FingerId, PhysicalPosition<f64>, Force),
+    {
+        self.handlers.borrow_mut().pointer_handler.on_touch_cancel(&self.common, handler)
+    }
+
    pub fn on_mouse_wheel<F>(&self, mut handler: F)
    where
        F: 'static + FnMut(MouseScrollDelta, ModifiersState),
@@ -496,7 +501,7 @@ impl Canvas {
        let new_size = {
            let new_size = Arc::new(Mutex::new(current_size));
            event_handler(crate::event::Event::WindowEvent {
-                window_id: self.id,
+                window_id: RootWindowId(self.id),
                event: crate::event::WindowEvent::ScaleFactorChanged {
                    scale_factor: scale,
                    surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(&new_size)),
@@ -524,7 +529,7 @@ impl Canvas {
            // Then we at least send a resized event.
            self.set_old_size(new_size);
            runner.send_event(crate::event::Event::WindowEvent {
-                window_id: self.id,
+                window_id: RootWindowId(self.id),
                event: crate::event::WindowEvent::SurfaceResized(new_size),
            })
        }
--- a/src/platform_impl/web/web_sys/event.rs
+++ b/src/platform_impl/web/web_sys/event.rs
@@ -7,7 +7,7 @@ use wasm_bindgen::{JsCast, JsValue};
 use web_sys::{KeyboardEvent, MouseEvent, Navigator, PointerEvent, WheelEvent};

 use super::Engine;
-use crate::event::{FingerId, MouseButton, MouseScrollDelta, PointerKind};
+use crate::event::{MouseButton, MouseScrollDelta};
 use crate::keyboard::{Key, KeyLocation, ModifiersState, NamedKey, PhysicalKey};

 bitflags::bitflags! {
@@ -68,14 +68,14 @@ pub fn mouse_button(event: &MouseEvent) -> Option<MouseButton> {
 }

 impl MouseButton {
-    pub fn to_id(self) -> u16 {
+    pub fn to_id(self) -> u32 {
        match self {
            MouseButton::Left => 0,
            MouseButton::Right => 1,
            MouseButton::Middle => 2,
            MouseButton::Back => 3,
            MouseButton::Forward => 4,
-            MouseButton::Other(value) => value,
+            MouseButton::Other(value) => value.into(),
        }
    }
 }
@@ -160,14 +160,6 @@ pub fn mouse_scroll_delta(
    }
 }

-pub fn pointer_type(event: &PointerEvent, pointer_id: i32) -> PointerKind {
-    match event.pointer_type().as_str() {
-        "mouse" => PointerKind::Mouse,
-        "touch" => PointerKind::Touch(FingerId::from_raw(pointer_id as usize)),
-        _ => PointerKind::Unknown,
-    }
-}
-
 pub fn key_code(event: &KeyboardEvent) -> PhysicalKey {
    let code = event.code();
    PhysicalKey::from_key_code_attribute_value(&code)
--- a/src/platform_impl/web/web_sys/mod.rs
+++ b/src/platform_impl/web/web_sys/mod.rs
@@ -7,7 +7,6 @@ mod intersection_handle;
 mod media_query_handle;
 mod pointer;
 mod resize_scaling;
-mod safe_area;
 mod schedule;

 use std::cell::OnceCell;
@@ -19,9 +18,9 @@ use wasm_bindgen::JsCast;
 use web_sys::{Document, HtmlCanvasElement, Navigator, PageTransitionEvent, VisibilityState};

 pub use self::canvas::{Canvas, Style};
+pub use self::event::ButtonsState;
 pub use self::event_handle::EventListenerHandle;
 pub use self::resize_scaling::ResizeScaleHandle;
-pub use self::safe_area::SafeAreaHandle;
 pub use self::schedule::Schedule;
 use crate::dpi::{LogicalPosition, LogicalSize};

--- a/src/platform_impl/web/web_sys/pointer.rs
+++ b/src/platform_impl/web/web_sys/pointer.rs
@@ -1,15 +1,16 @@
 use std::cell::Cell;
 use std::rc::Rc;

+use event::ButtonsState;
 use web_sys::PointerEvent;

+use super::super::event::{DeviceId, FingerId};
 use super::canvas::Common;
 use super::event;
 use super::event_handle::EventListenerHandle;
 use crate::dpi::PhysicalPosition;
-use crate::event::{ButtonSource, DeviceId, ElementState, Force, PointerKind, PointerSource};
+use crate::event::{Force, MouseButton};
 use crate::keyboard::ModifiersState;
-use crate::platform_impl::web::event::mkdid;

 #[allow(dead_code)]
 pub(super) struct PointerHandler {
@@ -33,83 +34,86 @@ impl PointerHandler {
        }
    }

-    pub fn on_pointer_leave<F>(&mut self, canvas_common: &Common, mut handler: F)
+    pub fn on_cursor_leave<F>(&mut self, canvas_common: &Common, mut handler: F)
    where
-        F: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, PointerKind),
+        F: 'static + FnMut(ModifiersState, Option<DeviceId>),
    {
-        let window = canvas_common.window.clone();
        self.on_cursor_leave =
            Some(canvas_common.add_event("pointerout", move |event: PointerEvent| {
                let modifiers = event::mouse_modifiers(&event);
-                let pointer_id = event.pointer_id();
-                let device_id = mkdid(pointer_id);
-                let position =
-                    event::mouse_position(&event).to_physical(super::scale_factor(&window));
-                let kind = event::pointer_type(&event, pointer_id);
-                handler(modifiers, device_id, event.is_primary(), position, kind);
+
+                // touch events are handled separately
+                // handling them here would produce duplicate mouse events, inconsistent with
+                // other platforms.
+                let device_id =
+                    (event.pointer_type() != "touch").then(|| DeviceId::new(event.pointer_id()));
+
+                handler(modifiers, device_id);
            }));
    }

-    pub fn on_pointer_enter<F>(&mut self, canvas_common: &Common, mut handler: F)
+    pub fn on_cursor_enter<F>(&mut self, canvas_common: &Common, mut handler: F)
    where
-        F: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, PointerKind),
+        F: 'static + FnMut(ModifiersState, Option<DeviceId>),
    {
-        let window = canvas_common.window.clone();
        self.on_cursor_enter =
            Some(canvas_common.add_event("pointerover", move |event: PointerEvent| {
                let modifiers = event::mouse_modifiers(&event);
-                let pointer_id = event.pointer_id();
-                let device_id = mkdid(pointer_id);
-                let position =
-                    event::mouse_position(&event).to_physical(super::scale_factor(&window));
-                let kind = event::pointer_type(&event, pointer_id);
-                handler(modifiers, device_id, event.is_primary(), position, kind);
+
+                // touch events are handled separately
+                // handling them here would produce duplicate mouse events, inconsistent with
+                // other platforms.
+                let device_id =
+                    (event.pointer_type() != "touch").then(|| DeviceId::new(event.pointer_id()));
+
+                handler(modifiers, device_id);
            }));
    }

-    pub fn on_pointer_release<C>(&mut self, canvas_common: &Common, mut handler: C)
-    where
-        C: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, ButtonSource),
+    pub fn on_mouse_release<M, T>(
+        &mut self,
+        canvas_common: &Common,
+        mut mouse_handler: M,
+        mut touch_handler: T,
+    ) where
+        M: 'static + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, MouseButton),
+        T: 'static + FnMut(ModifiersState, DeviceId, FingerId, PhysicalPosition<f64>, Force),
    {
        let window = canvas_common.window.clone();
        self.on_pointer_release =
            Some(canvas_common.add_event("pointerup", move |event: PointerEvent| {
                let modifiers = event::mouse_modifiers(&event);
-                let pointer_id = event.pointer_id();
-                let kind = event::pointer_type(&event, pointer_id);

-                let button = event::mouse_button(&event).expect("no mouse button pressed");
-
-                let source = match kind {
-                    PointerKind::Mouse => ButtonSource::Mouse(button),
-                    PointerKind::Touch(finger_id) => ButtonSource::Touch {
-                        finger_id,
-                        force: Some(Force::Normalized(event.pressure().into())),
+                match event.pointer_type().as_str() {
+                    "touch" => {
+                        let pointer_id = event.pointer_id();
+                        touch_handler(
+                            modifiers,
+                            DeviceId::new(pointer_id),
+                            FingerId::new(pointer_id, event.is_primary()),
+                            event::mouse_position(&event).to_physical(super::scale_factor(&window)),
+                            Force::Normalized(event.pressure() as f64),
+                        )
                    },
-                    PointerKind::Unknown => ButtonSource::Unknown(button.to_id()),
-                };
-
-                handler(
-                    modifiers,
-                    mkdid(pointer_id),
-                    event.is_primary(),
-                    event::mouse_position(&event).to_physical(super::scale_factor(&window)),
-                    source,
-                )
+                    _ => mouse_handler(
+                        modifiers,
+                        DeviceId::new(event.pointer_id()),
+                        event::mouse_position(&event).to_physical(super::scale_factor(&window)),
+                        event::mouse_button(&event).expect("no mouse button released"),
+                    ),
+                }
            }));
    }

-    pub fn on_pointer_press<C>(
+    pub fn on_mouse_press<M, T>(
        &mut self,
        canvas_common: &Common,
-        mut handler: C,
+        mut mouse_handler: M,
+        mut touch_handler: T,
        prevent_default: Rc<Cell<bool>>,
    ) where
-        C: 'static
-            + FnMut(ModifiersState, Option<DeviceId>, bool, PhysicalPosition<f64>, ButtonSource),
+        M: 'static + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, MouseButton),
+        T: 'static + FnMut(ModifiersState, DeviceId, FingerId, PhysicalPosition<f64>, Force),
    {
        let window = canvas_common.window.clone();
        let canvas = canvas_common.raw().clone();
@@ -123,70 +127,69 @@ impl PointerHandler {
                }

                let modifiers = event::mouse_modifiers(&event);
-                let pointer_id = event.pointer_id();
-                let kind = event::pointer_type(&event, pointer_id);
-                let button = event::mouse_button(&event).expect("no mouse button pressed");
+                let pointer_type = &event.pointer_type();

-                let source = match kind {
-                    PointerKind::Mouse => {
-                        // Error is swallowed here since the error would occur every time the
-                        // mouse is clicked when the cursor is
-                        // grabbed, and there is probably not a
-                        // situation where this could fail, that we
-                        // care if it fails.
-                        let _e = canvas.set_pointer_capture(pointer_id);
-
-                        ButtonSource::Mouse(button)
+                match pointer_type.as_str() {
+                    "touch" => {
+                        let pointer_id = event.pointer_id();
+                        touch_handler(
+                            modifiers,
+                            DeviceId::new(pointer_id),
+                            FingerId::new(pointer_id, event.is_primary()),
+                            event::mouse_position(&event).to_physical(super::scale_factor(&window)),
+                            Force::Normalized(event.pressure() as f64),
+                        );
                    },
-                    PointerKind::Touch(finger_id) => ButtonSource::Touch {
-                        finger_id,
-                        force: Some(Force::Normalized(event.pressure().into())),
-                    },
-                    PointerKind::Unknown => ButtonSource::Unknown(button.to_id()),
-                };
+                    _ => {
+                        let pointer_id = event.pointer_id();

-                handler(
-                    modifiers,
-                    mkdid(pointer_id),
-                    event.is_primary(),
-                    event::mouse_position(&event).to_physical(super::scale_factor(&window)),
-                    source,
-                )
+                        mouse_handler(
+                            modifiers,
+                            DeviceId::new(pointer_id),
+                            event::mouse_position(&event).to_physical(super::scale_factor(&window)),
+                            event::mouse_button(&event).expect("no mouse button pressed"),
+                        );
+
+                        if pointer_type == "mouse" {
+                            // Error is swallowed here since the error would occur every time the
+                            // mouse is clicked when the cursor is
+                            // grabbed, and there is probably not a
+                            // situation where this could fail, that we
+                            // care if it fails.
+                            let _e = canvas.set_pointer_capture(pointer_id);
+                        }
+                    },
+                }
            }));
    }

-    pub fn on_pointer_move<C, B>(
+    pub fn on_cursor_move<M, T, B>(
        &mut self,
        canvas_common: &Common,
-        mut cursor_handler: C,
+        mut mouse_handler: M,
+        mut touch_handler: T,
        mut button_handler: B,
        prevent_default: Rc<Cell<bool>>,
    ) where
-        C: 'static
-            + FnMut(
-                Option<DeviceId>,
-                &mut dyn Iterator<
-                    Item = (ModifiersState, bool, PhysicalPosition<f64>, PointerSource),
-                >,
-            ),
-        B: 'static
+        M: 'static
+            + FnMut(ModifiersState, DeviceId, &mut dyn Iterator<Item = PhysicalPosition<f64>>),
+        T: 'static
            + FnMut(
                ModifiersState,
-                Option<DeviceId>,
-                bool,
-                PhysicalPosition<f64>,
-                ElementState,
-                ButtonSource,
+                DeviceId,
+                FingerId,
+                &mut dyn Iterator<Item = (PhysicalPosition<f64>, Force)>,
            ),
+        B: 'static
+            + FnMut(ModifiersState, DeviceId, PhysicalPosition<f64>, ButtonsState, MouseButton),
    {
        let window = canvas_common.window.clone();
        let canvas = canvas_common.raw().clone();
        self.on_cursor_move =
            Some(canvas_common.add_event("pointermove", move |event: PointerEvent| {
+                let modifiers = event::mouse_modifiers(&event);
                let pointer_id = event.pointer_id();
-                let device_id = mkdid(pointer_id);
-                let kind = event::pointer_type(&event, pointer_id);
-                let primary = event.is_primary();
+                let device_id = DeviceId::new(pointer_id);

                // chorded button event
                if let Some(button) = event::mouse_button(&event) {
@@ -197,35 +200,11 @@ impl PointerHandler {
                        let _ = canvas.focus();
                    }

-                    let state = if event::mouse_buttons(&event).contains(button.into()) {
-                        ElementState::Pressed
-                    } else {
-                        ElementState::Released
-                    };
-
-                    let button = match kind {
-                        PointerKind::Mouse => ButtonSource::Mouse(button),
-                        PointerKind::Touch(finger_id) => {
-                            let button_id = button.to_id();
-
-                            if button_id != 1 {
-                                tracing::error!("unexpected touch button id: {button_id}");
-                            }
-
-                            ButtonSource::Touch {
-                                finger_id,
-                                force: Some(Force::Normalized(event.pressure().into())),
-                            }
-                        },
-                        PointerKind::Unknown => todo!(),
-                    };
-
                    button_handler(
-                        event::mouse_modifiers(&event),
+                        modifiers,
                        device_id,
-                        primary,
                        event::mouse_position(&event).to_physical(super::scale_factor(&window)),
-                        state,
+                        event::mouse_buttons(&event),
                        button,
                    );

@@ -234,25 +213,44 @@ impl PointerHandler {

                // pointer move event
                let scale = super::scale_factor(&window);
+                match event.pointer_type().as_str() {
+                    "touch" => touch_handler(
+                        modifiers,
+                        device_id,
+                        FingerId::new(pointer_id, event.is_primary()),
+                        &mut event::pointer_move_event(event).map(|event| {
+                            (
+                                event::mouse_position(&event).to_physical(scale),
+                                Force::Normalized(event.pressure() as f64),
+                            )
+                        }),
+                    ),
+                    _ => mouse_handler(
+                        modifiers,
+                        device_id,
+                        &mut event::pointer_move_event(event)
+                            .map(|event| event::mouse_position(&event).to_physical(scale)),
+                    ),
+                };
+            }));
+    }

-                cursor_handler(
-                    device_id,
-                    &mut event::pointer_move_event(event).map(|event| {
-                        (
-                            event::mouse_modifiers(&event),
-                            event.is_primary(),
-                            event::mouse_position(&event).to_physical(scale),
-                            match kind {
-                                PointerKind::Mouse => PointerSource::Mouse,
-                                PointerKind::Touch(finger_id) => PointerSource::Touch {
-                                    finger_id,
-                                    force: Some(Force::Normalized(event.pressure().into())),
-                                },
-                                PointerKind::Unknown => PointerSource::Unknown,
-                            },
-                        )
-                    }),
-                );
+    pub fn on_touch_cancel<F>(&mut self, canvas_common: &Common, mut handler: F)
+    where
+        F: 'static + FnMut(DeviceId, FingerId, PhysicalPosition<f64>, Force),
+    {
+        let window = canvas_common.window.clone();
+        self.on_touch_cancel =
+            Some(canvas_common.add_event("pointercancel", move |event: PointerEvent| {
+                if event.pointer_type() == "touch" {
+                    let pointer_id = event.pointer_id();
+                    handler(
+                        DeviceId::new(pointer_id),
+                        FingerId::new(pointer_id, event.is_primary()),
+                        event::mouse_position(&event).to_physical(super::scale_factor(&window)),
+                        Force::Normalized(event.pressure() as f64),
+                    );
+                }
            }));
    }

--- a/src/platform_impl/web/web_sys/safe_area.rs
+++ b/src/platform_impl/web/web_sys/safe_area.rs
@@ -1,56 +0,0 @@
-use dpi::{LogicalPosition, LogicalSize};
-use wasm_bindgen::JsCast;
-use web_sys::{Document, HtmlHtmlElement, Window};
-
-use super::Style;
-
-pub struct SafeAreaHandle {
-    style: Style,
-}
-
-impl SafeAreaHandle {
-    pub fn new(window: &Window, document: &Document) -> Self {
-        let document: HtmlHtmlElement = document.document_element().unwrap().unchecked_into();
-        #[allow(clippy::disallowed_methods)]
-        let write = document.style();
-        write
-            .set_property(
-                "--__winit_safe_area",
-                "env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) \
-                 env(safe-area-inset-left)",
-            )
-            .expect("unexpected read-only declaration block");
-        #[allow(clippy::disallowed_methods)]
-        let read = window
-            .get_computed_style(&document)
-            .expect("failed to obtain computed style")
-            // this can't fail: we aren't using a pseudo-element
-            .expect("invalid pseudo-element");
-
-        SafeAreaHandle { style: Style { read, write } }
-    }
-
-    pub fn get(&self) -> (LogicalPosition<f64>, LogicalSize<f64>) {
-        let value = self.style.get("--__winit_safe_area");
-
-        let mut values = value
-            .split(' ')
-            .map(|value| value.strip_suffix("px").expect("unexpected unit other then `px` found"));
-        let top: f64 = values.next().unwrap().parse().unwrap();
-        let right: f64 = values.next().unwrap().parse().unwrap();
-        let bottom: f64 = values.next().unwrap().parse().unwrap();
-        let left: f64 = values.next().unwrap().parse().unwrap();
-        assert_eq!(values.next(), None, "unexpected fifth value");
-
-        let width = super::style_size_property(&self.style, "width") - left - right;
-        let height = super::style_size_property(&self.style, "height") - top - bottom;
-
-        (LogicalPosition::new(left, top), LogicalSize::new(width, height))
-    }
-}
-
-impl Drop for SafeAreaHandle {
-    fn drop(&mut self) {
-        self.style.remove("--__winit_safe_area");
-    }
-}
--- a/src/platform_impl/web/window.rs
+++ b/src/platform_impl/web/window.rs
@@ -2,20 +2,19 @@ use std::cell::Ref;
 use std::rc::Rc;
 use std::sync::Arc;

-use dpi::{LogicalPosition, LogicalSize};
 use web_sys::HtmlCanvasElement;

 use super::main_thread::{MainThreadMarker, MainThreadSafe};
 use super::monitor::MonitorHandler;
 use super::r#async::Dispatcher;
 use super::{backend, lock, ActiveEventLoop};
-use crate::dpi::{LogicalInsets, PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::icon::Icon;
 use crate::monitor::MonitorHandle as RootMonitorHandle;
 use crate::window::{
    Cursor, CursorGrabMode, Fullscreen as RootFullscreen, ImePurpose, ResizeDirection, Theme,
-    UserAttentionType, Window as RootWindow, WindowAttributes, WindowButtons, WindowId,
+    UserAttentionType, Window as RootWindow, WindowAttributes, WindowButtons, WindowId as RootWI,
    WindowLevel,
 };

@@ -27,7 +26,6 @@ pub struct Inner {
    id: WindowId,
    pub window: web_sys::Window,
    monitor: Rc<MonitorHandler>,
-    safe_area: Rc<backend::SafeAreaHandle>,
    canvas: Rc<backend::Canvas>,
    destroy_fn: Option<Box<dyn FnOnce()>>,
 }
@@ -55,20 +53,19 @@ impl Window {
        target.register(&canvas, id);

        let runner = target.runner.clone();
-        let destroy_fn = Box::new(move || runner.notify_destroy_window(id));
+        let destroy_fn = Box::new(move || runner.notify_destroy_window(RootWI(id)));

        let inner = Inner {
            id,
            window: window.clone(),
            monitor: Rc::clone(target.runner.monitor()),
-            safe_area: Rc::clone(target.runner.safe_area()),
            canvas,
            destroy_fn: Some(destroy_fn),
        };

        let canvas = Rc::downgrade(&inner.canvas);
        let (dispatcher, runner) = Dispatcher::new(target.runner.main_thread(), inner);
-        target.runner.add_canvas(id, canvas, runner);
+        target.runner.add_canvas(RootWI(id), canvas, runner);

        Ok(Window { inner: dispatcher })
    }
@@ -94,8 +91,8 @@ impl Window {
 }

 impl RootWindow for Window {
-    fn id(&self) -> WindowId {
-        self.inner.queue(|inner| inner.id)
+    fn id(&self) -> RootWI {
+        RootWI(self.inner.queue(|inner| inner.id))
    }

    fn scale_factor(&self) -> f64 {
@@ -112,9 +109,9 @@ impl RootWindow for Window {
        // Not supported
    }

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        // Note: the canvas element has no window decorations.
-        (0, 0).into()
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        // Note: the canvas element has no window decorations, so this is equal to `outer_position`.
+        self.outer_position()
    }

    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
@@ -155,34 +152,6 @@ impl RootWindow for Window {
        self.surface_size()
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        self.inner.queue(|inner| {
-            let (safe_start_pos, safe_size) = inner.safe_area.get();
-            let safe_end_pos = LogicalPosition::new(
-                safe_start_pos.x + safe_size.width,
-                safe_start_pos.y + safe_size.height,
-            );
-
-            let surface_start_pos = inner.canvas.position();
-            let surface_size = LogicalSize::new(
-                backend::style_size_property(inner.canvas.style(), "width"),
-                backend::style_size_property(inner.canvas.style(), "height"),
-            );
-            let surface_end_pos = LogicalPosition::new(
-                surface_start_pos.x + surface_size.width,
-                surface_start_pos.y + surface_size.height,
-            );
-
-            let top = f64::max(safe_start_pos.y - surface_start_pos.y, 0.);
-            let left = f64::max(safe_start_pos.x - surface_start_pos.x, 0.);
-            let bottom = f64::max(surface_end_pos.y - safe_end_pos.y, 0.);
-            let right = f64::max(surface_end_pos.x - safe_end_pos.x, 0.);
-
-            let insets = LogicalInsets::new(top, left, bottom, right);
-            insets.to_physical(inner.scale_factor())
-        })
-    }
-
    fn set_min_surface_size(&self, min_size: Option<Size>) {
        self.inner.dispatch(move |inner| {
            let dimensions = min_size.map(|min_size| min_size.to_logical(inner.scale_factor()));
@@ -406,15 +375,18 @@ impl RootWindow for Window {
        self.inner.queue(|inner| inner.monitor.primary_monitor()).map(RootMonitorHandle::from)
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        MainThreadMarker::new()
@@ -436,6 +408,7 @@ impl rwh_06::HasWindowHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        Ok(rwh_06::DisplayHandle::web())
@@ -456,6 +429,27 @@ impl Drop for Inner {
        }
    }
 }
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(pub(crate) u32);
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        Self(0)
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0 as u64
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self(raw_id as u32)
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct PlatformSpecificWindowAttributes {
    pub(crate) canvas: Option<Arc<MainThreadSafe<backend::RawCanvasType>>>,
--- a/src/platform_impl/windows/drop_handler.rs
+++ b/src/platform_impl/windows/drop_handler.rs
@@ -15,7 +15,8 @@ use crate::event::Event;
 use crate::platform_impl::platform::definitions::{
    IDataObjectVtbl, IDropTarget, IDropTargetVtbl, IUnknownVtbl,
 };
-use crate::window::WindowId;
+use crate::platform_impl::platform::WindowId;
+use crate::window::WindowId as RootWindowId;

 #[repr(C)]
 pub struct FileDropHandlerData {
@@ -85,7 +86,7 @@ impl FileDropHandler {
        let hdrop = unsafe {
            Self::iterate_filenames(pDataObj, |filename| {
                drop_handler.send_event(Event::WindowEvent {
-                    window_id: WindowId::from_raw(drop_handler.window as usize),
+                    window_id: RootWindowId(WindowId(drop_handler.window)),
                    event: HoveredFile(filename),
                });
            })
@@ -119,7 +120,7 @@ impl FileDropHandler {
        let drop_handler = unsafe { Self::from_interface(this) };
        if drop_handler.hovered_is_valid {
            drop_handler.send_event(Event::WindowEvent {
-                window_id: WindowId::from_raw(drop_handler.window as usize),
+                window_id: RootWindowId(WindowId(drop_handler.window)),
                event: HoveredFileCancelled,
            });
        }
@@ -139,7 +140,7 @@ impl FileDropHandler {
        let hdrop = unsafe {
            Self::iterate_filenames(pDataObj, |filename| {
                drop_handler.send_event(Event::WindowEvent {
-                    window_id: WindowId::from_raw(drop_handler.window as usize),
+                    window_id: RootWindowId(WindowId(drop_handler.window)),
                    event: DroppedFile(filename),
                });
            })
--- a/src/platform_impl/windows/event_loop.rs
+++ b/src/platform_impl/windows/event_loop.rs
--- a/src/platform_impl/windows/event_loop/runner.rs
+++ b/src/platform_impl/windows/event_loop/runner.rs
@@ -53,7 +53,7 @@ pub(crate) enum RunnerState {

 enum BufferedEvent {
    Event(Event),
-    ScaleFactorChanged(HWND, f64, PhysicalSize<u32>),
+    ScaleFactorChanged(WindowId, f64, PhysicalSize<u32>),
 }

 impl EventLoopRunner {
@@ -360,7 +360,7 @@ impl BufferedEvent {
                event: WindowEvent::ScaleFactorChanged { scale_factor, surface_size_writer },
                window_id,
            } => BufferedEvent::ScaleFactorChanged(
-                window_id.into_raw() as HWND,
+                window_id,
                scale_factor,
                *surface_size_writer.new_surface_size.upgrade().unwrap().lock().unwrap(),
            ),
@@ -371,10 +371,10 @@ impl BufferedEvent {
    pub fn dispatch_event(self, dispatch: impl FnOnce(Event)) {
        match self {
            Self::Event(event) => dispatch(event),
-            Self::ScaleFactorChanged(window, scale_factor, new_surface_size) => {
+            Self::ScaleFactorChanged(window_id, scale_factor, new_surface_size) => {
                let user_new_surface_size = Arc::new(Mutex::new(new_surface_size));
                dispatch(Event::WindowEvent {
-                    window_id: WindowId::from_raw(window as usize),
+                    window_id,
                    event: WindowEvent::ScaleFactorChanged {
                        scale_factor,
                        surface_size_writer: SurfaceSizeWriter::new(Arc::downgrade(
@@ -388,11 +388,12 @@ impl BufferedEvent {

                if surface_size != new_surface_size {
                    let window_flags = unsafe {
-                        let userdata = get_window_long(window, GWL_USERDATA) as *mut WindowData;
+                        let userdata =
+                            get_window_long(window_id.0.into(), GWL_USERDATA) as *mut WindowData;
                        (*userdata).window_state_lock().window_flags
                    };

-                    window_flags.set_size(window, surface_size);
+                    window_flags.set_size((window_id.0).0, surface_size);
                }
            },
        }
--- a/src/platform_impl/windows/keyboard.rs
+++ b/src/platform_impl/windows/keyboard.rs
@@ -97,7 +97,7 @@ impl KeyEventBuilder {
                    MatchResult::MessagesToDispatch(self.pending.complete_multi(key_events))
                },
                WM_KILLFOCUS => {
-                    // synthesize keyup events
+                    // sythesize keyup events
                    let kbd_state = get_kbd_state();
                    let key_events = Self::synthesize_kbd_state(ElementState::Released, &kbd_state);
                    MatchResult::MessagesToDispatch(self.pending.complete_multi(key_events))
@@ -333,11 +333,11 @@ impl KeyEventBuilder {
        // We are synthesizing the press event for caps-lock first for the following reasons:
        // 1. If caps-lock is *not* held down but *is* active, then we have to synthesize all
        //    printable keys, respecting the caps-lock state.
-        // 2. If caps-lock is held down, we could choose to synthesize its keypress after every
-        //    other key, in which case all other keys *must* be sythesized as if the caps-lock state
-        //    was be the opposite of what it currently is.
+        // 2. If caps-lock is held down, we could choose to sythesize its keypress after every other
+        //    key, in which case all other keys *must* be sythesized as if the caps-lock state was
+        //    be the opposite of what it currently is.
        // --
-        // For the sake of simplicity we are choosing to always synthesize
+        // For the sake of simplicity we are choosing to always sythesize
        // caps-lock first, and always use the current caps-lock state
        // to determine the produced text
        if is_key_pressed!(VK_CAPITAL) {
--- a/src/platform_impl/windows/mod.rs
+++ b/src/platform_impl/windows/mod.rs
@@ -1,15 +1,17 @@
 use smol_str::SmolStr;
-use windows_sys::Win32::Foundation::HWND;
+use windows_sys::Win32::Foundation::{HANDLE, HWND};
 use windows_sys::Win32::UI::WindowsAndMessaging::{HMENU, WINDOW_LONG_PTR_INDEX};

-pub(crate) use self::event_loop::{EventLoop, PlatformSpecificEventLoopAttributes};
+pub(crate) use self::event_loop::{
+    EventLoop, EventLoopProxy, OwnedDisplayHandle, PlatformSpecificEventLoopAttributes,
+};
 pub use self::icon::WinIcon as PlatformIcon;
 pub(crate) use self::icon::{SelectedCursor, WinCursor as PlatformCustomCursor, WinIcon};
 pub(crate) use self::keyboard::{physicalkey_to_scancode, scancode_to_physicalkey};
 pub(crate) use self::monitor::{MonitorHandle, VideoModeHandle};
 pub(crate) use self::window::Window;
 pub(crate) use crate::cursor::OnlyCursorImageSource as PlatformCustomCursorSource;
-use crate::event::DeviceId;
+use crate::event::DeviceId as RootDeviceId;
 use crate::icon::Icon;
 use crate::keyboard::Key;
 use crate::platform::windows::{BackdropType, Color, CornerPreference};
@@ -57,8 +59,48 @@ impl Default for PlatformSpecificWindowAttributes {
 unsafe impl Send for PlatformSpecificWindowAttributes {}
 unsafe impl Sync for PlatformSpecificWindowAttributes {}

-fn wrap_device_id(id: u32) -> DeviceId {
-    DeviceId::from_raw(id as i64)
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId(u32);
+
+impl DeviceId {
+    pub const fn dummy() -> Self {
+        DeviceId(0)
+    }
+}
+
+impl DeviceId {
+    pub fn persistent_identifier(&self) -> Option<String> {
+        if self.0 != 0 {
+            raw_input::get_raw_input_device_name(self.0 as HANDLE)
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FingerId {
+    id: u32,
+    primary: bool,
+}
+
+impl FingerId {
+    pub const fn dummy() -> Self {
+        FingerId { id: 0, primary: false }
+    }
+}
+
+impl FingerId {
+    pub fn is_primary(self) -> bool {
+        self.primary
+    }
+}
+
+// Constant device ID, to be removed when this backend is updated to report real device IDs.
+const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId(0));
+
+fn wrap_device_id(id: u32) -> RootDeviceId {
+    RootDeviceId(DeviceId(id))
 }

 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
@@ -67,6 +109,35 @@ pub struct KeyEventExtra {
    pub key_without_modifiers: Key,
 }

+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(HWND);
+unsafe impl Send for WindowId {}
+unsafe impl Sync for WindowId {}
+
+impl WindowId {
+    pub const fn dummy() -> Self {
+        WindowId(0)
+    }
+}
+
+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0 as u64
+    }
+}
+
+impl From<WindowId> for HWND {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self(raw_id as HWND)
+    }
+}
+
 #[inline(always)]
 const fn get_xbutton_wparam(x: u32) -> u16 {
    hiword(x)
@@ -132,6 +203,6 @@ mod ime;
 mod keyboard;
 mod keyboard_layout;
 mod monitor;
-pub(crate) mod raw_input;
+mod raw_input;
 mod window;
 mod window_state;
--- a/src/platform_impl/windows/util.rs
+++ b/src/platform_impl/windows/util.rs
@@ -14,7 +14,7 @@ use windows_sys::Win32::UI::HiDpi::{
    DPI_AWARENESS_CONTEXT, MONITOR_DPI_TYPE, PROCESS_DPI_AWARENESS,
 };
 use windows_sys::Win32::UI::Input::KeyboardAndMouse::GetActiveWindow;
-use windows_sys::Win32::UI::Input::Pointer::{POINTER_INFO, POINTER_TOUCH_INFO};
+use windows_sys::Win32::UI::Input::Pointer::{POINTER_INFO, POINTER_PEN_INFO, POINTER_TOUCH_INFO};
 use windows_sys::Win32::UI::WindowsAndMessaging::{
    ClipCursor, GetClientRect, GetClipCursor, GetSystemMetrics, GetWindowPlacement, GetWindowRect,
    IsIconic, ShowCursor, IDC_APPSTARTING, IDC_ARROW, IDC_CROSS, IDC_HAND, IDC_HELP, IDC_IBEAM,
@@ -244,6 +244,9 @@ pub type GetPointerDeviceRects = unsafe extern "system" fn(
 pub type GetPointerTouchInfo =
    unsafe extern "system" fn(pointerId: u32, touchInfo: *mut POINTER_TOUCH_INFO) -> BOOL;

+pub type GetPointerPenInfo =
+    unsafe extern "system" fn(pointId: u32, penInfo: *mut POINTER_PEN_INFO) -> BOOL;
+
 pub(crate) static GET_DPI_FOR_WINDOW: Lazy<Option<GetDpiForWindow>> =
    Lazy::new(|| get_function!("user32.dll", GetDpiForWindow));
 pub(crate) static ADJUST_WINDOW_RECT_EX_FOR_DPI: Lazy<Option<AdjustWindowRectExForDpi>> =
@@ -266,3 +269,5 @@ pub(crate) static GET_POINTER_DEVICE_RECTS: Lazy<Option<GetPointerDeviceRects>>
    Lazy::new(|| get_function!("user32.dll", GetPointerDeviceRects));
 pub(crate) static GET_POINTER_TOUCH_INFO: Lazy<Option<GetPointerTouchInfo>> =
    Lazy::new(|| get_function!("user32.dll", GetPointerTouchInfo));
+pub(crate) static GET_POINTER_PEN_INFO: Lazy<Option<GetPointerPenInfo>> =
+    Lazy::new(|| get_function!("user32.dll", GetPointerPenInfo));
--- a/src/platform_impl/windows/window.rs
+++ b/src/platform_impl/windows/window.rs
@@ -46,7 +46,7 @@ use windows_sys::Win32::UI::WindowsAndMessaging::{
 };

 use crate::cursor::Cursor;
-use crate::dpi::{PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::{NotSupportedError, RequestError};
 use crate::icon::Icon;
 use crate::monitor::MonitorHandle as CoreMonitorHandle;
@@ -66,11 +66,11 @@ use crate::platform_impl::platform::keyboard::KeyEventBuilder;
 use crate::platform_impl::platform::window_state::{
    CursorFlags, SavedWindow, WindowFlags, WindowState,
 };
-use crate::platform_impl::platform::{monitor, util, Fullscreen, SelectedCursor};
+use crate::platform_impl::platform::{monitor, util, Fullscreen, SelectedCursor, WindowId};
 use crate::window::{
    CursorGrabMode, Fullscreen as CoreFullscreen, ImePurpose, ResizeDirection, Theme,
-    UserAttentionType, Window as CoreWindow, WindowAttributes, WindowButtons, WindowId,
-    WindowLevel,
+    UserAttentionType, Window as CoreWindow, WindowAttributes, WindowButtons,
+    WindowId as CoreWindowId, WindowLevel,
 };

 /// The Win32 implementation of the main `Window` object.
@@ -106,6 +106,7 @@ impl Window {
        self.window
    }

+    #[cfg(feature = "rwh_06")]
    pub unsafe fn rwh_06_no_thread_check(
        &self,
    ) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
@@ -118,6 +119,7 @@ impl Window {
        Ok(rwh_06::RawWindowHandle::Win32(window_handle))
    }

+    #[cfg(feature = "rwh_06")]
    pub fn raw_window_handle_rwh_06(&self) -> Result<rwh_06::RawWindowHandle, rwh_06::HandleError> {
        // TODO: Write a test once integration framework is ready to ensure that it holds.
        // If we aren't in the GUI thread, we can't return the window.
@@ -130,6 +132,7 @@ impl Window {
        unsafe { self.rwh_06_no_thread_check() }
    }

+    #[cfg(feature = "rwh_06")]
    pub fn raw_display_handle_rwh_06(
        &self,
    ) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
@@ -346,6 +349,7 @@ impl Drop for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for Window {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_display_handle_rwh_06()?;
@@ -353,6 +357,7 @@ impl rwh_06::HasDisplayHandle for Window {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for Window {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        let raw = self.raw_window_handle_rwh_06()?;
@@ -416,15 +421,15 @@ impl CoreWindow for Window {
            )
    }

-    fn surface_position(&self) -> PhysicalPosition<i32> {
-        let mut rect: RECT = unsafe { mem::zeroed() };
-        if unsafe { GetClientRect(self.hwnd(), &mut rect) } == false.into() {
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError> {
+        let mut position: POINT = unsafe { mem::zeroed() };
+        if unsafe { ClientToScreen(self.hwnd(), &mut position) } == false.into() {
            panic!(
-                "Unexpected GetClientRect failure: please report this error to \
+                "Unexpected ClientToScreen failure: please report this error to \
                 rust-windowing/winit"
            )
        }
-        PhysicalPosition::new(rect.left, rect.top)
+        Ok(PhysicalPosition::new(position.x, position.y))
    }

    fn set_outer_position(&self, position: Position) {
@@ -494,10 +499,6 @@ impl CoreWindow for Window {
        None
    }

-    fn safe_area(&self) -> PhysicalInsets<u32> {
-        PhysicalInsets::new(0, 0, 0, 0)
-    }
-
    fn set_min_surface_size(&self, size: Option<Size>) {
        self.window_state_lock().min_size = size;
        // Make windows re-check the window size bounds.
@@ -695,8 +696,8 @@ impl CoreWindow for Window {
        Ok(())
    }

-    fn id(&self) -> WindowId {
-        WindowId::from_raw(self.hwnd() as usize)
+    fn id(&self) -> CoreWindowId {
+        CoreWindowId(WindowId(self.hwnd()))
    }

    fn set_minimized(&self, minimized: bool) {
@@ -1053,10 +1054,12 @@ impl CoreWindow for Window {
        }
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle {
        self
    }

+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle {
        self
    }
@@ -1285,6 +1288,7 @@ unsafe fn init(
        },
    };

+    #[cfg(feature = "rwh_06")]
    let parent = match attributes.parent_window.as_ref().map(|handle| handle.0) {
        Some(rwh_06::RawWindowHandle::Win32(handle)) => {
            window_flags.set(WindowFlags::CHILD, true);
@@ -1297,6 +1301,9 @@ unsafe fn init(
        None => fallback_parent(),
    };

+    #[cfg(not(feature = "rwh_06"))]
+    let parent = fallback_parent();
+
    let menu = attributes.platform_specific.menu;
    let fullscreen = attributes.fullscreen.clone();
    let maximized = attributes.maximized;
--- a/src/window.rs
+++ b/src/window.rs
@@ -7,11 +7,11 @@ pub use cursor_icon::{CursorIcon, ParseError as CursorIconParseError};
 use serde::{Deserialize, Serialize};

 pub use crate::cursor::{BadImage, Cursor, CustomCursor, CustomCursorSource, MAX_CURSOR_SIZE};
-use crate::dpi::{PhysicalInsets, PhysicalPosition, PhysicalSize, Position, Size};
+use crate::dpi::{PhysicalPosition, PhysicalSize, Position, Size};
 use crate::error::RequestError;
 pub use crate::icon::{BadIcon, Icon};
 use crate::monitor::{MonitorHandle, VideoModeHandle};
-use crate::platform_impl::PlatformSpecificWindowAttributes;
+use crate::platform_impl::{self, PlatformSpecificWindowAttributes};
 use crate::utils::AsAny;

 /// Identifier of a window. Unique for each window.
@@ -21,21 +21,18 @@ use crate::utils::AsAny;
 /// Whenever you receive an event specific to a window, this event contains a `WindowId` which you
 /// can then compare to the ids of your windows.
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct WindowId(usize);
+pub struct WindowId(pub(crate) platform_impl::WindowId);

 impl WindowId {
-    /// Convert the `WindowId` into the underlying integer.
+    /// Returns a dummy id, useful for unit testing.
    ///
-    /// This is useful if you need to pass the ID across an FFI boundary, or store it in an atomic.
-    pub const fn into_raw(self) -> usize {
-        self.0
-    }
-
-    /// Construct a `WindowId` from the underlying integer.
+    /// # Notes
    ///
-    /// This should only be called with integers returned from [`WindowId::into_raw`].
-    pub const fn from_raw(id: usize) -> Self {
-        Self(id)
+    /// The only guarantee made about the return value of this function is that
+    /// it will always be equal to itself and to future values returned by this function.
+    /// No other guarantees are made. This may be equal to a real [`WindowId`].
+    pub const fn dummy() -> Self {
+        WindowId(platform_impl::WindowId::dummy())
    }
 }

@@ -45,6 +42,18 @@ impl fmt::Debug for WindowId {
    }
 }

+impl From<WindowId> for u64 {
+    fn from(window_id: WindowId) -> Self {
+        window_id.0.into()
+    }
+}
+
+impl From<u64> for WindowId {
+    fn from(raw_id: u64) -> Self {
+        Self(raw_id.into())
+    }
+}
+
 /// Attributes used when creating a window.
 #[derive(Debug, Clone, PartialEq)]
 pub struct WindowAttributes {
@@ -67,6 +76,7 @@ pub struct WindowAttributes {
    pub window_level: WindowLevel,
    pub active: bool,
    pub cursor: Cursor,
+    #[cfg(feature = "rwh_06")]
    pub(crate) parent_window: Option<SendSyncRawWindowHandle>,
    pub fullscreen: Option<Fullscreen>,
    // Platform-specific configuration.
@@ -97,6 +107,7 @@ impl Default for WindowAttributes {
            preferred_theme: None,
            content_protected: false,
            cursor: Cursor::default(),
+            #[cfg(feature = "rwh_06")]
            parent_window: None,
            active: true,
            platform_specific: Default::default(),
@@ -111,13 +122,17 @@ impl Default for WindowAttributes {
 /// The user has to account for that when using [`WindowAttributes::with_parent_window()`],
 /// which is `unsafe`.
 #[derive(Debug, Clone, PartialEq)]
+#[cfg(feature = "rwh_06")]
 pub(crate) struct SendSyncRawWindowHandle(pub(crate) rwh_06::RawWindowHandle);

+#[cfg(feature = "rwh_06")]
 unsafe impl Send for SendSyncRawWindowHandle {}
+#[cfg(feature = "rwh_06")]
 unsafe impl Sync for SendSyncRawWindowHandle {}

 impl WindowAttributes {
    /// Get the parent window stored on the attributes.
+    #[cfg(feature = "rwh_06")]
    pub fn parent_window(&self) -> Option<&rwh_06::RawWindowHandle> {
        self.parent_window.as_ref().map(|handle| &handle.0)
    }
@@ -403,6 +418,7 @@ impl WindowAttributes {
    ///   <https://docs.microsoft.com/en-us/windows/win32/winmsg/window-features#child-windows>
    /// - **X11**: A child window is confined to the client area of its parent window.
    /// - **Android / iOS / Wayland / Web:** Unsupported.
+    #[cfg(feature = "rwh_06")]
    #[inline]
    pub unsafe fn with_parent_window(
        mut self,
@@ -574,51 +590,41 @@ pub trait Window: AsAny + Send + Sync {
    // extension trait
    fn reset_dead_keys(&self);

-    /// The position of the top-left hand corner of the surface relative to the top-left hand corner
-    /// of the window.
+    /// Returns the position of the top-left hand corner of the window's client area relative to the
+    /// top-left hand corner of the desktop.
    ///
-    /// This, combined with [`outer_position`], can be useful for calculating the position of the
-    /// surface relative to the desktop.
-    ///
-    /// This may also be useful for figuring out the size of the window's decorations (such as
-    /// buttons, title, etc.), but may also not correspond to that (e.g. if the title bar is made
-    /// transparent using [`with_titlebar_transparent`] on macOS, or your are drawing window
-    /// decorations yourself).
-    ///
-    /// This may be negative.
-    ///
-    /// If the window does not have any decorations, and the surface is in the exact same position
-    /// as the window itself, this simply returns `(0, 0)`.
-    ///
-    /// [`outer_position`]: Self::outer_position
-    #[cfg_attr(
-        any(macos_platform, docsrs),
-        doc = "[`with_titlebar_transparent`]: \
-               crate::platform::macos::WindowAttributesExtMacOS::with_titlebar_transparent"
-    )]
-    #[cfg_attr(
-        not(any(macos_platform, docsrs)),
-        doc = "[`with_titlebar_transparent`]: #only-available-on-macos"
-    )]
-    fn surface_position(&self) -> PhysicalPosition<i32>;
-
-    /// The position of the top-left hand corner of the window relative to the top-left hand corner
-    /// of the desktop.
-    ///
-    /// Note that the top-left hand corner of the desktop is not necessarily the same as
-    /// the screen. If the user uses a desktop with multiple monitors, the top-left hand corner
-    /// of the desktop is the top-left hand corner of the primary monitor of the desktop.
-    ///
-    /// The coordinates can be negative if the top-left hand corner of the window is outside
-    /// of the visible screen region, or on another monitor than the primary.
+    /// The same conditions that apply to [`Window::outer_position`] apply to this method.
    ///
    /// ## Platform-specific
    ///
+    /// - **iOS:** Returns the top left coordinates of the window's [safe area] in the screen space
+    ///   coordinate system.
+    /// - **Web:** Returns the top-left coordinates relative to the viewport. _Note: this returns
+    ///   the same value as [`Window::outer_position`]._
+    /// - **Android / Wayland:** Always returns [`RequestError::NotSupported`].
+    ///
+    /// [safe area]: https://developer.apple.com/documentation/uikit/uiview/2891103-safeareainsets?language=objc
+    fn inner_position(&self) -> Result<PhysicalPosition<i32>, RequestError>;
+
+    /// Returns the position of the top-left hand corner of the window relative to the
+    /// top-left hand corner of the desktop.
+    ///
+    /// Note that the top-left hand corner of the desktop is not necessarily the same as
+    /// the screen. If the user uses a desktop with multiple monitors, the top-left hand corner
+    /// of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
+    ///
+    /// The coordinates can be negative if the top-left hand corner of the window is outside
+    /// of the visible screen region.
+    ///
+    /// ## Platform-specific
+    ///
+    /// - **iOS:** Returns the top left coordinates of the window in the screen space coordinate
+    ///   system.
    /// - **Web:** Returns the top-left coordinates relative to the viewport.
    /// - **Android / Wayland:** Always returns [`RequestError::NotSupported`].
    fn outer_position(&self) -> Result<PhysicalPosition<i32>, RequestError>;

-    /// Sets the position of the window on the desktop.
+    /// Modifies the position of the window.
    ///
    /// See [`Window::outer_position`] for more information about the coordinates.
    /// This automatically un-maximizes the window if it's maximized.
@@ -648,21 +654,16 @@ pub trait Window: AsAny + Send + Sync {

    /// Returns the size of the window's render-able surface.
    ///
-    /// This is the dimensions you should pass to things like Wgpu or Glutin when configuring the
-    /// surface for drawing. See [`WindowEvent::SurfaceResized`] for listening to changes to this
-    /// field.
-    ///
-    /// Note that to ensure that your content is not obscured by things such as notches or the title
-    /// bar, you will likely want to only draw important content inside a specific area of the
-    /// surface, see [`safe_area()`] for details.
+    /// This is the dimensions you should pass to things like Wgpu or Glutin when configuring.
    ///
    /// ## Platform-specific
    ///
+    /// - **iOS:** Returns the `PhysicalSize` of the window's [safe area] in screen space
+    ///   coordinates.
    /// - **Web:** Returns the size of the canvas element. Doesn't account for CSS [`transform`].
    ///
+    /// [safe area]: https://developer.apple.com/documentation/uikit/uiview/2891103-safeareainsets?language=objc
    /// [`transform`]: https://developer.mozilla.org/en-US/docs/Web/CSS/transform
-    /// [`WindowEvent::SurfaceResized`]: crate::event::WindowEvent::SurfaceResized
-    /// [`safe_area()`]: Window::safe_area
    fn surface_size(&self) -> PhysicalSize<u32>;

    /// Request the new size for the surface.
@@ -709,53 +710,11 @@ pub trait Window: AsAny + Send + Sync {
    ///
    /// ## Platform-specific
    ///
+    /// - **iOS:** Returns the [`PhysicalSize`] of the window in screen space coordinates.
    /// - **Web:** Returns the size of the canvas element. _Note: this returns the same value as
    ///   [`Window::surface_size`]._
    fn outer_size(&self) -> PhysicalSize<u32>;

-    /// The inset area of the surface that is unobstructed.
-    ///
-    /// On some devices, especially mobile devices, the screen is not a perfect rectangle, and may
-    /// have rounded corners, notches, bezels, and so on. When drawing your content, you usually
-    /// want to draw your background and other such unimportant content on the entire surface, while
-    /// you will want to restrict important content such as text, interactable or visual indicators
-    /// to the part of the screen that is actually visible; for this, you use the safe area.
-    ///
-    /// The safe area is a rectangle that is defined relative to the origin at the top-left corner
-    /// of the surface, and the size extending downwards to the right. The area will not extend
-    /// beyond [the bounds of the surface][Window::surface_size].
-    ///
-    /// Note that the safe area does not take occlusion from other windows into account; in a way,
-    /// it is only a "hardware"-level occlusion.
-    ///
-    /// If the entire content of the surface is visible, this returns `(0, 0, 0, 0)`.
-    ///
-    /// ## Platform-specific
-    ///
-    /// - **Android / Orbital / Wayland / Windows / X11:** Unimplemented, returns `(0, 0, 0, 0)`.
-    ///
-    /// ## Examples
-    ///
-    /// Convert safe area insets to a size and a position.
-    ///
-    /// ```
-    /// use winit::dpi::{PhysicalPosition, PhysicalSize};
-    ///
-    /// # let surface_size = dpi::PhysicalSize::new(0, 0);
-    /// # #[cfg(requires_window)]
-    /// let surface_size = window.surface_size();
-    /// # let insets = dpi::PhysicalInsets::new(0, 0, 0, 0);
-    /// # #[cfg(requires_window)]
-    /// let insets = window.safe_area();
-    ///
-    /// let origin = PhysicalPosition::new(insets.left, insets.top);
-    /// let size = PhysicalSize::new(
-    ///     surface_size.width - insets.left - insets.right,
-    ///     surface_size.height - insets.top - insets.bottom,
-    /// );
-    /// ```
-    fn safe_area(&self) -> PhysicalInsets<u32>;
-
    /// Sets a minimum dimensions of the window's surface.
    ///
    /// ```no_run
@@ -1028,8 +987,8 @@ pub trait Window: AsAny + Send + Sync {
    fn set_window_icon(&self, window_icon: Option<Icon>);

    /// Set the IME cursor editing area, where the `position` is the top left corner of that area
-    /// in surface coordinates and `size` is the size of this area starting from the position. An
-    /// example of such area could be a input field in the UI or line in the editor.
+    /// and `size` is the size of this area starting from the position. An example of such area
+    /// could be a input field in the UI or line in the editor.
    ///
    /// The windowing system could place a candidate box close to that area, but try to not obscure
    /// the specified area, so the user input to it stays visible.
@@ -1062,8 +1021,7 @@ pub trait Window: AsAny + Send + Sync {
    ///
    /// ## Platform-specific
    ///
-    /// - **X11:** Area is not supported, only position. The bottom-right corner of the provided
-    ///   area is reported as the position.
+    /// - **X11:** - area is not supported, only position.
    /// - **iOS / Android / Web / Orbital:** Unsupported.
    ///
    /// [chinese]: https://support.apple.com/guide/chinese-input-method/use-the-candidate-window-cim12992/104/mac/12.0
@@ -1086,8 +1044,8 @@ pub trait Window: AsAny + Send + Sync {
    ///
    /// - **macOS:** IME must be enabled to receive text-input where dead-key sequences are
    ///   combined.
-    /// - **iOS / Android:** This will show / hide the soft keyboard.
-    /// - **Web / Orbital:** Unsupported.
+    /// - **iOS:** This will show / hide the soft keyboard.
+    /// - **Android / Web / Orbital:** Unsupported.
    /// - **X11**: Enabling IME will disable dead keys reporting during compose.
    ///
    /// [`Ime`]: crate::event::WindowEvent::Ime
@@ -1260,7 +1218,7 @@ pub trait Window: AsAny + Send + Sync {
    /// - **iOS / Android / Web:** Always returns an [`RequestError::NotSupported`].
    fn drag_resize_window(&self, direction: ResizeDirection) -> Result<(), RequestError>;

-    /// Show [window menu] at a specified position in surface coordinates.
+    /// Show [window menu] at a specified position .
    ///
    /// This is the context menu that is normally shown when interacting with
    /// the title bar. This is useful when implementing custom decorations.
@@ -1327,9 +1285,11 @@ pub trait Window: AsAny + Send + Sync {
    fn primary_monitor(&self) -> Option<MonitorHandle>;

    /// Get the raw-window-handle v0.6 display handle.
+    #[cfg(feature = "rwh_06")]
    fn rwh_06_display_handle(&self) -> &dyn rwh_06::HasDisplayHandle;

    /// Get the raw-window-handle v0.6 window handle.
+    #[cfg(feature = "rwh_06")]
    fn rwh_06_window_handle(&self) -> &dyn rwh_06::HasWindowHandle;
 }

@@ -1355,12 +1315,14 @@ impl std::hash::Hash for dyn Window + '_ {
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasDisplayHandle for dyn Window + '_ {
    fn display_handle(&self) -> Result<rwh_06::DisplayHandle<'_>, rwh_06::HandleError> {
        self.rwh_06_display_handle().display_handle()
    }
 }

+#[cfg(feature = "rwh_06")]
 impl rwh_06::HasWindowHandle for dyn Window + '_ {
    fn window_handle(&self) -> Result<rwh_06::WindowHandle<'_>, rwh_06::HandleError> {
        self.rwh_06_window_handle().window_handle()
--- a/typos.toml
+++ b/typos.toml
@@ -5,6 +5,3 @@ TME_LEAVE = "TME_LEAVE"             # From windows_sys::Win32::UI::Input::Keyboa
 XF86_Calculater = "XF86_Calculater" # From xkbcommon_dl::keysyms::XF86_Calculater
 ptd = "ptd"                         # From windows_sys::Win32::System::Com::FORMATETC { ptd, ..}
 requestor = "requestor"             # From x11_dl::xlib::XSelectionEvent { requestor ..}
-
-[files]
-extend-exclude = ["*.drawio"]
Author	SHA1	Message	Date
Mads Marquart	f1754bf14f	Fix docs link	2024-09-11 10:15:42 +02:00
Mads Marquart	69783445f1	Change docs on WaitUntil to not suggest Poll	2024-09-10 16:16:13 +02:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="720" height="720" viewBox="-0.5 -0.5 720 720" class="ge-export-svg-auto"><defs><style><![CDATA[@media (prefers-color-scheme:dark){svg.ge-export-svg-auto svg:not(mjx-container>svg),svg.ge-export-svg-auto:not(mjx-container>svg){filter:invert(100%) hue-rotate(180deg)}}]]></style></defs><g data-cell-id="0"><g data-cell-id="1"><rect x="200" y="40" width="320" height="640" rx="48" ry="48" fill="#e8e8e8" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-1"/><rect x="210" y="50" width="300" height="620" rx="45" ry="45" fill="#d5e8d4" stroke="#82b366" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-2"/><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M210 90h300v540H210z" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-4"/><rect x="290" y="640" width="140" height="10" rx="1.5" ry="1.5" fill="#dbdbdb" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-20"/><rect x="300" y="50" width="120" height="30" rx="4.5" ry="4.5" fill="#dbdbdb" stroke="#666" pointer-events="all" data-cell-id="RxwCrVmIsQwV7z5iJ9nY-3"/><g data-cell-id="RxwCrVmIsQwV7z5iJ9nY-12"><path d="M510 50h50v620h-50" fill="none" stroke="#82b366" stroke-width="3" stroke-miterlimit="10" stroke-dasharray="9 9" pointer-events="stroke"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:360px;margin-left:575px"><div style="box-sizing:border-box;font-size:0;text-align:left" data-drawio-colors="color: #82B366;"><div style="display:inline-block;font-size:20px;font-family:"monospace";color:#82b366;line-height:1.2;pointer-events:all;white-space:nowrap"><font>surface_size</font></div></div></div></foreignObject><text x="575" y="366" fill="#82B366" font-family=""monospace"" font-size="20">surfa...</text></switch></g><g data-cell-id="NrHAzeOh65jb3hkBOxW9-1"><path d="M180 62.35v15.3" fill="none" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="m180 53.35 3 9h-6ZM180 86.65l-3-9h6Z" fill="#d79b00" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-end;width:1px;height:1px;padding-top:70px;margin-left:165px"><div style="box-sizing:border-box;font-size:0;text-align:right" data-drawio-colors="color: #D79B00;"><div style="display:inline-block;font-size:20px;font-family:"monospace";color:#d79b00;line-height:1.2;pointer-events:all;white-space:nowrap"><div>safe_area.top</div></div></div></div></foreignObject><text x="165" y="76" fill="#D79B00" font-family=""monospace"" font-size="20" text-anchor="end">safe_...</text></switch></g><g data-cell-id="NrHAzeOh65jb3hkBOxW9-5"><path d="M180 657.65v-15.3" fill="none" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="m180 666.65-3-9h6ZM180 633.35l3 9h-6Z" fill="#d79b00" stroke="#d79b00" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-end;width:1px;height:1px;padding-top:650px;margin-left:165px"><div style="box-sizing:border-box;font-size:0;text-align:right" data-drawio-colors="color: #D79B00;"><div style="display:inline-block;font-size:20px;font-family:"monospace";color:#d79b00;line-height:1.2;pointer-events:all;white-space:nowrap"><div>safe_area.bottom</div></div></div></div></foreignObject><text x="165" y="656" fill="#D79B00" font-family=""monospace"" font-size="20" text-anchor="end">safe_...</text></switch></g></g></g></svg>