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

xwayland: add x-surface indirection

Browse source
This commit is contained in:
Julian Orth 2022-10-16 20:53:59 +02:00
parent 8059457afb
commit 6193569596
6 changed files with 123 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ifs/wl_surface.rs
View file

@ -3,8 +3,8 @@ pub mod ext_session_lock_surface_v1;
pub mod wl_subsurface;
pub mod wp_fractional_scale_v1;
pub mod wp_viewport;
pub mod x_surface;
pub mod xdg_surface;
pub mod xwindow;
pub mod zwlr_layer_surface_v1;
pub mod zwp_idle_inhibitor_v1;
@ -27,7 +27,8 @@ use {
wl_surface::{
cursor::CursorSurface, wl_subsurface::WlSubsurface,
wp_fractional_scale_v1::WpFractionalScaleV1, wp_viewport::WpViewport,
xdg_surface::XdgSurfaceError, zwlr_layer_surface_v1::ZwlrLayerSurfaceV1Error,
x_surface::XSurface, xdg_surface::XdgSurfaceError,
zwlr_layer_surface_v1::ZwlrLayerSurfaceV1Error,
},
wp_presentation_feedback::WpPresentationFeedback,
},
@ -291,6 +292,10 @@ trait SurfaceExt {
true
}
fn is_none(&self) -> bool {
!self.is_some()
}
fn on_surface_destroy(&self) -> Result<(), WlSurfaceError> {
if self.is_some() {
Err(WlSurfaceError::ReloObjectStillExists)
@ -318,6 +323,10 @@ trait SurfaceExt {
fn focus_node(&self) -> Option<Rc<dyn Node>> {
None
}
fn into_xsurface(self: Rc<Self>) -> Option<Rc<XSurface>> {
None
}
}
pub struct NoneSurfaceExt;
@ -394,6 +403,22 @@ impl WlSurface {
}
}
fn get_xsurface(self: &Rc<Self>) -> Result<Rc<XSurface>, WlSurfaceError> {
self.set_role(SurfaceRole::XSurface)?;
let mut ext = self.ext.get();
if ext.is_none() {
let xsurface = Rc::new(XSurface {
surface: self.clone(),
xwindow: Default::default(),
tracker: Default::default(),
});
track!(self.client, xsurface);
self.ext.set(xsurface.clone());
ext = xsurface;
}
Ok(ext.into_xsurface().unwrap())
}
pub fn set_output(&self, output: &Rc<OutputNode>) {
let old = self.output.set(output.clone());
if old.id == output.id {