From d5240c4650762b05cd9dafa79e37589c80786c8d Mon Sep 17 00:00:00 2001 From: John Nunley Date: Tue, 19 Dec 2023 16:14:17 -0800 Subject: [PATCH] Update to newest master Signed-off-by: John Nunley --- Cargo.toml | 3 +++ src/platform_impl/linux/x11/event_processor.rs | 6 ++---- src/platform_impl/linux/x11/window.rs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ce370e7c98..0d67757dba 100644 --- 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 index 59ac767ef9..3b409c73f8 100644 --- a/src/platform_impl/linux/x11/event_processor.rs +++ b/src/platform_impl/linux/x11/event_processor.rs @@ -529,11 +529,9 @@ impl EventProcessor { 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 index acd732255d..7f877b4f7f 100644 --- 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)]