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

screencopy: Use new error types

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-04 14:14:11 +01:00
parent 1eef3b3d78
commit 6eb7493ad7
3 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/backend/render/mod.rs
View file

@ -26,6 +26,7 @@ use smithay::{
allocator::dmabuf::Dmabuf, allocator::dmabuf::Dmabuf,
drm::DrmNode, drm::DrmNode,
renderer::{ renderer::{
buffer_dimensions,
damage::{ damage::{
DamageTrackedRenderer, DamageTrackedRendererError as RenderError, OutputNoMode, DamageTrackedRenderer, DamageTrackedRendererError as RenderError, OutputNoMode,
}, },
@ -36,7 +37,7 @@ use smithay::{
}, },
}, },
output::Output, output::Output,
utils::{Physical, Rectangle}, utils::{Physical, Rectangle, Transform},
}; };
pub mod cursor; pub mod cursor;
@ -254,6 +255,13 @@ where
if let Some((source, buffers)) = screencopy { if let Some((source, buffers)) = screencopy {
if res.is_ok() { if res.is_ok() {
for (session, params) in buffers { for (session, params) in buffers {
let mode = output.current_mode().unwrap().size;
let buffer_size = buffer_dimensions(&params.buffer).unwrap();
if mode.to_logical(1).to_buffer(1, Transform::Normal) != buffer_size {
session.failed(FailureReason::InvalidSize);
continue;
}
match render_to_buffer( match render_to_buffer(
gpu.cloned(), gpu.cloned(),
renderer, renderer,

37
src/wayland/handlers/screencopy.rs
View file

@ -4,6 +4,7 @@ use std::{
ops::{Deref, DerefMut}, ops::{Deref, DerefMut},
}; };
use anyhow::anyhow;
use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::{ use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::{
FailureReason, InputType, FailureReason, InputType,
}; };
@ -112,7 +113,7 @@ impl ScreencopyHandler for State {
.unwrap() .unwrap()
.0 .0
.borrow_mut() .borrow_mut()
.push(DropableSession(session, FailureReason::OutputDisabled)); .push(DropableSession(session, FailureReason::InvalidOutput));
formats formats
} }
@ -134,7 +135,7 @@ impl ScreencopyHandler for State {
let workspace = match self.common.shell.space_for_handle_mut(&handle) { let workspace = match self.common.shell.space_for_handle_mut(&handle) {
Some(workspace) => workspace, Some(workspace) => workspace,
None => { None => {
session.failed(FailureReason::Unspec); session.failed(FailureReason::InvalidWorkspace);
return Vec::new(); return Vec::new();
} }
}; };
@ -145,7 +146,7 @@ impl ScreencopyHandler for State {
workspace workspace
.screencopy_sessions .screencopy_sessions
.push(DropableSession(session, FailureReason::InvalidOutput)); .push(DropableSession(session, FailureReason::InvalidWorkspace));
formats formats
} }
@ -217,7 +218,7 @@ impl ScreencopyHandler for State {
.unwrap() .unwrap()
.0 .0
.borrow_mut() .borrow_mut()
.push(DropableSession(session, FailureReason::ToplevelDestroyed)); .push(DropableSession(session, FailureReason::InvalidToplevel));
formats formats
} }
@ -250,7 +251,7 @@ impl ScreencopyHandler for State {
if buffer_size.to_physical(1) != mode { if buffer_size.to_physical(1) != mode {
slog_scope::warn!("Error during screencopy session: Buffer size doesn't match"); slog_scope::warn!("Error during screencopy session: Buffer size doesn't match");
session.failed(FailureReason::InvalidBuffer); session.failed(FailureReason::InvalidSize);
return; return;
} }
} }
@ -258,7 +259,7 @@ impl ScreencopyHandler for State {
let geometry = window.geometry(); let geometry = window.geometry();
if buffer_size != geometry.size { if buffer_size != geometry.size {
slog_scope::warn!("Error during screencopy session: Buffer size doesn't match"); slog_scope::warn!("Error during screencopy session: Buffer size doesn't match");
session.failed(FailureReason::InvalidBuffer); session.failed(FailureReason::InvalidSize);
return; return;
} }
} }
@ -302,7 +303,7 @@ impl ScreencopyHandler for State {
SessionType::Workspace(_output, handle) => { SessionType::Workspace(_output, handle) => {
match self.common.shell.space_for_handle_mut(&handle) { match self.common.shell.space_for_handle_mut(&handle) {
Some(workspace) => workspace.pending_buffers.push((session, params)), Some(workspace) => workspace.pending_buffers.push((session, params)),
None => session.failed(FailureReason::OutputDisabled), None => session.failed(FailureReason::InvalidWorkspace),
}; };
} }
SessionType::Window(window) => { SessionType::Window(window) => {
@ -397,7 +398,7 @@ fn formats_for_output(
let mode = match output.current_mode() { let mode = match output.current_mode() {
Some(mode) => mode.size.to_logical(1).to_buffer(1, Transform::Normal), Some(mode) => mode.size.to_logical(1).to_buffer(1, Transform::Normal),
None => { None => {
return Err(FailureReason::OutputDisabled); return Err(FailureReason::InvalidOutput);
} }
}; };
@ -557,6 +558,14 @@ pub fn render_output_to_buffer(
params: BufferParams, params: BufferParams,
output: &Output, output: &Output,
) -> Result<bool, (FailureReason, anyhow::Error)> { ) -> Result<bool, (FailureReason, anyhow::Error)> {
let mode = output
.current_mode()
.map(|mode| mode.size.to_logical(1).to_buffer(1, Transform::Normal));
let buffer_size = buffer_dimensions(&params.buffer).unwrap();
if mode != Some(buffer_size) {
return Err((FailureReason::InvalidSize, anyhow!("Output changed mode")));
}
let node = node_from_params(&params, &mut state.backend, Some(output)); let node = node_from_params(&params, &mut state.backend, Some(output));
let mut _tmp_multirenderer = None; let mut _tmp_multirenderer = None;
let renderer = match &mut state.backend { let renderer = match &mut state.backend {
@ -608,6 +617,14 @@ pub fn render_workspace_to_buffer(
output: &Output, output: &Output,
handle: &WorkspaceHandle, handle: &WorkspaceHandle,
) -> Result<bool, (FailureReason, anyhow::Error)> { ) -> Result<bool, (FailureReason, anyhow::Error)> {
let mode = output
.current_mode()
.map(|mode| mode.size.to_logical(1).to_buffer(1, Transform::Normal));
let buffer_size = buffer_dimensions(&params.buffer).unwrap();
if mode != Some(buffer_size) {
return Err((FailureReason::InvalidSize, anyhow!("Output changed mode")));
}
let node = node_from_params(&params, &mut state.backend, Some(output)); let node = node_from_params(&params, &mut state.backend, Some(output));
let mut _tmp_multirenderer = None; let mut _tmp_multirenderer = None;
let renderer = match &mut state.backend { let renderer = match &mut state.backend {
@ -660,6 +677,10 @@ pub fn render_window_to_buffer(
window: &Window, window: &Window,
) -> Result<bool, (FailureReason, anyhow::Error)> { ) -> Result<bool, (FailureReason, anyhow::Error)> {
let geometry = window.geometry(); let geometry = window.geometry();
let buffer_size = buffer_dimensions(&params.buffer).unwrap();
if buffer_size != geometry.size.to_buffer(1, Transform::Normal) {
return Err((FailureReason::InvalidSize, anyhow!("Window changed size")));
}
let node = node_from_params(&params, &mut state.backend, None); let node = node_from_params(&params, &mut state.backend, None);
let mut _tmp_multirenderer = None; let mut _tmp_multirenderer = None;

11
src/wayland/protocols/screencopy.rs
View file

@ -566,7 +566,10 @@ where
if let Err(err) = cursor.into_result() { if let Err(err) = cursor.into_result() {
slog_scope::warn!("Client did send unknown cursor mode: {}", err); slog_scope::warn!("Client did send unknown cursor mode: {}", err);
session.failed(FailureReason::UnknownInput); session.post_error(
zcosmic_screencopy_session_v1::Error::InvalidCursorMode,
"Unknown cursor mode, wrong protocol version?",
);
return None; return None;
}; };
let session = Session { let session = Session {
@ -661,7 +664,7 @@ where
return; return;
} }
}; };
session.obj.failed(FailureReason::ToplevelDestroyed); session.obj.failed(FailureReason::InvalidToplevel);
return; return;
} }
}, },
@ -697,7 +700,7 @@ where
return; return;
} }
}; };
session.failed(FailureReason::InvalidOutput); session.failed(FailureReason::InvalidWorkspace);
return; return;
} }
}, },
@ -782,7 +785,7 @@ where
return; return;
} }
}; };
session.failed(FailureReason::UnknownInput); session.failed(FailureReason::InvalidSeat);
return; return;
} }
}, },