Skip to content

WIP image-capture-source: Don't send error on closed output/toplevel #1961

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

Draft
ids1024 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP image-capture-source: Don't send error on closed output/toplevel #1961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 12 additions & 17 deletions src/wayland/image_capture_source/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,18 +447,15 @@ where
fn request(
state: &mut D,
_client: &Client,
resource: &ExtOutputImageCaptureSourceManagerV1,
_resource: &ExtOutputImageCaptureSourceManagerV1,
request: ext_output_image_capture_source_manager_v1::Request,
_data: &(),
_dh: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
match request {
ext_output_image_capture_source_manager_v1::Request::CreateSource { source, output } => {
let Some(output_inner) = Output::from_resource(&output) else {
resource.post_error(0u32, "invalid output");
return;
};
let output_inner = Output::from_resource(&output);

let capture_source = ImageCaptureSource::new();

Expand All @@ -470,7 +467,10 @@ where
);

capture_source.add_instance(&source_resource);
state.output_source_created(capture_source, &output_inner);
if let Some(output_inner) = output_inner {
// TODO method to call otherwise?
state.output_source_created(capture_source, &output_inner);
}
}
ext_output_image_capture_source_manager_v1::Request::Destroy => {}
_ => unreachable!(),
Expand Down Expand Up @@ -584,7 +584,7 @@ where
fn request(
state: &mut D,
_client: &Client,
resource: &ExtForeignToplevelImageCaptureSourceManagerV1,
_resource: &ExtForeignToplevelImageCaptureSourceManagerV1,
request: ext_foreign_toplevel_image_capture_source_manager_v1::Request,
_data: &(),
_dh: &DisplayHandle,
Expand All @@ -595,15 +595,7 @@ where
source,
toplevel_handle,
} => {
let Some(handle) = ForeignToplevelHandle::from_resource(&toplevel_handle) else {
resource.post_error(0u32, "invalid toplevel handle");
return;
};

if handle.is_closed() {
resource.post_error(0u32, "toplevel has been closed");
return;
}
let handle = ForeignToplevelHandle::from_resource(&toplevel_handle);

let capture_source = ImageCaptureSource::new();

Expand All @@ -615,7 +607,10 @@ where
);

capture_source.add_instance(&source_resource);
state.toplevel_source_created(capture_source, handle);
if let Some(handle) = handle {
// TODO method to call otherwise?
state.toplevel_source_created(capture_source, handle);
}
}
ext_foreign_toplevel_image_capture_source_manager_v1::Request::Destroy => {}
_ => unreachable!(),
Expand Down
Loading