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

wayland: use code generation for wl_usr event handlers

Browse source
This commit is contained in:
Julian Orth 2024-07-24 15:56:18 +02:00
parent b359b2648d
commit 084fe50259
49 changed files with 554 additions and 524 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/wl_usr/usr_ifs/usr_wl_display.rs
View file

@ -1,6 +1,6 @@
use {
crate::{
utils::buffd::{MsgParser, MsgParserError},
object::Version,
wire::{wl_display::*, WlDisplayId},
wl_usr::{usr_object::UsrObject, UsrCon},
},
@ -10,16 +10,17 @@ use {
pub struct UsrWlDisplay {
pub id: WlDisplayId,
pub con: Rc<UsrCon>,
pub version: Version,
}
impl UsrWlDisplay {
fn error(&self, parser: MsgParser<'_, '_>) -> Result<(), UsrWlDisplayError> {
let ev: Error = self.con.parse(self, parser)?;
impl WlDisplayEventHandler for UsrWlDisplay {
type Error = UsrWlDisplayError;
fn error(&self, ev: Error<'_>, _slf: &Rc<Self>) -> Result<(), Self::Error> {
Err(UsrWlDisplayError::ServerError(ev.message.to_owned()))
}
fn delete_id(&self, parser: MsgParser<'_, '_>) -> Result<(), UsrWlDisplayError> {
let ev: DeleteId = self.con.parse(self, parser)?;
fn delete_id(&self, ev: DeleteId, _slf: &Rc<Self>) -> Result<(), Self::Error> {
self.con.release_id(ev.id);
Ok(())
}
@ -29,15 +30,11 @@ impl UsrWlDisplay {
pub enum UsrWlDisplayError {
#[error("The server emitted an error: {0}")]
ServerError(String),
#[error(transparent)]
MsgParserError(#[from] MsgParserError),
}
usr_object_base! {
UsrWlDisplay, WlDisplay;
ERROR => error,
DELETE_ID => delete_id,
self = UsrWlDisplay = WlDisplay;
version = self.version;
}
impl UsrObject for UsrWlDisplay {