entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

screencapture: implement ext_output_image_capture_source_manager_v1

Browse source
This commit is contained in:
Julian Orth 2024-10-08 17:46:22 +02:00
parent b754e37bfe
commit 40bce507a6
9 changed files with 228 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

89
docs/features.md
View file

@ -138,50 +138,51 @@ Jay uses frame scheduling to achieve input latency as low as 1.5 ms.
Jay supports the following wayland protocols: Jay supports the following wayland protocols:
| Global | Version | Privileged | | Global | Version | Privileged |
|-----------------------------------------|:----------------|---------------| |--------------------------------------------|:----------------|---------------|
| ext_foreign_toplevel_list_v1 | 1 | Yes | | ext_foreign_toplevel_list_v1 | 1 | Yes |
| ext_idle_notifier_v1 | 1 | Yes | | ext_idle_notifier_v1 | 1 | Yes |
| ext_session_lock_manager_v1 | 1 | Yes | | ext_output_image_capture_source_manager_v1 | 1 | |
| ext_transient_seat_manager_v1 | 1[^ts_rejected] | Yes | | ext_session_lock_manager_v1 | 1 | Yes |
| org_kde_kwin_server_decoration_manager | 1 | | | ext_transient_seat_manager_v1 | 1[^ts_rejected] | Yes |
| wl_compositor | 6 | | | org_kde_kwin_server_decoration_manager | 1 | |
| wl_data_device_manager | 3 | | | wl_compositor | 6 | |
| wl_drm | 2 | | | wl_data_device_manager | 3 | |
| wl_output | 4 | | | wl_drm | 2 | |
| wl_seat | 9 | | | wl_output | 4 | |
| wl_shm | 2 | | | wl_seat | 9 | |
| wl_subcompositor | 1 | | | wl_shm | 2 | |
| wp_alpha_modifier_v1 | 1 | | | wl_subcompositor | 1 | |
| wp_content_type_manager_v1 | 1 | | | wp_alpha_modifier_v1 | 1 | |
| wp_cursor_shape_manager_v1 | 1 | | | wp_content_type_manager_v1 | 1 | |
| wp_drm_lease_device_v1 | 1 | | | wp_cursor_shape_manager_v1 | 1 | |
| wp_fractional_scale_manager_v1 | 1 | | | wp_drm_lease_device_v1 | 1 | |
| wp_linux_drm_syncobj_manager_v1 | 1 | | | wp_fractional_scale_manager_v1 | 1 | |
| wp_presentation | 1 | | | wp_linux_drm_syncobj_manager_v1 | 1 | |
| wp_security_context_manager_v1 | 1 | | | wp_presentation | 1 | |
| wp_single_pixel_buffer_manager_v1 | 1 | | | wp_security_context_manager_v1 | 1 | |
| wp_tearing_control_manager_v1 | 1 | | | wp_single_pixel_buffer_manager_v1 | 1 | |
| wp_viewporter | 1 | | | wp_tearing_control_manager_v1 | 1 | |
| xdg_activation_v1 | 1 | | | wp_viewporter | 1 | |
| xdg_toplevel_drag_manager_v1 | 1 | | | xdg_activation_v1 | 1 | |
| xdg_wm_base | 6 | | | xdg_toplevel_drag_manager_v1 | 1 | |
| xdg_wm_dialog_v1 | 1 | | | xdg_wm_base | 6 | |
| zwlr_data_control_manager_v1 | 2 | Yes | | xdg_wm_dialog_v1 | 1 | |
| zwlr_layer_shell_v1 | 5 | No[^lsaccess] | | zwlr_data_control_manager_v1 | 2 | Yes |
| zwlr_screencopy_manager_v1 | 3 | Yes | | zwlr_layer_shell_v1 | 5 | No[^lsaccess] |
| zwp_idle_inhibit_manager_v1 | 1 | | | zwlr_screencopy_manager_v1 | 3 | Yes |
| zwp_input_method_manager_v2 | 1 | Yes | | zwp_idle_inhibit_manager_v1 | 1 | |
| zwp_linux_dmabuf_v1 | 5 | | | zwp_input_method_manager_v2 | 1 | Yes |
| zwp_pointer_constraints_v1 | 1 | | | zwp_linux_dmabuf_v1 | 5 | |
| zwp_pointer_gestures_v1 | 3 | | | zwp_pointer_constraints_v1 | 1 | |
| zwp_primary_selection_device_manager_v1 | 1 | | | zwp_pointer_gestures_v1 | 3 | |
| zwp_relative_pointer_manager_v1 | 1 | | | zwp_primary_selection_device_manager_v1 | 1 | |
| zwp_tablet_manager_v2 | 1 | | | zwp_relative_pointer_manager_v1 | 1 | |
| zwp_text_input_manager_v3 | 1 | | | zwp_tablet_manager_v2 | 1 | |
| zwp_virtual_keyboard_manager_v1 | 1 | Yes | | zwp_text_input_manager_v3 | 1 | |
| zxdg_decoration_manager_v1 | 1 | | | zwp_virtual_keyboard_manager_v1 | 1 | Yes |
| zxdg_output_manager_v1 | 3 | | | zxdg_decoration_manager_v1 | 1 | |
| zxdg_output_manager_v1 | 3 | |
[^lsaccess]: Sandboxes can restrict access to this protocol. [^lsaccess]: Sandboxes can restrict access to this protocol.
[^ts_rejected]: Seat creation is always rejected. [^ts_rejected]: Seat creation is always rejected.

