Skip to content

chore: minor improvements in libwayshot lib.rs #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Decodetalkers merged 2 commits into from
Mar 14, 2025
Merged

chore: minor improvements in libwayshot lib.rs #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96f3cef
chore: use ok_or_else to find frame format
OneRandom1509 Mar 13, 2025
59e1ee5
fix: minor docs and tracing message fix
OneRandom1509 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions libwayshot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,17 +526,14 @@ impl WayshotConnection {
| wl_shm::Format::Bgr888
)
})
.copied();
.copied()
// Check if frame format exists.
.ok_or_else(|| {
tracing::error!("No suitable frame format found");
Error::NoSupportedBufferFormat
})?;
tracing::trace!("Selected frame buffer format: {:#?}", frame_format);

// Check if frame format exists.
let frame_format = match frame_format {
Some(format) => format,
None => {
tracing::error!("No suitable frame format found");
return Err(Error::NoSupportedBufferFormat);
}
};
Ok((state, event_queue, frame, frame_format))
}

Expand Down Expand Up @@ -816,7 +813,7 @@ impl WayshotConnection {
Ok(x) => x,
Err(e) => {
tracing::error!(
"Failed to create compositor Does your compositor implement WlCompositor?"
"Failed to create compositor. Does your compositor implement WlCompositor?"
);
tracing::error!("err: {e}");
return Err(Error::ProtocolNotFound(
Expand Down Expand Up @@ -1065,7 +1062,8 @@ impl WayshotConnection {
) -> Result<DynamicImage> {
self.screenshot_region_capturer(RegionCapturer::Freeze(callback), cursor_overlay)
}
/// shot one ouput

/// Take a screenshot from one output
pub fn screenshot_single_output(
&self,
output_info: &OutputInfo,
Expand Down