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

autocommit 2022-02-06 16:33:54 CET

Browse source
This commit is contained in:
Julian Orth 2022-02-06 16:33:54 +01:00
parent c92346324b
commit dc2cb71012
104 changed files with 2563 additions and 4617 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client/error.rs
View file

@ -4,6 +4,7 @@ use crate::utils::buffd::{BufFdError, MsgParserError};
use crate::AsyncError;
use std::error::Error;
use thiserror::Error;
use crate::wire::WlDisplayId;
#[derive(Debug, Error)]
pub enum ClientError {
@ -36,7 +37,7 @@ pub enum ClientError {
#[error("The client object id is out of bounds")]
ClientIdOutOfBounds,
#[error("Object {0} is not a display")]
NotADisplay(ObjectId),
NotADisplay(WlDisplayId),
#[error(transparent)]
ObjectError(ObjectError),
#[error(transparent)]

11
src/client/mod.rs
View file

@ -3,7 +3,7 @@ use crate::client::error::LookupError;
use crate::client::objects::Objects;
use crate::ifs::wl_callback::WlCallback;
use crate::ifs::wl_display::WlDisplay;
use crate::ifs::wl_registry::{WlRegistry, WlRegistryId};
use crate::ifs::wl_registry::{WlRegistry};
use crate::object::{Interface, Object, ObjectId, WL_DISPLAY_ID};
use crate::state::State;
use crate::utils::buffd::{MsgFormatter, MsgParser, MsgParserError};
@ -19,6 +19,7 @@ use std::fmt::{Debug, Display, Formatter};
use std::mem;
use std::rc::Rc;
use uapi::{c, OwnedFd};
use crate::wire::WlRegistryId;
mod error;
mod objects;
@ -307,15 +308,11 @@ impl Client {
}
pub fn log_event(&self, event: &dyn EventFormatter) {
if !event.should_log() {
return;
}
let obj = event.obj();
log::trace!(
"Client {} <= {}@{}.{:?}",
self.id,
obj.interface().name(),
obj.id(),
event.interface().name(),
event.id(),
event,
);
}

23
src/client/objects.rs
View file

@ -1,17 +1,17 @@
use crate::client::{Client, ClientError};
use crate::ifs::wl_buffer::{WlBuffer, WlBufferId};
use crate::ifs::wl_data_source::{WlDataSource, WlDataSourceId};
use crate::ifs::wl_buffer::{WlBuffer};
use crate::ifs::wl_data_source::{WlDataSource};
use crate::ifs::wl_display::WlDisplay;
use crate::ifs::wl_region::{WlRegion, WlRegionId};
use crate::ifs::wl_registry::{WlRegistry, WlRegistryId};
use crate::ifs::wl_seat::{WlSeat, WlSeatId};
use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::{XdgToplevel, XdgToplevelId};
use crate::ifs::wl_surface::xdg_surface::{XdgSurface, XdgSurfaceId};
use crate::ifs::wl_surface::{WlSurface, WlSurfaceId};
use crate::ifs::xdg_positioner::{XdgPositioner, XdgPositionerId};
use crate::ifs::xdg_wm_base::{XdgWmBase, XdgWmBaseId};
use crate::ifs::wl_region::{WlRegion};
use crate::ifs::wl_registry::{WlRegistry};
use crate::ifs::wl_seat::{WlSeat};
use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::{XdgToplevel};
use crate::ifs::wl_surface::xdg_surface::{XdgSurface};
use crate::ifs::wl_surface::{WlSurface};
use crate::ifs::xdg_positioner::{XdgPositioner};
use crate::ifs::xdg_wm_base::{XdgWmBase};
use crate::ifs::zwp_primary_selection_source_v1::{
ZwpPrimarySelectionSourceV1, ZwpPrimarySelectionSourceV1Id,
ZwpPrimarySelectionSourceV1,
};
use crate::object::{Object, ObjectId};
use crate::tree::Node;
@ -21,6 +21,7 @@ use ahash::AHashMap;
use std::cell::{RefCell, RefMut};
use std::mem;
use std::rc::Rc;
use crate::wire::{WlBufferId, WlDataSourceId, WlRegionId, WlRegistryId, WlSeatId, WlSurfaceId, XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId, ZwpPrimarySelectionSourceV1Id};
pub struct Objects {
pub display: CloneCell<Option<Rc<WlDisplay>>>,