Update to newest master

Signed-off-by: John Nunley <dev@notgull.net>
rust-windowing · Dec 20, 2023 · d5240c4 · d5240c4
1 parent 1c65f70
commit d5240c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -232,3 +232,6 @@ web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
 members = [
     "run-wasm",
 ]
+
+[patch.crates-io]
+xim = { git = "https://github.com/forkgull/xim-rs", branch = "x11rb-13" }
diff --git a/src/platform_impl/linux/x11/event_processor.rs b/src/platform_impl/linux/x11/event_processor.rs
@@ -529,11 +529,9 @@ impl<T: 'static> EventProcessor<T> {
                     event: WindowEvent::Destroyed,
                 });
             }
-            ffi::PropertyNotify => {
-                let xev: &ffi::XPropertyEvent = xev.as_ref();
-                let atom = xev.atom as xproto::Atom;
 
-                if atom == xproto::Atom::from(xproto::AtomEnum::RESOURCE_MANAGER) {
+            X11Event::PropertyNotify(xev) => {
+                if xev.atom == xproto::Atom::from(xproto::AtomEnum::RESOURCE_MANAGER) {
                     self.process_dpi_change(&mut callback);
                 }
             }

diff --git a/src/platform_impl/linux/x11/window.rs b/src/platform_impl/linux/x11/window.rs
@@ -43,9 +43,9 @@ use crate::{
 
 use super::{
     ffi,
+    ime::ImeRequest,
     util::{self, CustomCursor, SelectedCursor},
-    CookieResultExt, EventLoopWindowTarget, ime::ImeRequest, VoidCookie, WindowId,
-    XConnection,
+    CookieResultExt, EventLoopWindowTarget, VoidCookie, WindowId, XConnection,
 };
 
 #[derive(Debug)]