waydeer/layer-shika
1
0
Fork 0
mirror of https://codeberg.org/waydeer/layer-shika.git synced 2025-10-28 16:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: replace tuple return types with context structs

Browse source
This commit is contained in:
drendog 2025-10-25 16:10:23 +02:00
parent 35f5b1321f
commit 0b964e0a51
Signed by: dwenya
GPG key ID: 8DD77074645332D0
1 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/windowing/mod.rs
View file

@ -40,21 +40,21 @@ mod config;
mod macros; mod macros;
mod state; mod state;
type GlobalObjects = ( pub struct GlobalCtx {
WlCompositor, pub compositor: WlCompositor,
WlOutput, pub output: WlOutput,
ZwlrLayerShellV1, pub layer_shell: ZwlrLayerShellV1,
WlSeat, pub seat: WlSeat,
Option<WpFractionalScaleManagerV1>, pub fractional_scale_manager: Option<WpFractionalScaleManagerV1>,
Option<WpViewporter>, pub viewporter: Option<WpViewporter>,
); }
type SurfaceObjects = ( pub struct SurfaceCtx {
Rc<WlSurface>, pub surface: Rc<WlSurface>,
Rc<ZwlrLayerSurfaceV1>, pub layer_surface: Rc<ZwlrLayerSurfaceV1>,
Option<Rc<WpFractionalScaleV1>>, pub fractional_scale: Option<Rc<WpFractionalScaleV1>>,
Option<Rc<WpViewport>>, pub viewport: Option<Rc<WpViewport>>,
); }
pub struct WindowingSystem { pub struct WindowingSystem {
state: WindowState, state: WindowState,
@ -70,39 +70,39 @@ impl WindowingSystem {
Rc::new(Connection::connect_to_env().map_err(LayerShikaError::WaylandConnection)?); Rc::new(Connection::connect_to_env().map_err(LayerShikaError::WaylandConnection)?);
let event_queue = connection.new_event_queue(); let event_queue = connection.new_event_queue();
let (compositor, output, layer_shell, seat, fractional_scale_manager, viewporter) = let global_ctx = Self::initialize_globals(&connection, &event_queue.handle())
Self::initialize_globals(&connection, &event_queue.handle())
.map_err(|e| LayerShikaError::GlobalInitialization(e.to_string()))?; .map_err(|e| LayerShikaError::GlobalInitialization(e.to_string()))?;
let (surface, layer_surface, fractional_scale, viewport) = Self::setup_surface( let surface_ctx = Self::setup_surface(
&compositor, &global_ctx.compositor,
&output, &global_ctx.output,
&layer_shell, &global_ctx.layer_shell,
fractional_scale_manager.as_ref(), global_ctx.fractional_scale_manager.as_ref(),
viewporter.as_ref(), global_ctx.viewporter.as_ref(),
&event_queue.handle(), &event_queue.handle(),
&config, &config,
); );
let pointer = Rc::new(seat.get_pointer(&event_queue.handle(), ())); let pointer = Rc::new(global_ctx.seat.get_pointer(&event_queue.handle(), ()));
let window = Self::initialize_renderer(&surface, &connection.display(), &config) let window =
Self::initialize_renderer(&surface_ctx.surface, &connection.display(), &config)
.map_err(|e| LayerShikaError::EGLContextCreation(e.to_string()))?; .map_err(|e| LayerShikaError::EGLContextCreation(e.to_string()))?;
let mut builder = WindowStateBuilder::new() let mut builder = WindowStateBuilder::new()
.with_component_definition(config.component_definition) .with_component_definition(config.component_definition)
.with_surface(Rc::clone(&surface)) .with_surface(Rc::clone(&surface_ctx.surface))
.with_layer_surface(Rc::clone(&layer_surface)) .with_layer_surface(Rc::clone(&surface_ctx.layer_surface))
.with_pointer(Rc::clone(&pointer)) .with_pointer(Rc::clone(&pointer))
.with_scale_factor(config.scale_factor) .with_scale_factor(config.scale_factor)
.with_height(config.height) .with_height(config.height)
.with_exclusive_zone(config.exclusive_zone) .with_exclusive_zone(config.exclusive_zone)
.with_window(window); .with_window(window);
if let Some(fs) = fractional_scale { if let Some(fs) = surface_ctx.fractional_scale {
builder = builder.with_fractional_scale(fs); builder = builder.with_fractional_scale(fs);
} }
if let Some(vp) = viewport { if let Some(vp) = surface_ctx.viewport {
builder = builder.with_viewport(vp); builder = builder.with_viewport(vp);
} }
@ -124,7 +124,7 @@ impl WindowingSystem {
fn initialize_globals( fn initialize_globals(
connection: &Connection, connection: &Connection,
queue_handle: &QueueHandle<WindowState>, queue_handle: &QueueHandle<WindowState>,
) -> Result<GlobalObjects> { ) -> Result<GlobalCtx> {
let global_list = registry_queue_init::<WindowState>(connection) let global_list = registry_queue_init::<WindowState>(connection)
.map(|(global_list, _)| global_list) .map(|(global_list, _)| global_list)
.map_err(|e| LayerShikaError::GlobalInitialization(e.to_string()))?; .map_err(|e| LayerShikaError::GlobalInitialization(e.to_string()))?;
@ -154,14 +154,14 @@ impl WindowingSystem {
info!("Viewporter protocol not available"); info!("Viewporter protocol not available");
} }
Ok(( Ok(GlobalCtx {
compositor, compositor,
output, output,
layer_shell, layer_shell,
seat, seat,
fractional_scale_manager, fractional_scale_manager,
viewporter, viewporter,
)) })
} }
fn setup_surface( fn setup_surface(
@ -172,7 +172,7 @@ impl WindowingSystem {
viewporter: Option<&WpViewporter>, viewporter: Option<&WpViewporter>,
queue_handle: &QueueHandle<WindowState>, queue_handle: &QueueHandle<WindowState>,
config: &WindowConfig, config: &WindowConfig,
) -> SurfaceObjects { ) -> SurfaceCtx {
let surface = Rc::new(compositor.create_surface(queue_handle, ())); let surface = Rc::new(compositor.create_surface(queue_handle, ()));
let layer_surface = Rc::new(layer_shell.get_layer_surface( let layer_surface = Rc::new(layer_shell.get_layer_surface(
&surface, &surface,
@ -197,7 +197,12 @@ impl WindowingSystem {
surface.set_buffer_scale(1); surface.set_buffer_scale(1);
(surface, layer_surface, fractional_scale, viewport) SurfaceCtx {
surface,
layer_surface,
fractional_scale,
viewport,
}
} }
fn configure_layer_surface( fn configure_layer_surface(