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

wire: generate trait for request handling

Browse source
This commit is contained in:
Julian Orth 2024-04-08 17:37:35 +02:00
parent e3a1a0b30f
commit acb391335b
102 changed files with 1632 additions and 2086 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ifs/zwlr_layer_shell_v1.rs
View file

@ -5,7 +5,6 @@ use {
ifs::wl_surface::zwlr_layer_surface_v1::{ZwlrLayerSurfaceV1, ZwlrLayerSurfaceV1Error},
leaks::Tracker,
object::{Object, Version},
utils::buffd::{MsgParser, MsgParserError},
wire::{zwlr_layer_shell_v1::*, ZwlrLayerShellV1Id},
},
std::rc::Rc,
@ -51,18 +50,10 @@ impl ZwlrLayerShellV1Global {
}
}
impl ZwlrLayerShellV1 {
fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), ZwlrLayerSurfaceV1Error> {
let _req: Destroy = self.client.parse(self, parser)?;
self.client.remove_obj(self)?;
Ok(())
}
impl ZwlrLayerShellV1RequestHandler for ZwlrLayerShellV1 {
type Error = ZwlrLayerShellV1Error;
fn get_layer_surface(
self: &Rc<Self>,
parser: MsgParser<'_, '_>,
) -> Result<(), ZwlrLayerShellV1Error> {
let req: GetLayerSurface = self.client.parse(&**self, parser)?;
fn get_layer_surface(&self, req: GetLayerSurface, slf: &Rc<Self>) -> Result<(), Self::Error> {
let surface = self.client.lookup(req.surface)?;
let output = 'get_output: {
if req.output.is_some() {
@ -86,7 +77,7 @@ impl ZwlrLayerShellV1 {
}
let surface = Rc::new(ZwlrLayerSurfaceV1::new(
req.id,
self,
slf,
&surface,
&output,
req.layer,
@ -97,6 +88,11 @@ impl ZwlrLayerShellV1 {
surface.install()?;
Ok(())
}
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.client.remove_obj(self)?;
Ok(())
}
}
global_base!(
@ -123,9 +119,7 @@ simple_add_global!(ZwlrLayerShellV1Global);
object_base! {
self = ZwlrLayerShellV1;
GET_LAYER_SURFACE => get_layer_surface,
DESTROY => destroy if self.version >= 3,
version = self.version;
}
simple_add_obj!(ZwlrLayerShellV1);
@ -134,8 +128,6 @@ impl Object for ZwlrLayerShellV1 {}
#[derive(Debug, Error)]
pub enum ZwlrLayerShellV1Error {
#[error("Parsing failed")]
MsgParserError(#[source] Box<MsgParserError>),
#[error(transparent)]
ClientError(Box<ClientError>),
#[error("Unknown layer {0}")]
@ -146,5 +138,4 @@ pub enum ZwlrLayerShellV1Error {
ZwlrLayerSurfaceV1Error(Box<ZwlrLayerSurfaceV1Error>),
}
efrom!(ZwlrLayerShellV1Error, ClientError);
efrom!(ZwlrLayerShellV1Error, MsgParserError);
efrom!(ZwlrLayerShellV1Error, ZwlrLayerSurfaceV1Error);