1
0
Fork 0
forked from wry/wry

wl_surface: add jay_sync_file_surface extension

This commit is contained in:
Julian Orth 2026-02-19 20:32:54 +01:00
parent 8841865572
commit c5d983843e
13 changed files with 424 additions and 24 deletions

View file

@ -7,6 +7,8 @@ pub mod usr_jay_render_ctx;
pub mod usr_jay_screencast;
pub mod usr_jay_select_toplevel;
pub mod usr_jay_select_workspace;
pub mod usr_jay_sync_file_release;
pub mod usr_jay_sync_file_surface;
pub mod usr_jay_toplevel;
pub mod usr_jay_workspace;
pub mod usr_jay_workspace_watcher;

View file

@ -12,8 +12,9 @@ use {
usr_jay_screencast::UsrJayScreencast,
usr_jay_select_toplevel::UsrJaySelectToplevel,
usr_jay_select_workspace::UsrJaySelectWorkspace,
usr_jay_sync_file_surface::UsrJaySyncFileSurface,
usr_jay_workspace_watcher::UsrJayWorkspaceWatcher, usr_wl_output::UsrWlOutput,
usr_wl_seat::UsrWlSeat,
usr_wl_seat::UsrWlSeat, usr_wl_surface::UsrWlSurface,
},
usr_object::UsrObject,
},
@ -187,6 +188,22 @@ impl UsrJayCompositor {
self.con.add_object(obj.clone());
obj
}
#[expect(dead_code)]
pub fn get_sync_file_surface(&self, surface: &UsrWlSurface) -> Rc<UsrJaySyncFileSurface> {
let obj = Rc::new(UsrJaySyncFileSurface {
id: self.con.id(),
con: self.con.clone(),
version: self.version,
});
self.con.request(GetSyncFileSurface {
self_id: self.id,
id: obj.id,
surface: surface.id,
});
self.con.add_object(obj.clone());
obj
}
}
impl JayCompositorEventHandler for UsrJayCompositor {

View file

@ -0,0 +1,60 @@
use {
crate::{
gfx_api::SyncFile,
object::Version,
utils::clonecell::CloneCell,
wire::{JaySyncFileReleaseId, jay_sync_file_release::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
uapi::OwnedFd,
};
pub struct UsrJaySyncFileRelease {
pub id: JaySyncFileReleaseId,
pub con: Rc<UsrCon>,
pub owner: CloneCell<Option<Rc<dyn UsrJaySyncFileReleaseOwner>>>,
pub version: Version,
}
pub trait UsrJaySyncFileReleaseOwner {
fn release(&self, sync_file: Option<SyncFile>);
}
impl UsrJaySyncFileRelease {
fn release(&self, sf: Option<Rc<OwnedFd>>) {
if let Some(owner) = self.owner.get() {
owner.release(sf.map(SyncFile));
}
self.con.remove_obj(self);
}
}
impl JaySyncFileReleaseEventHandler for UsrJaySyncFileRelease {
type Error = Infallible;
fn release_immediate(&self, _ev: ReleaseImmediate, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.release(None);
Ok(())
}
fn release_async(&self, ev: ReleaseAsync, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.release(Some(ev.sync_file));
Ok(())
}
}
usr_object_base! {
self = UsrJaySyncFileRelease = JaySyncFileRelease;
version = self.version;
}
impl UsrObject for UsrJaySyncFileRelease {
fn destroy(&self) {
self.con.request(Destroy { self_id: self.id });
}
fn break_loops(&self) {
self.owner.take();
}
}

View file

@ -0,0 +1,66 @@
use {
crate::{
gfx_api::SyncFile,
object::Version,
wire::{JaySyncFileSurfaceId, jay_sync_file_surface::*},
wl_usr::{
UsrCon, usr_ifs::usr_jay_sync_file_release::UsrJaySyncFileRelease,
usr_object::UsrObject,
},
},
std::{convert::Infallible, rc::Rc},
};
pub struct UsrJaySyncFileSurface {
pub id: JaySyncFileSurfaceId,
pub con: Rc<UsrCon>,
pub version: Version,
}
impl UsrJaySyncFileSurface {
#[expect(dead_code)]
pub fn set_acquire(&self, sf: Option<&SyncFile>) {
match sf {
None => {
self.con.request(SetAcquireImmediate { self_id: self.id });
}
Some(sf) => {
self.con.request(SetAcquireAsync {
self_id: self.id,
sync_file: sf.0.clone(),
});
}
}
}
#[expect(dead_code)]
pub fn get_release(&self) -> Rc<UsrJaySyncFileRelease> {
let obj = Rc::new(UsrJaySyncFileRelease {
id: self.con.id(),
con: self.con.clone(),
owner: Default::default(),
version: self.version,
});
self.con.request(GetRelease {
self_id: self.id,
release: obj.id,
});
self.con.add_object(obj.clone());
obj
}
}
impl JaySyncFileSurfaceEventHandler for UsrJaySyncFileSurface {
type Error = Infallible;
}
usr_object_base! {
self = UsrJaySyncFileSurface = JaySyncFileSurface;
version = self.version;
}
impl UsrObject for UsrJaySyncFileSurface {
fn destroy(&self) {
self.con.request(Destroy { self_id: self.id });
}
}