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

feat(wayland): proper surface geometry

Browse Source
This commit is contained in:
Nova
2023-01-04 07:25:33 -05:00
parent 1f745fddde
commit 2ce9bf8cd4
3 changed files with 101 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/wayland/panel_item.rs
View File

@@ -457,7 +457,7 @@ impl PanelItem {
fn keyboard_activate_flex(node: &Node, keymap: &Keymap) -> Result<()> {
let Some(panel_item) = PanelItem::from_node(node) else { return Ok(()) };
let Some(core_surface) = panel_item.core_surface() else { return Ok(()) };
let Some(wl_surface) = core_surface.wl_surface() else { return Ok(()) };
let Some(wl_surface) = panel_item.toplevel_wl_surface() else { return Ok(()) };
let Some(keyboard) = panel_item.seat_data.keyboard() else { return Ok(()) };
let mut keyboard_info = panel_item.seat_data.keyboard_info.lock();
@@ -467,6 +467,7 @@ impl PanelItem {
}
keyboard_info.replace(KeyboardInfo::new(keymap));
keyboard_info.as_ref().unwrap().keymap.send(keyboard)?;
core_surface.flush_clients();
Ok(())
}
@@ -478,13 +479,14 @@ impl PanelItem {
) -> Result<()> {
let Some(panel_item) = PanelItem::from_node(node) else { return Ok(()) };
let Some(core_surface) = panel_item.core_surface() else { return Ok(()) };
let Some(wl_surface) = core_surface.wl_surface() else { return Ok(()) };
let Some(wl_surface) = panel_item.toplevel_wl_surface() else { return Ok(()) };
let Some(keyboard) = panel_item.seat_data.keyboard() else { return Ok(()) };
let mut keyboard_info = panel_item.seat_data.keyboard_info.lock();
if keyboard_info.is_some() {
keyboard.leave(SERIAL_COUNTER.inc(), &wl_surface);
*keyboard_info = None;
core_surface.flush_clients();
}
Ok(())
@@ -496,12 +498,14 @@ impl PanelItem {
data: &[u8],
) -> Result<()> {
let Some(panel_item) = PanelItem::from_node(node) else { return Ok(()) };
let Some(core_surface) = panel_item.core_surface() else { return Ok(()) };
let Some(keyboard) = panel_item.seat_data.keyboard() else { return Ok(()) };
let mut keyboard_info = panel_item.seat_data.keyboard_info.lock();
if let Some(keyboard_info) = &mut *keyboard_info {
let (key, state): (u32, u32) = deserialize(data)?;
keyboard_info.process(key, state, keyboard)?;
core_surface.flush_clients();
}
Ok(())
@@ -513,6 +517,7 @@ impl PanelItem {
data: &[u8],
) -> Result<()> {
let Some(panel_item) = PanelItem::from_node(node) else { return Ok(()) };
let Some(core_surface) = panel_item.core_surface() else { return Ok(()) };
let Ok(xdg_toplevel) = panel_item.toplevel.upgrade() else { return Ok(()) };
let Some(xdg_surface) = panel_item.toplevel_surface_data().and_then(|d| d.xdg_surface.upgrade().ok()) else { return Ok(()) };
@@ -535,6 +540,7 @@ impl PanelItem {
let size = info.size.unwrap_or(Vector2::from([0; 2]));
xdg_toplevel.configure(size.x as i32, size.y as i32, info.states);
xdg_surface.configure(SERIAL_COUNTER.inc());
core_surface.flush_clients();
Ok(())
}
@@ -545,11 +551,13 @@ impl PanelItem {
data: &[u8],
) -> Result<()> {
let Some(panel_item) = PanelItem::from_node(node) else { return Ok(()) };
let Some(core_surface) = panel_item.core_surface() else { return Ok(()) };
let Ok(xdg_toplevel) = panel_item.toplevel.upgrade() else { return Ok(()) };
let Some(xdg_surface) = panel_item.toplevel_surface_data().and_then(|d| d.xdg_surface.upgrade().ok()) else { return Ok(()) };
xdg_toplevel.wm_capabilities(deserialize(data)?);
xdg_surface.configure(SERIAL_COUNTER.inc());
core_surface.flush_clients();
Ok(())
}
@@ -563,12 +571,17 @@ impl PanelItem {
let queued_state = state.queued_state.as_mut().unwrap();
queued_state.mapped = mapped;
if mapped {
queued_state.size = surface_data.size.lock().unwrap_or_else(|| {
self.core_surface()
.unwrap()
.with_data(|data| Vector2::from([data.size.x / 2, data.size.y / 2]))
.unwrap()
});
queued_state.size = surface_data
.geometry
.lock()
.as_ref()
.map(|geo| geo.size)
.unwrap_or_else(|| {
self.core_surface()
.unwrap()
.with_data(|data| Vector2::from([data.size.x / 2, data.size.y / 2]))
.unwrap()
});
}
}

97
src/wayland/surface.rs
View File

@@ -3,6 +3,7 @@ use crate::{
core::{delta::Delta, destroy_queue, registry::Registry},
nodes::drawable::model::Model,
};
use glam::vec2;
use mint::Vector2;
use once_cell::sync::OnceCell;
use parking_lot::Mutex;
@@ -34,6 +35,20 @@ use stereokit::{
pub static CORE_SURFACES: Registry<CoreSurface> = Registry::new();
#[derive(Debug, Clone, Copy)]
pub struct SurfaceGeometry {
pub origin: Vector2<u32>,
pub size: Vector2<u32>,
}
impl Default for SurfaceGeometry {
fn default() -> Self {
Self {
origin: [0; 2].into(),
size: [0; 2].into(),
}
}
}
pub struct CoreSurfaceData {
wl_tex: Option<SendWrapper<Gles2Texture>>,
pub size: Vector2<u32>,
@@ -52,6 +67,7 @@ pub struct CoreSurface {
sk_tex: OnceCell<SendWrapper<SKTexture>>,
sk_mat: OnceCell<Arc<SendWrapper<Material>>>,
material_offset: Mutex<Delta<u32>>,
geometry: Mutex<Delta<SurfaceGeometry>>,
pub pending_material_applications: Mutex<Vec<(Arc<Model>, u32)>>,
}
@@ -71,6 +87,10 @@ impl CoreSurface {
sk_tex: OnceCell::new(),
sk_mat: OnceCell::new(),
material_offset: Mutex::new(Delta::new(0)),
geometry: Mutex::new(Delta::new(SurfaceGeometry {
origin: [0; 2].into(),
size: [0; 2].into(),
})),
pending_material_applications: Mutex::new(Vec::new()),
})
});
@@ -125,41 +145,48 @@ impl CoreSurface {
let mut mapped_data = self.mapped_data.lock();
self.with_states(|data| {
let just_mapped = mapped_data.is_none();
if just_mapped {
let smithay_tex = data
.data_map
.get::<RendererSurfaceStateUserData>()
.unwrap()
.borrow()
.texture::<Gles2Renderer>(renderer.id())
.unwrap()
.clone();
// let just_mapped = mapped_data.is_none();
// if just_mapped {
let smithay_tex = data
.data_map
.get::<RendererSurfaceStateUserData>()
.unwrap()
.borrow()
.texture::<Gles2Renderer>(renderer.id())
.unwrap()
.clone();
let sk_tex = self.sk_tex.get().unwrap();
let sk_mat = self.sk_mat.get().unwrap();
unsafe {
sk_tex.set_native(
smithay_tex.tex_id() as usize,
smithay::backend::renderer::gles2::ffi::RGBA8.into(),
TextureType::ImageNoMips,
smithay_tex.width(),
smithay_tex.height(),
false,
);
sk_tex.set_sample(TextureSample::Point);
sk_tex.set_address_mode(TextureAddress::Clamp);
}
if let Some(material_offset) = self.material_offset.lock().delta() {
sk_mat.set_queue_offset(*material_offset as i32);
}
let new_mapped_data = CoreSurfaceData {
size: Vector2::from([smithay_tex.width(), smithay_tex.height()]),
wl_tex: Some(SendWrapper::new(smithay_tex)),
};
*mapped_data = Some(new_mapped_data);
let sk_tex = self.sk_tex.get().unwrap();
let sk_mat = self.sk_mat.get().unwrap();
unsafe {
sk_tex.set_native(
smithay_tex.tex_id() as usize,
smithay::backend::renderer::gles2::ffi::RGBA8.into(),
TextureType::ImageNoMips,
smithay_tex.width(),
smithay_tex.height(),
false,
);
sk_tex.set_sample(TextureSample::Point);
sk_tex.set_address_mode(TextureAddress::Clamp);
}
if let Some(material_offset) = self.material_offset.lock().delta() {
sk_mat.set_queue_offset(*material_offset as i32);
}
if let Some(geometry) = self.geometry.lock().delta() {
let tex_size = vec2(smithay_tex.width() as f32, smithay_tex.height() as f32);
let geometry_origin = vec2(geometry.origin.x as f32, geometry.origin.y as f32);
let geometry_size = vec2(geometry.size.x as f32, geometry.size.y as f32);
sk_mat.set_parameter("uv_offset", &Vector2::from(geometry_origin / tex_size));
sk_mat.set_parameter("uv_scale", &Vector2::from(geometry_size / tex_size));
}
let new_mapped_data = CoreSurfaceData {
size: Vector2::from([smithay_tex.width(), smithay_tex.height()]),
wl_tex: Some(SendWrapper::new(smithay_tex)),
};
*mapped_data = Some(new_mapped_data);
// }
});
self.apply_surface_materials();
@@ -180,6 +207,10 @@ impl CoreSurface {
*self.material_offset.lock().value_mut() = material_offset;
}
pub fn set_geometry(&self, geometry: SurfaceGeometry) {
*self.geometry.lock().value_mut() = geometry;
}
pub fn apply_material(&self, model: Arc<Model>, material_idx: u32) {
self.pending_material_applications
.lock()

21
src/wayland/xdg_shell.rs
View File

@@ -3,6 +3,7 @@ use std::sync::Arc;
use super::{
panel_item::{PanelItem, RecommendedState, ToplevelState},
state::WaylandState,
surface::{CoreSurface, SurfaceGeometry},
SERIAL_COUNTER,
};
use mint::Vector2;
@@ -84,7 +85,7 @@ impl GlobalDispatch<XdgWmBase, (), WaylandState> for WaylandState {
#[derive(Debug)]
pub struct WaylandSurface {
wl_surface: Weak<WlSurface>,
size: Arc<Mutex<Option<Vector2<u32>>>>,
geometry: Arc<Mutex<Option<SurfaceGeometry>>>,
}
impl Dispatch<XdgWmBase, (), WaylandState> for WaylandState {
@@ -106,7 +107,7 @@ impl Dispatch<XdgWmBase, (), WaylandState> for WaylandState {
id,
WaylandSurface {
wl_surface: surface.downgrade(),
size: Arc::new(Mutex::new(None)),
geometry: Arc::new(Mutex::new(None)),
},
);
}
@@ -211,7 +212,7 @@ impl Dispatch<XdgPositioner, Arc<Mutex<PositionerData>>, WaylandState> for Wayla
pub struct XdgSurfaceData {
pub wl_surface: Weak<WlSurface>,
pub xdg_surface: Weak<XdgSurface>,
pub size: Arc<Mutex<Option<Vector2<u32>>>>,
pub geometry: Arc<Mutex<Option<SurfaceGeometry>>>,
}
impl Dispatch<XdgSurface, WaylandSurface, WaylandState> for WaylandState {
fn request(
@@ -236,7 +237,7 @@ impl Dispatch<XdgSurface, WaylandSurface, WaylandState> for WaylandState {
xdg_surface_data: XdgSurfaceData {
wl_surface: data.wl_surface.clone(),
xdg_surface: xdg_surface.downgrade(),
size: data.size.clone(),
geometry: data.geometry.clone(),
},
},
);
@@ -270,7 +271,17 @@ impl Dispatch<XdgSurface, WaylandSurface, WaylandState> for WaylandState {
width,
height,
} => {
*data.size.lock() = Some(Vector2::from([width as u32, height as u32]));
let geometry = SurfaceGeometry {
origin: [x as u32, y as u32].into(),
size: [width as u32, height as u32].into(),
};
*data.geometry.lock() = Some(geometry);
let Ok(wl_surface) = data.wl_surface.upgrade() else { return; };
compositor::with_states(&wl_surface, |data| {
if let Some(core_surface) = data.data_map.get::<CoreSurface>() {
core_surface.set_geometry(geometry);
}
});
}
xdg_surface::Request::AckConfigure { serial: _ } => (),
xdg_surface::Request::Destroy => (),