diff --git a/Cargo.lock b/Cargo.lock index e5501d76..089b7e3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4480,12 +4480,6 @@ dependencies = [ "regex", ] -[[package]] -name = "scan_fmt" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" - [[package]] name = "scoped-tls" version = "1.0.1" @@ -4703,7 +4697,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=f364c73#f364c73cae953aebfa189075e9f118f9008e100b" +source = "git+https://github.com/smithay//smithay?rev=08d31e1#08d31e17ea4ac47cddeb56e2ac18ee50b331911b" dependencies = [ "appendlist", "ash 0.38.0+1.3.281", @@ -4723,7 +4717,6 @@ dependencies = [ "glow 0.12.3", "indexmap 2.3.0", "input", - "lazy_static", "libc", "libloading 0.8.5", "libseat", @@ -4733,7 +4726,6 @@ dependencies = [ "profiling", "rand", "rustix", - "scan_fmt", "scopeguard", "smallvec", "tempfile", diff --git a/Cargo.toml b/Cargo.toml index 2e865a35..bb623462 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,4 +116,4 @@ inherits = "release" lto = "fat" [patch."https://github.com/Smithay/smithay.git"] -smithay = { git = "https://github.com/smithay//smithay", rev = "f364c73" } +smithay = { git = "https://github.com/smithay//smithay", rev = "08d31e1" } diff --git a/src/shell/layout/tiling/grabs/swap.rs b/src/shell/layout/tiling/grabs/swap.rs index 60c56cb2..28036ced 100644 --- a/src/shell/layout/tiling/grabs/swap.rs +++ b/src/shell/layout/tiling/grabs/swap.rs @@ -1,6 +1,6 @@ use cosmic_settings_config::shortcuts; use smithay::{ - backend::input::KeyState, + backend::input::{KeyState, Keycode}, input::{ keyboard::{ GrabStartData as KeyboardGrabStartData, KeyboardGrab, KeyboardInnerHandle, @@ -33,7 +33,7 @@ impl KeyboardGrab for SwapWindowGrab { &mut self, data: &mut State, handle: &mut KeyboardInnerHandle<'_, State>, - keycode: u32, + keycode: Keycode, state: KeyState, modifiers: Option, serial: Serial,