StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(wayland): s/ObjectId/Weak<WlSurface>/

Browse Source
This commit is contained in:
Nova
2022-11-09 13:05:21 -05:00
parent 41e76c9d0a
commit 043a1a1b29
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/surface.rs
View File

@@ -16,7 +16,7 @@ use smithay::{
desktop::utils::send_frames_surface_tree,
output::Output,
reexports::wayland_server::{
backend::ObjectId, protocol::wl_surface::WlSurface, Display, DisplayHandle, Resource,
self, protocol::wl_surface::WlSurface, Display, DisplayHandle, Resource,
},
wayland::compositor::{self, SurfaceData, SurfaceUserData},
};
@@ -96,7 +96,7 @@ pub struct CoreSurface {
display: Weak<Mutex<Display<WaylandState>>>,
pub state: Weak<Mutex<WaylandState>>,
pub dh: DisplayHandle,
pub surface_id: ObjectId,
pub weak_surface: wayland_server::Weak<WlSurface>,
pub mapped_data: Mutex<Option<CoreSurfaceData>>,
pub pending_material_applications: Mutex<Vec<(Arc<Model>, u32)>>,
}
@@ -112,7 +112,7 @@ impl CoreSurface {
display: Arc::downgrade(display),
state: Arc::downgrade(state),
dh,
surface_id: surface.id(),
weak_surface: surface.downgrade(),
mapped_data: Mutex::new(None),
pending_material_applications: Mutex::new(Vec::new()),
})
@@ -199,7 +199,7 @@ impl CoreSurface {
}
pub fn wl_surface(&self) -> WlSurface {
WlSurface::from_id(&self.dh, self.surface_id.clone()).unwrap()
self.weak_surface.upgrade().unwrap()
}
pub fn with_states<F, T>(&self, f: F) -> T