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

kms/surface: Define a PendingImageCopyData, instead of using tuple

Browse source 
Adding anything else to this tuple is awkward; defining a simple struct
makes this cleaner.

This also adds a `sync` property, which will come in handy later.
Containing simply the same-named argument that was passed to
`submit_buffer`.
This commit is contained in:
Ian Douglas Scott 2025-08-19 12:45:07 -07:00 • committed by Victoria Brekenfeld
parent f0e0084608
commit 28e9024681
4 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/wayland/handlers/screencopy/render.rs
View file

@ -54,6 +54,12 @@ use crate::{
use super::{super::data_device::get_dnd_icon, user_data::SessionHolder};
pub struct PendingImageCopyData {
pub frame: Frame,
pub damage: Vec<smithay::utils::Rectangle<i32, BufferCoords>>,
pub sync: SyncPoint,
}
pub fn submit_buffer<R>(
frame: Frame,
renderer: &mut R,
@ -61,7 +67,7 @@ pub fn submit_buffer<R>(
transform: Transform,
damage: Option<&[Rectangle<i32, Physical>]>,
sync: SyncPoint,
) -> Result<Option<(Frame, Vec<Rectangle<i32, BufferCoords>>)>, R::Error>
) -> Result<Option<PendingImageCopyData>, R::Error>
where
R: ExportMem,
R::Error: FromGlesError,
@ -124,16 +130,17 @@ where
}
}
Ok(Some((
Ok(Some(PendingImageCopyData {
frame,
damage
damage: damage
.into_iter()
.map(|rect| {
let logical = rect.to_logical(1);
logical.to_buffer(1, transform, &logical.size)
})
.collect(),
)))
sync,
}))
}
pub fn render_session<F, R, T>(
@ -142,7 +149,7 @@ pub fn render_session<F, R, T>(
frame: Frame,
transform: Transform,
render_fn: F,
) -> Result<Option<(Frame, Vec<Rectangle<i32, BufferCoords>>)>, DTError<R::Error>>
) -> Result<Option<PendingImageCopyData>, DTError<R::Error>>
where
R: ExportMem + Offscreen<T>,
R::Error: FromGlesError,
@ -430,7 +437,7 @@ pub fn render_workspace_to_buffer(
}
};
if let Some((frame, damage)) = result {
if let Some(PendingImageCopyData { frame, damage, .. }) = result {
frame.success(transform, damage, common.clock.now())
}
}
@ -661,7 +668,7 @@ pub fn render_window_to_buffer(
},
};
if let Some((frame, damage)) = result {
if let Some(PendingImageCopyData { frame, damage, .. }) = result {
frame.success(Transform::Normal, damage, common.clock.now())
}
}
@ -817,7 +824,7 @@ pub fn render_cursor_to_buffer(
}
};
if let Some((frame, damage)) = result {
if let Some(PendingImageCopyData { frame, damage, .. }) = result {
frame.success(Transform::Normal, damage, common.clock.now())
}
}