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

autocommit 2022-01-04 15:30:21 CET

Browse source
This commit is contained in:
Julian Orth 2022-01-04 15:30:21 +01:00
parent 30376c595c
commit cbbc41a463
40 changed files with 725 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ifs/wl_shm/mod.rs
View file

@ -12,13 +12,15 @@ const CREATE_POOL: u32 = 0;
const FORMAT: u32 = 0;
id!(WlShmId);
pub struct WlShmGlobal {
name: GlobalName,
}
pub struct WlShmObj {
global: Rc<WlShmGlobal>,
id: ObjectId,
id: WlShmId,
client: Rc<Client>,
}
@ -29,7 +31,7 @@ impl WlShmGlobal {
async fn bind_(
self: Rc<Self>,
id: ObjectId,
id: WlShmId,
client: &Rc<Client>,
_version: u32,
) -> Result<(), WlShmError> {
@ -104,7 +106,7 @@ handle_request!(WlShmObj);
impl Object for WlShmObj {
fn id(&self) -> ObjectId {
self.id
self.id.into()
}
fn interface(&self) -> Interface {

6
src/ifs/wl_shm/types.rs
View file

@ -1,8 +1,8 @@
use crate::client::{ClientError, EventFormatter, RequestParser};
use crate::format::Format;
use crate::ifs::wl_shm::{WlShmObj, FORMAT};
use crate::ifs::wl_shm_pool::WlShmPoolError;
use crate::object::{Object, ObjectId};
use crate::ifs::wl_shm_pool::{WlShmPoolError, WlShmPoolId};
use crate::object::Object;
use crate::utils::buffd::{MsgFormatter, MsgParser, MsgParserError};
use std::fmt::{Debug, Formatter};
use std::rc::Rc;
@ -34,7 +34,7 @@ efrom!(CreatePoolError, WlShmPoolError, WlShmPoolError);
efrom!(CreatePoolError, ClientError, ClientError);
pub(super) struct CreatePool {
pub id: ObjectId,
pub id: WlShmPoolId,
pub fd: OwnedFd,
pub size: i32,
}