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:
Victoria Brekenfeld 2026-01-22 16:10:57 +01:00 • committed by Ian Douglas Scott
parent ce5ac893a4
commit 53e0db28ac
10 changed files with 378 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.lock generated
View file

@ -866,6 +866,7 @@ dependencies = [
"sanitize-filename", "sanitize-filename",
"serde", "serde",
"serde_json", "serde_json",
"smallvec",
"smithay", "smithay",
"smithay-egui", "smithay-egui",
"thiserror 2.0.18", "thiserror 2.0.18",
@ -4923,7 +4924,7 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/smithay/smithay.git?rev=e84a4ca#e84a4ca82d58d783839083bd48c4ab120715c4b6" source = "git+https://github.com/smithay/smithay.git?rev=f6d1070#f6d10709db2bb68c46b9c128a4163d035356572c"
dependencies = [ dependencies = [
"aliasable", "aliasable",
"appendlist", "appendlist",

3
Cargo.toml
View file

@ -83,6 +83,7 @@ logind-zbus = { version = "5.3.2", optional = true }
futures-executor = { version = "0.3.32", features = ["thread-pool"] } futures-executor = { version = "0.3.32", features = ["thread-pool"] }
futures-util = "0.3.32" futures-util = "0.3.32"
cgmath = "0.18.0" cgmath = "0.18.0"
smallvec = "1.15.1"
[dependencies.id_tree] [dependencies.id_tree]
branch = "feature/copy_clone" branch = "feature/copy_clone"
@ -142,4 +143,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
[patch.crates-io] [patch.crates-io]
smithay = { git = "https://github.com/smithay/smithay.git", rev = "e84a4ca" } smithay = { git = "https://github.com/smithay/smithay.git", rev = "f6d1070" }

24
src/backend/render/clipped_surface.rs
View file

@ -3,15 +3,19 @@
use std::borrow::{Borrow, BorrowMut}; use std::borrow::{Borrow, BorrowMut};
use cgmath::{Matrix3, Vector2}; use cgmath::{Matrix3, Vector2};
use smithay::backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, Kind, RenderElement, UnderlyingStorage, surface::WaylandSurfaceRenderElement,
},
gles::{GlesFrame, GlesRenderer, GlesTexProgram, Uniform, UniformValue},
utils::{CommitCounter, DamageSet, OpaqueRegions},
};
use smithay::utils::{Buffer, Logical, Physical, Point, Rectangle, Scale, Size, Transform}; use smithay::utils::{Buffer, Logical, Physical, Point, Rectangle, Scale, Size, Transform};
use smithay::{
backend::renderer::{
ImportAll, ImportMem, Renderer,
element::{
Element, Id, Kind, RenderElement, UnderlyingStorage,
surface::WaylandSurfaceRenderElement,
},
gles::{GlesFrame, GlesRenderer, GlesTexProgram, Uniform, UniformValue},
utils::{CommitCounter, DamageSet, OpaqueRegions},
},
utils::user_data::UserDataMap,
};
use crate::backend::render::element::AsGlowRenderer; use crate::backend::render::element::AsGlowRenderer;
@ -253,10 +257,12 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>], damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> { ) -> Result<(), R::Error> {
BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame)) BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame))
.override_default_tex_program(self.program.clone(), self.uniforms.clone()); .override_default_tex_program(self.program.clone(), self.uniforms.clone());
self.inner.draw(frame, src, dst, damage, opaque_regions)?; self.inner
.draw(frame, src, dst, damage, opaque_regions, cache)?;
BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame)) BorrowMut::<GlesFrame>::borrow_mut(<R as AsGlowRenderer>::glow_frame_mut(frame))
.clear_tex_program_override(); .clear_tex_program_override();
Ok(()) Ok(())

68
src/backend/render/element.rs
View file

