leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update smithay

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
Cargo.lock generated
View file

@ -869,7 +869,7 @@ dependencies = [
"xcursor", "xcursor",
"xdg", "xdg",
"xdg-user", "xdg-user",
"xkbcommon", "xkbcommon 0.7.0",
"zbus", "zbus",
] ]
@ -933,7 +933,7 @@ dependencies = [
"serde_with", "serde_with",
"thiserror", "thiserror",
"tracing", "tracing",
"xkbcommon", "xkbcommon 0.7.0",
] ]
[[package]] [[package]]
@ -4703,7 +4703,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" 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 = [ dependencies = [
"appendlist", "appendlist",
"ash 0.38.0+1.3.281", "ash 0.38.0+1.3.281",
@ -4749,7 +4749,7 @@ dependencies = [
"wayland-server", "wayland-server",
"winit", "winit",
"x11rb", "x11rb",
"xkbcommon", "xkbcommon 0.8.0",
] ]
[[package]] [[package]]
@ -4776,7 +4776,7 @@ dependencies = [
"wayland-protocols", "wayland-protocols",
"wayland-protocols-wlr", "wayland-protocols-wlr",
"wayland-scanner", "wayland-scanner",
"xkbcommon", "xkbcommon 0.7.0",
"xkeysym", "xkeysym",
] ]
@ -4804,7 +4804,7 @@ dependencies = [
"log", "log",
"memoffset 0.9.1", "memoffset 0.9.1",
"smithay", "smithay",
"xkbcommon", "xkbcommon 0.7.0",
] ]
[[package]] [[package]]
@ -6470,6 +6470,17 @@ dependencies = [
"xkeysym", "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]] [[package]]
name = "xkbcommon-dl" name = "xkbcommon-dl"
version = "0.4.2" version = "0.4.2"

4
Cargo.toml
View file

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

2
src/shell/element/surface.rs
View file

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

2
src/wayland/handlers/drm_lease.rs
View file

@ -57,7 +57,7 @@ impl DrmLeaseHandler for State {
}) })
.ok_or_else(LeaseRejected::default)?; .ok_or_else(LeaseRejected::default)?;
builder.add_plane(primary_plane.handle, primary_plane_claim); 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 backend
.drm .drm
.claim_plane(plane.handle, *crtc) .claim_plane(plane.handle, *crtc)