chore: update smithay

This commit is contained in:
Ashley Wulber 2024-08-02 09:31:29 -04:00 committed by Victoria Brekenfeld
parent 9239dc1e75
commit b8eaf5dcb4
4 changed files with 21 additions and 10 deletions

23
Cargo.lock generated
View file

@ -869,7 +869,7 @@ dependencies = [
"xcursor",
"xdg",
"xdg-user",
"xkbcommon",
"xkbcommon 0.7.0",
"zbus",
]
@ -933,7 +933,7 @@ dependencies = [
"serde_with",
"thiserror",
"tracing",
"xkbcommon",
"xkbcommon 0.7.0",
]
[[package]]
@ -4703,7 +4703,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "smithay"
version = "0.3.0"
source = "git+https://github.com/smithay//smithay?rev=c6aab18#c6aab182a3c9f106d9c7a0ea34187f90403e59e7"
source = "git+https://github.com/smithay//smithay?rev=e7f0857#e7f08570bceab6107863267ae168d0afb018e8f5"
dependencies = [
"appendlist",
"ash 0.38.0+1.3.281",
@ -4749,7 +4749,7 @@ dependencies = [
"wayland-server",
"winit",
"x11rb",
"xkbcommon",
"xkbcommon 0.8.0",
]
[[package]]
@ -4776,7 +4776,7 @@ dependencies = [
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner",
"xkbcommon",
"xkbcommon 0.7.0",
"xkeysym",
]
@ -4804,7 +4804,7 @@ dependencies = [
"log",
"memoffset 0.9.1",
"smithay",
"xkbcommon",
"xkbcommon 0.7.0",
]
[[package]]
@ -6470,6 +6470,17 @@ dependencies = [
"xkeysym",
]
[[package]]
name = "xkbcommon"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
dependencies = [
"libc",
"memmap2 0.9.4",
"xkeysym",
]
[[package]]
name = "xkbcommon-dl"
version = "0.4.2"

View file

@ -84,7 +84,7 @@ features = [
"xwayland",
]
git = "https://github.com/smithay/smithay.git"
rev = "74ef59a3f"
rev = "e7f0857"
version = "0.3"
[dependencies.smithay-egui]
@ -119,4 +119,4 @@ inherits = "release"
lto = "fat"
[patch."https://github.com/Smithay/smithay.git"]
smithay = {git = "https://github.com/smithay//smithay", rev = "c6aab18"}
smithay = { git = "https://github.com/smithay//smithay", rev = "e7f0857" }

View file

@ -397,7 +397,7 @@ impl CosmicSurface {
}
}),
WindowSurface::X11(surface) => {
let _ = surface.set_minimized(suspended);
let _ = surface.set_suspended(suspended);
}
}
}

View file

@ -57,7 +57,7 @@ impl DrmLeaseHandler for State {
})
.ok_or_else(LeaseRejected::default)?;
builder.add_plane(primary_plane.handle, primary_plane_claim);
if let Some((cursor, claim)) = planes.cursor.and_then(|plane| {
if let Some((cursor, claim)) = planes.cursor.into_iter().find_map(|plane| {
backend
.drm
.claim_plane(plane.handle, *crtc)