1
release-notes.md
View file

@ -5,6 +5,7 @@
- Vulkan is now the default renderer. - Vulkan is now the default renderer.
- Emulate vblank events on the nvidia driver. - Emulate vblank events on the nvidia driver.
- Allow X windows to scale themselves. - Allow X windows to scale themselves.
- Implement ext-image-capture-source-v1.
# 1.6.0 (2024-09-25) # 1.6.0 (2024-09-25)

14
src/client/objects.rs
View file

@ -2,6 +2,7 @@ use {
crate::{ crate::{
client::{Client, ClientError}, client::{Client, ClientError},
ifs::{ ifs::{
ext_image_capture_source_v1::ExtImageCaptureSourceV1,
ipc::{ ipc::{
wl_data_source::WlDataSource, zwlr_data_control_source_v1::ZwlrDataControlSourceV1, wl_data_source::WlDataSource, zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
@ -31,11 +32,11 @@ use {
copyhashmap::{CopyHashMap, Locked}, copyhashmap::{CopyHashMap, Locked},
}, },
wire::{ wire::{
JayOutputId, JayScreencastId, JayToplevelId, JayWorkspaceId, WlBufferId, ExtImageCaptureSourceV1Id, JayOutputId, JayScreencastId, JayToplevelId, JayWorkspaceId,
WlDataSourceId, WlOutputId, WlPointerId, WlRegionId, WlRegistryId, WlSeatId, WlBufferId, WlDataSourceId, WlOutputId, WlPointerId, WlRegionId, WlRegistryId,
WlSurfaceId, WpDrmLeaseConnectorV1Id, WpLinuxDrmSyncobjTimelineV1Id, XdgPopupId, WlSeatId, WlSurfaceId, WpDrmLeaseConnectorV1Id, WpLinuxDrmSyncobjTimelineV1Id,
XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId, ZwlrDataControlSourceV1Id, XdgPopupId, XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId,
ZwpPrimarySelectionSourceV1Id, ZwpTabletToolV2Id, ZwlrDataControlSourceV1Id, ZwpPrimarySelectionSourceV1Id, ZwpTabletToolV2Id,
}, },
}, },
std::{cell::RefCell, mem, rc::Rc}, std::{cell::RefCell, mem, rc::Rc},
@ -67,6 +68,7 @@ pub struct Objects {
pub drm_lease_outputs: CopyHashMap<WpDrmLeaseConnectorV1Id, Rc<WpDrmLeaseConnectorV1>>, pub drm_lease_outputs: CopyHashMap<WpDrmLeaseConnectorV1Id, Rc<WpDrmLeaseConnectorV1>>,
pub tablet_tools: CopyHashMap<ZwpTabletToolV2Id, Rc<ZwpTabletToolV2>>, pub tablet_tools: CopyHashMap<ZwpTabletToolV2Id, Rc<ZwpTabletToolV2>>,
pub xdg_popups: CopyHashMap<XdgPopupId, Rc<XdgPopup>>, pub xdg_popups: CopyHashMap<XdgPopupId, Rc<XdgPopup>>,
pub image_capture_sources: CopyHashMap<ExtImageCaptureSourceV1Id, Rc<ExtImageCaptureSourceV1>>,
ids: RefCell<Vec<usize>>, ids: RefCell<Vec<usize>>,
} }
@ -100,6 +102,7 @@ impl Objects {
drm_lease_outputs: Default::default(), drm_lease_outputs: Default::default(),
tablet_tools: Default::default(), tablet_tools: Default::default(),
xdg_popups: Default::default(), xdg_popups: Default::default(),
image_capture_sources: Default::default(),
ids: RefCell::new(vec![]), ids: RefCell::new(vec![]),
} }
} }
@ -137,6 +140,7 @@ impl Objects {
self.drm_lease_outputs.clear(); self.drm_lease_outputs.clear();
self.tablet_tools.clear(); self.tablet_tools.clear();
self.xdg_popups.clear(); self.xdg_popups.clear();
self.image_capture_sources.clear();
} }
pub fn id<T>(&self, client_data: &Client) -> Result<T, ClientError> pub fn id<T>(&self, client_data: &Client) -> Result<T, ClientError>