@ -18,7 +18,9 @@ use smithay::{
utils::{CommitCounter, DamageSet, OpaqueRegions}, utils::{CommitCounter, DamageSet, OpaqueRegions},
}, },
}, },
utils::{Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale}, utils::{
Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale, user_data::UserDataMap,
},
}; };
use super::{GlMultiRenderer, cursor::CursorRenderElement}; use super::{GlMultiRenderer, cursor::CursorRenderElement};
@ -182,6 +184,19 @@ where
CosmicElement::Egui(elem) => elem.kind(), CosmicElement::Egui(elem) => elem.kind(),
} }
} }
fn is_framebuffer_effect(&self) -> bool {
match self {
CosmicElement::Workspace(elem) => elem.is_framebuffer_effect(),
CosmicElement::Cursor(elem) => elem.is_framebuffer_effect(),
CosmicElement::Dnd(elem) => elem.is_framebuffer_effect(),
CosmicElement::MoveGrab(elem) => elem.is_framebuffer_effect(),
CosmicElement::Postprocess(elem) => elem.is_framebuffer_effect(),
CosmicElement::Zoom(elem) => elem.is_framebuffer_effect(),
#[cfg(feature = "debug")]
CosmicElement::Egui(elem) => elem.is_framebuffer_effect(),
}
}
} }
impl<R> RenderElement<R> for CosmicElement<R> impl<R> RenderElement<R> for CosmicElement<R>
@ -198,12 +213,19 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>], damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> { ) -> Result<(), R::Error> {
match self { match self {
CosmicElement::Workspace(elem) => elem.draw(frame, src, dst, damage, opaque_regions), CosmicElement::Workspace(elem) => {
CosmicElement::Cursor(elem) => elem.draw(frame, src, dst, damage, opaque_regions), elem.draw(frame, src, dst, damage, opaque_regions, cache)
CosmicElement::Dnd(elem) => elem.draw(frame, src, dst, damage, opaque_regions), }
CosmicElement::MoveGrab(elem) => elem.draw(frame, src, dst, damage, opaque_regions), CosmicElement::Cursor(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
CosmicElement::Dnd(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache),
CosmicElement::MoveGrab(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions, cache)
}
CosmicElement::Postprocess(elem) => { CosmicElement::Postprocess(elem) => {
let glow_frame = R::glow_frame_mut(frame); let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::draw( RenderElement::<GlowRenderer>::draw(
@ -213,10 +235,11 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(FromGlesError::from_gles_error)
} }
CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions), CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions, cache),
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
CosmicElement::Egui(elem) => { CosmicElement::Egui(elem) => {
let glow_frame = R::glow_frame_mut(frame); let glow_frame = R::glow_frame_mut(frame);
@ -227,6 +250,7 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(FromGlesError::from_gles_error)
} }
@ -251,6 +275,37 @@ where
} }
} }
} }
fn capture_framebuffer(
&self,
frame: &mut <R>::Frame<'_, '_>,
src: Rectangle<f64, BufferCoords>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), <R>::Error> {
match self {
CosmicElement::Workspace(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Cursor(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Dnd(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::MoveGrab(elem) => elem.capture_framebuffer(frame, src, dst, cache),
CosmicElement::Postprocess(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicElement::Zoom(elem) => elem.capture_framebuffer(frame, src, dst, cache),
#[cfg(feature = "debug")]
CosmicElement::Egui(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
}
}
}
} }
impl<R> From<CropRenderElement<RescaleRenderElement<WorkspaceRenderElement<R>>>> impl<R> From<CropRenderElement<RescaleRenderElement<WorkspaceRenderElement<R>>>>
@ -398,6 +453,7 @@ impl<R: Renderer> RenderElement<R> for DamageElement {
_dst: Rectangle<i32, Physical>, _dst: Rectangle<i32, Physical>,
_damage: &[Rectangle<i32, Physical>], _damage: &[Rectangle<i32, Physical>],
_opaque_regions: &[Rectangle<i32, Physical>], _opaque_regions: &[Rectangle<i32, Physical>],
_cache: Option<&UserDataMap>,
) -> Result<(), R::Error> { ) -> Result<(), R::Error> {
Ok(()) Ok(())
} }

140
src/shell/element/mod.rs
View file

@ -11,7 +11,7 @@ use smithay::{
input::KeyState, input::KeyState,
renderer::{ renderer::{
element::{ element::{
Element, RenderElement, UnderlyingStorage, Element, Kind, RenderElement, UnderlyingStorage,
memory::MemoryRenderBufferRenderElement, memory::MemoryRenderBufferRenderElement,
utils::{CropRenderElement, RelocateRenderElement, RescaleRenderElement}, utils::{CropRenderElement, RelocateRenderElement, RescaleRenderElement},
}, },
@ -30,6 +30,7 @@ use smithay::{
space_elements, space_elements,
utils::{ utils::{
Buffer as BufferCoords, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Buffer as BufferCoords, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size,
user_data::UserDataMap,
}, },
wayland::seat::WaylandFocus, wayland::seat::WaylandFocus,
xwayland::{X11Surface, xwm::X11Relatable}, xwayland::{X11Surface, xwm::X11Relatable},
@ -1282,6 +1283,44 @@ where
CosmicMappedRenderElement::Egui(elem) => elem.alpha(), CosmicMappedRenderElement::Egui(elem) => elem.alpha(),
} }
} }
fn kind(&self) -> Kind {
match self {
CosmicMappedRenderElement::Stack(elem) => elem.kind(),
CosmicMappedRenderElement::Window(elem) => elem.kind(),
CosmicMappedRenderElement::TiledStack(elem) => elem.kind(),
CosmicMappedRenderElement::TiledWindow(elem) => elem.kind(),
CosmicMappedRenderElement::TiledOverlay(elem) => elem.kind(),
CosmicMappedRenderElement::MovingStack(elem) => elem.kind(),
CosmicMappedRenderElement::MovingWindow(elem) => elem.kind(),
CosmicMappedRenderElement::GrabbedStack(elem) => elem.kind(),
CosmicMappedRenderElement::GrabbedWindow(elem) => elem.kind(),
CosmicMappedRenderElement::FocusIndicator(elem) => elem.kind(),
CosmicMappedRenderElement::Overlay(elem) => elem.kind(),
CosmicMappedRenderElement::StackHoverIndicator(elem) => elem.kind(),
#[cfg(feature = "debug")]
CosmicMappedRenderElement::Egui(elem) => elem.kind(),
}
}
fn is_framebuffer_effect(&self) -> bool {
match self {
CosmicMappedRenderElement::Stack(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::Window(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::TiledStack(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::TiledWindow(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::TiledOverlay(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::MovingStack(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::MovingWindow(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::GrabbedStack(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::GrabbedWindow(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::FocusIndicator(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::Overlay(elem) => elem.is_framebuffer_effect(),
CosmicMappedRenderElement::StackHoverIndicator(elem) => elem.is_framebuffer_effect(),
#[cfg(feature = "debug")]
CosmicMappedRenderElement::Egui(elem) => elem.is_framebuffer_effect(),
}
}
} }
impl<R> RenderElement<R> for CosmicMappedRenderElement<R> impl<R> RenderElement<R> for CosmicMappedRenderElement<R>
@ -1297,19 +1336,20 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>], damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> { ) -> Result<(), R::Error> {
match self { match self {
CosmicMappedRenderElement::Stack(elem) => { CosmicMappedRenderElement::Stack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::Window(elem) => { CosmicMappedRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::TiledStack(elem) => { CosmicMappedRenderElement::TiledStack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::TiledWindow(elem) => { CosmicMappedRenderElement::TiledWindow(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::TiledOverlay(elem) => RenderElement::<GlowRenderer>::draw( CosmicMappedRenderElement::TiledOverlay(elem) => RenderElement::<GlowRenderer>::draw(
elem, elem,
@ -1318,19 +1358,20 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(FromGlesError::from_gles_error),
CosmicMappedRenderElement::MovingStack(elem) => { CosmicMappedRenderElement::MovingStack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::MovingWindow(elem) => { CosmicMappedRenderElement::MovingWindow(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::GrabbedStack(elem) => { CosmicMappedRenderElement::GrabbedStack(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::GrabbedWindow(elem) => { CosmicMappedRenderElement::GrabbedWindow(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicMappedRenderElement::FocusIndicator(elem) => RenderElement::<GlowRenderer>::draw( CosmicMappedRenderElement::FocusIndicator(elem) => RenderElement::<GlowRenderer>::draw(
elem, elem,
@ -1339,6 +1380,7 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(FromGlesError::from_gles_error),
CosmicMappedRenderElement::Overlay(elem) => RenderElement::<GlowRenderer>::draw( CosmicMappedRenderElement::Overlay(elem) => RenderElement::<GlowRenderer>::draw(
@ -1348,10 +1390,11 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(FromGlesError::from_gles_error),
CosmicMappedRenderElement::StackHoverIndicator(elem) => { CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
CosmicMappedRenderElement::Egui(elem) => { CosmicMappedRenderElement::Egui(elem) => {
@ -1363,6 +1406,7 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(FromGlesError::from_gles_error)
} }
@ -1398,6 +1442,82 @@ where
} }
} }
} }
fn capture_framebuffer(
&self,
frame: &mut R::Frame<'_, '_>,
src: Rectangle<f64, BufferCoords>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), R::Error> {
match self {
CosmicMappedRenderElement::Stack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::TiledStack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::TiledWindow(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::TiledOverlay(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicMappedRenderElement::MovingStack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::MovingWindow(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::GrabbedStack(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::GrabbedWindow(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicMappedRenderElement::FocusIndicator(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicMappedRenderElement::Overlay(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicMappedRenderElement::StackHoverIndicator(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
#[cfg(feature = "debug")]
CosmicMappedRenderElement::Egui(elem) => {
let glow_frame = R::glow_frame_mut(frame);
RenderElement::<GlowRenderer>::capture_framebuffer(
elem, glow_frame, src, dst, cache,
)
.map_err(FromGlesError::from_gles_error)
}
}
}
} }
impl<R> From<stack::CosmicStackRenderElement<R>> for CosmicMappedRenderElement<R> impl<R> From<stack::CosmicStackRenderElement<R>> for CosmicMappedRenderElement<R>

53
src/shell/element/stack.rs
View file

@ -67,7 +67,10 @@ use smithay::{
}, },
output::Output, output::Output,
reexports::wayland_server::protocol::wl_surface::WlSurface, reexports::wayland_server::protocol::wl_surface::WlSurface,
utils::{Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Transform}, utils::{
Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Transform,
user_data::UserDataMap,
},
wayland::seat::WaylandFocus, wayland::seat::WaylandFocus,
}; };
use std::{ use std::{
@ -1995,6 +1998,16 @@ where
CosmicStackRenderElement::Clipped(elem) => elem.kind(), CosmicStackRenderElement::Clipped(elem) => elem.kind(),
} }
} }
fn is_framebuffer_effect(&self) -> bool {
match self {
CosmicStackRenderElement::Header(elem) => elem.is_framebuffer_effect(),
CosmicStackRenderElement::Shadow(elem) => elem.is_framebuffer_effect(),
CosmicStackRenderElement::Border(elem) => elem.is_framebuffer_effect(),
CosmicStackRenderElement::Window(elem) => elem.is_framebuffer_effect(),
CosmicStackRenderElement::Clipped(elem) => elem.is_framebuffer_effect(),
}
}
} }
impl<R> RenderElement<R> for CosmicStackRenderElement<R> impl<R> RenderElement<R> for CosmicStackRenderElement<R>
@ -2010,10 +2023,11 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>], damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), <R>::Error> { ) -> Result<(), <R>::Error> {
match self { match self {
CosmicStackRenderElement::Header(elem) => { CosmicStackRenderElement::Header(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicStackRenderElement::Shadow(elem) | CosmicStackRenderElement::Border(elem) => { CosmicStackRenderElement::Shadow(elem) | CosmicStackRenderElement::Border(elem) => {
RenderElement::<GlowRenderer>::draw( RenderElement::<GlowRenderer>::draw(
@ -2023,14 +2037,15 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(FromGlesError::from_gles_error)
} }
CosmicStackRenderElement::Window(elem) => { CosmicStackRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicStackRenderElement::Clipped(elem) => { CosmicStackRenderElement::Clipped(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
} }
} }
@ -2045,4 +2060,34 @@ where
CosmicStackRenderElement::Clipped(elem) => elem.underlying_storage(renderer), CosmicStackRenderElement::Clipped(elem) => elem.underlying_storage(renderer),
} }
} }
fn capture_framebuffer(
&self,
frame: &mut R::Frame<'_, '_>,
src: Rectangle<f64, Buffer>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), <R>::Error> {
match self {
CosmicStackRenderElement::Header(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicStackRenderElement::Shadow(elem) | CosmicStackRenderElement::Border(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicStackRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicStackRenderElement::Clipped(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
}
}
} }

53
src/shell/element/window.rs
View file

@ -53,7 +53,10 @@ use smithay::{
}, },
output::Output, output::Output,
reexports::wayland_server::protocol::wl_surface::WlSurface, reexports::wayland_server::protocol::wl_surface::WlSurface,
utils::{Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Transform}, utils::{
Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Transform,
user_data::UserDataMap,
},
wayland::seat::WaylandFocus, wayland::seat::WaylandFocus,
}; };
use std::{ use std::{
@ -1366,6 +1369,16 @@ where
CosmicWindowRenderElement::Clipped(elem) => elem.kind(), CosmicWindowRenderElement::Clipped(elem) => elem.kind(),
} }
} }
fn is_framebuffer_effect(&self) -> bool {
match self {
CosmicWindowRenderElement::Header(elem) => elem.is_framebuffer_effect(),
CosmicWindowRenderElement::Shadow(elem) => elem.is_framebuffer_effect(),
CosmicWindowRenderElement::Border(elem) => elem.is_framebuffer_effect(),
CosmicWindowRenderElement::Window(elem) => elem.is_framebuffer_effect(),
CosmicWindowRenderElement::Clipped(elem) => elem.is_framebuffer_effect(),
}
}
} }
impl<R> RenderElement<R> for CosmicWindowRenderElement<R> impl<R> RenderElement<R> for CosmicWindowRenderElement<R>
@ -1381,10 +1394,11 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, Physical>], damage: &[Rectangle<i32, Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), <R>::Error> { ) -> Result<(), <R>::Error> {
match self { match self {
CosmicWindowRenderElement::Header(elem) => { CosmicWindowRenderElement::Header(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicWindowRenderElement::Shadow(elem) | CosmicWindowRenderElement::Border(elem) => { CosmicWindowRenderElement::Shadow(elem) | CosmicWindowRenderElement::Border(elem) => {
RenderElement::<GlowRenderer>::draw( RenderElement::<GlowRenderer>::draw(
@ -1394,14 +1408,15 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error) .map_err(FromGlesError::from_gles_error)
} }
CosmicWindowRenderElement::Window(elem) => { CosmicWindowRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
CosmicWindowRenderElement::Clipped(elem) => { CosmicWindowRenderElement::Clipped(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
} }
} }
@ -1416,4 +1431,34 @@ where
CosmicWindowRenderElement::Clipped(elem) => elem.underlying_storage(renderer), CosmicWindowRenderElement::Clipped(elem) => elem.underlying_storage(renderer),
} }
} }
fn capture_framebuffer(
&self,
frame: &mut <R>::Frame<'_, '_>,
src: Rectangle<f64, Buffer>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), <R>::Error> {
match self {
CosmicWindowRenderElement::Header(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicWindowRenderElement::Shadow(elem) | CosmicWindowRenderElement::Border(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
CosmicWindowRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
CosmicWindowRenderElement::Clipped(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
}
}
} }

8
src/shell/mod.rs
View file

@ -4859,6 +4859,7 @@ impl Shell {
|surface, _| { |surface, _| {
surface_presentation_feedback_flags_from_states( surface_presentation_feedback_flags_from_states(
surface, surface,
None,
render_element_states, render_element_states,
) )
}, },
@ -4875,6 +4876,7 @@ impl Shell {
|surface, _| { |surface, _| {
surface_presentation_feedback_flags_from_states( surface_presentation_feedback_flags_from_states(
surface, surface,
None,
render_element_states, render_element_states,
) )
}, },
@ -4888,7 +4890,11 @@ impl Shell {
&mut output_presentation_feedback, &mut output_presentation_feedback,
surface_primary_scanout_output, surface_primary_scanout_output,
|surface, _| { |surface, _| {
surface_presentation_feedback_flags_from_states(surface, render_element_states) surface_presentation_feedback_flags_from_states(
surface,
None,
render_element_states,
)
}, },
); );
} }

65
src/shell/workspace.rs
View file

@ -31,7 +31,9 @@ use cosmic_protocols::workspace::v2::server::zcosmic_workspace_handle_v2::Tiling
use id_tree::Tree; use id_tree::Tree;
use indexmap::IndexSet; use indexmap::IndexSet;
use keyframe::{ease, functions::EaseInOutCubic}; use keyframe::{ease, functions::EaseInOutCubic};
use smithay::backend::renderer::element::Kind;
use smithay::output::WeakOutput; use smithay::output::WeakOutput;
use smithay::utils::user_data::UserDataMap;
use smithay::{ use smithay::{
backend::renderer::{ backend::renderer::{
element::{ element::{
@ -1987,6 +1989,26 @@ where
WorkspaceRenderElement::Backdrop(elem) => elem.alpha(), WorkspaceRenderElement::Backdrop(elem) => elem.alpha(),
} }
} }
fn kind(&self) -> Kind {
match self {
WorkspaceRenderElement::OverrideRedirect(elem) => elem.kind(),
WorkspaceRenderElement::Fullscreen(elem) => elem.kind(),
WorkspaceRenderElement::FullscreenPopup(elem) => elem.kind(),
WorkspaceRenderElement::Window(elem) => elem.kind(),
WorkspaceRenderElement::Backdrop(elem) => elem.kind(),
}
}
fn is_framebuffer_effect(&self) -> bool {
match self {
WorkspaceRenderElement::OverrideRedirect(elem) => elem.is_framebuffer_effect(),
WorkspaceRenderElement::Fullscreen(elem) => elem.is_framebuffer_effect(),
WorkspaceRenderElement::FullscreenPopup(elem) => elem.is_framebuffer_effect(),
WorkspaceRenderElement::Window(elem) => elem.is_framebuffer_effect(),
WorkspaceRenderElement::Backdrop(elem) => elem.is_framebuffer_effect(),
}
}
} }
impl<R> RenderElement<R> for WorkspaceRenderElement<R> impl<R> RenderElement<R> for WorkspaceRenderElement<R>
@ -2002,19 +2024,20 @@ where
dst: Rectangle<i32, Physical>, dst: Rectangle<i32, Physical>,
damage: &[Rectangle<i32, smithay::utils::Physical>], damage: &[Rectangle<i32, smithay::utils::Physical>],
opaque_regions: &[Rectangle<i32, Physical>], opaque_regions: &[Rectangle<i32, Physical>],
cache: Option<&UserDataMap>,
) -> Result<(), R::Error> { ) -> Result<(), R::Error> {
match self { match self {
WorkspaceRenderElement::OverrideRedirect(elem) => { WorkspaceRenderElement::OverrideRedirect(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
WorkspaceRenderElement::Fullscreen(elem) => { WorkspaceRenderElement::Fullscreen(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
WorkspaceRenderElement::FullscreenPopup(elem) => { WorkspaceRenderElement::FullscreenPopup(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
WorkspaceRenderElement::Window(elem) => { WorkspaceRenderElement::Window(elem) => {
elem.draw(frame, src, dst, damage, opaque_regions) elem.draw(frame, src, dst, damage, opaque_regions, cache)
} }
WorkspaceRenderElement::Backdrop(elem) => RenderElement::<GlowRenderer>::draw( WorkspaceRenderElement::Backdrop(elem) => RenderElement::<GlowRenderer>::draw(
elem, elem,
@ -2023,6 +2046,7 @@ where
dst, dst,
damage, damage,
opaque_regions, opaque_regions,
cache,
) )
.map_err(FromGlesError::from_gles_error), .map_err(FromGlesError::from_gles_error),
} }
@ -2042,6 +2066,39 @@ where
} }
} }
} }
fn capture_framebuffer(
&self,
frame: &mut R::Frame<'_, '_>,
src: Rectangle<f64, BufferCoords>,
dst: Rectangle<i32, Physical>,
cache: &UserDataMap,
) -> Result<(), R::Error> {
match self {
WorkspaceRenderElement::OverrideRedirect(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
WorkspaceRenderElement::Fullscreen(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
WorkspaceRenderElement::FullscreenPopup(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
WorkspaceRenderElement::Window(elem) => {
elem.capture_framebuffer(frame, src, dst, cache)
}
WorkspaceRenderElement::Backdrop(elem) => {
RenderElement::<GlowRenderer>::capture_framebuffer(
elem,
R::glow_frame_mut(frame),
src,
dst,
cache,
)
.map_err(FromGlesError::from_gles_error)
}
}
}
} }
impl<R> From<RescaleRenderElement<CosmicWindowRenderElement<R>>> for WorkspaceRenderElement<R> impl<R> From<RescaleRenderElement<CosmicWindowRenderElement<R>>> for WorkspaceRenderElement<R>

1
src/state.rs
View file

@ -940,6 +940,7 @@ impl Common {
surface, surface,
output, output,
states, states,
None,
render_element_states, render_element_states,
primary_scanout_output_compare, primary_scanout_output_compare,
); );