2
src/globals.rs
View file

@ -5,6 +5,7 @@ use {
ifs::{ ifs::{
ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1Global, ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1Global,
ext_idle_notifier_v1::ExtIdleNotifierV1Global, ext_idle_notifier_v1::ExtIdleNotifierV1Global,
ext_output_image_capture_source_manager_v1::ExtOutputImageCaptureSourceManagerV1Global,
ext_session_lock_manager_v1::ExtSessionLockManagerV1Global, ext_session_lock_manager_v1::ExtSessionLockManagerV1Global,
ipc::{ ipc::{
wl_data_device_manager::WlDataDeviceManagerGlobal, wl_data_device_manager::WlDataDeviceManagerGlobal,
@ -197,6 +198,7 @@ impl Globals {
add_singleton!(ZwpPointerGesturesV1Global); add_singleton!(ZwpPointerGesturesV1Global);
add_singleton!(ZwpTabletManagerV2Global); add_singleton!(ZwpTabletManagerV2Global);
add_singleton!(JayDamageTrackingGlobal); add_singleton!(JayDamageTrackingGlobal);
add_singleton!(ExtOutputImageCaptureSourceManagerV1Global);
} }
pub fn add_backend_singletons(&self, backend: &Rc<dyn Backend>) { pub fn add_backend_singletons(&self, backend: &Rc<dyn Backend>) {

2
src/ifs.rs
View file

@ -2,6 +2,8 @@ pub mod ext_foreign_toplevel_handle_v1;
pub mod ext_foreign_toplevel_list_v1; pub mod ext_foreign_toplevel_list_v1;
pub mod ext_idle_notification_v1; pub mod ext_idle_notification_v1;
pub mod ext_idle_notifier_v1; pub mod ext_idle_notifier_v1;
pub mod ext_image_capture_source_v1;
pub mod ext_output_image_capture_source_manager_v1;
pub mod ext_session_lock_manager_v1; pub mod ext_session_lock_manager_v1;
pub mod ext_session_lock_v1; pub mod ext_session_lock_v1;
pub mod ipc; pub mod ipc;

54
src/ifs/ext_image_capture_source_v1.rs Normal file
View file

@ -0,0 +1,54 @@
use {
crate::{
client::{Client, ClientError},
ifs::wl_output::OutputGlobalOpt,
leaks::Tracker,
object::{Object, Version},
wire::{ext_image_capture_source_v1::*, ExtImageCaptureSourceV1Id},
},
std::rc::Rc,
thiserror::Error,
};
#[expect(dead_code)]
#[derive(Clone)]
pub enum ImageCaptureSource {
Output(Rc<OutputGlobalOpt>),
}
pub struct ExtImageCaptureSourceV1 {
pub id: ExtImageCaptureSourceV1Id,
pub client: Rc<Client>,
pub tracker: Tracker<Self>,
#[expect(dead_code)]
pub ty: ImageCaptureSource,
}
impl ExtImageCaptureSourceV1RequestHandler for ExtImageCaptureSourceV1 {
type Error = ExtImageCaptureSourceError;
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.client.remove_obj(self)?;
Ok(())
}
}
object_base! {
self = ExtImageCaptureSourceV1;
version = Version(1);
}
impl Object for ExtImageCaptureSourceV1 {}
dedicated_add_obj!(
ExtImageCaptureSourceV1,
ExtImageCaptureSourceV1Id,
image_capture_sources
);
#[derive(Debug, Error)]
pub enum ExtImageCaptureSourceError {
#[error(transparent)]
ClientError(Box<ClientError>),
}
efrom!(ExtImageCaptureSourceError, ClientError);

104
src/ifs/ext_output_image_capture_source_manager_v1.rs Normal file
View file

@ -0,0 +1,104 @@
use {
crate::{
client::{Client, ClientError},
globals::{Global, GlobalName},
ifs::ext_image_capture_source_v1::{ExtImageCaptureSourceV1, ImageCaptureSource},
leaks::Tracker,
object::{Object, Version},
wire::{
ext_output_image_capture_source_manager_v1::*, ExtOutputImageCaptureSourceManagerV1Id,
},
},
std::rc::Rc,
thiserror::Error,
};
pub struct ExtOutputImageCaptureSourceManagerV1Global {
pub name: GlobalName,
}
impl ExtOutputImageCaptureSourceManagerV1Global {
pub fn new(name: GlobalName) -> Self {
Self { name }
}
fn bind_(
self: Rc<Self>,
id: ExtOutputImageCaptureSourceManagerV1Id,
client: &Rc<Client>,
version: Version,
) -> Result<(), ExtOutputImageCaptureSourceManagerV1Error> {
let obj = Rc::new(ExtOutputImageCaptureSourceManagerV1 {
id,
client: client.clone(),
tracker: Default::default(),
version,
});
track!(client, obj);
client.add_client_obj(&obj)?;
Ok(())
}
}
pub struct ExtOutputImageCaptureSourceManagerV1 {
pub id: ExtOutputImageCaptureSourceManagerV1Id,
pub client: Rc<Client>,
pub tracker: Tracker<Self>,
pub version: Version,
}
impl ExtOutputImageCaptureSourceManagerV1RequestHandler for ExtOutputImageCaptureSourceManagerV1 {
type Error = ExtOutputImageCaptureSourceManagerV1Error;
fn create_source(&self, req: CreateSource, _slf: &Rc<Self>) -> Result<(), Self::Error> {
let output = self.client.lookup(req.output)?;
let obj = Rc::new(ExtImageCaptureSourceV1 {
id: req.source,
client: self.client.clone(),
tracker: Default::default(),
ty: ImageCaptureSource::Output(output.global.clone()),
});
track!(self.client, obj);
self.client.add_client_obj(&obj)?;
Ok(())
}
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.client.remove_obj(self)?;
Ok(())
}
}
global_base!(
ExtOutputImageCaptureSourceManagerV1Global,
ExtOutputImageCaptureSourceManagerV1,
ExtOutputImageCaptureSourceManagerV1Error
);
impl Global for ExtOutputImageCaptureSourceManagerV1Global {
fn singleton(&self) -> bool {
true
}
fn version(&self) -> u32 {
1
}
}
simple_add_global!(ExtOutputImageCaptureSourceManagerV1Global);
object_base! {
self = ExtOutputImageCaptureSourceManagerV1;
version = self.version;
}
impl Object for ExtOutputImageCaptureSourceManagerV1 {}
simple_add_obj!(ExtOutputImageCaptureSourceManagerV1);
#[derive(Debug, Error)]
pub enum ExtOutputImageCaptureSourceManagerV1Error {
#[error(transparent)]
ClientError(Box<ClientError>),
}
efrom!(ExtOutputImageCaptureSourceManagerV1Error, ClientError);

3
wire/ext_image_capture_source_v1.txt Normal file
View file

@ -0,0 +1,3 @@
request destroy {
}

8
wire/ext_output_image_capture_source_manager_v1.txt Normal file
View file

@ -0,0 +1,8 @@
request create_source {
source: id(ext_image_capture_source_v1),
output: id(wl_output),
}
request destroy {
}