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

autocommit 2022-02-06 23:54:46 CET

Browse source
This commit is contained in:
Julian Orth 2022-02-06 23:54:46 +01:00
parent 96038f49bc
commit 7d531257ed
51 changed files with 290 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/error.rs
View file

@ -1,10 +1,10 @@
use crate::client::ClientId;
use crate::object::{Interface, ObjectId};
use crate::utils::buffd::{BufFdError, MsgParserError};
use crate::wire::WlDisplayId;
use crate::AsyncError;
use std::error::Error;
use thiserror::Error;
use crate::wire::WlDisplayId;
#[derive(Debug, Error)]
pub enum ClientError {

10
src/client/mod.rs
View file

@ -3,13 +3,15 @@ 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};
use crate::ifs::wl_registry::WlRegistry;
use crate::object::{Interface, Object, ObjectId, WL_DISPLAY_ID};
use crate::state::State;
use crate::utils::asyncevent::AsyncEvent;
use crate::utils::buffd::{MsgFormatter, MsgParser, MsgParserError, OutBufferSwapchain};
use crate::utils::numcell::NumCell;
use crate::utils::oneshot::{oneshot, OneshotTx};
use crate::utils::queue::AsyncQueue;
use crate::wire::WlRegistryId;
use crate::ErrorFmt;
use ahash::AHashMap;
pub use error::{ClientError, ObjectError};
@ -19,8 +21,6 @@ use std::fmt::{Debug, Display, Formatter};
use std::mem;
use std::rc::Rc;
use uapi::{c, OwnedFd};
use crate::utils::asyncevent::AsyncEvent;
use crate::wire::WlRegistryId;
mod error;
mod objects;
@ -199,7 +199,7 @@ impl Client {
Ok(d) => {
d.send_invalid_request(obj, request);
self.state.clients.shutdown(self.id);
},
}
Err(e) => {
log::error!(
"Could not retrieve display of client {}: {}",
@ -246,7 +246,7 @@ impl Client {
Ok(d) => {
d.send_implementation_error(msg);
self.state.clients.shutdown(self.id);
},
}
Err(e) => {
log::error!(
"Could not retrieve display of client {}: {}",

29
src/client/objects.rs
View file

@ -1,27 +1,28 @@
use crate::client::{Client, ClientError};
use crate::ifs::wl_buffer::{WlBuffer};
use crate::ifs::wl_data_source::{WlDataSource};
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};
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,
};
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;
use crate::object::{Object, ObjectId};
use crate::tree::Node;
use crate::utils::clonecell::CloneCell;
use crate::utils::copyhashmap::CopyHashMap;
use crate::wire::{
WlBufferId, WlDataSourceId, WlRegionId, WlRegistryId, WlSeatId, WlSurfaceId, XdgPositionerId,
XdgSurfaceId, XdgToplevelId, XdgWmBaseId, ZwpPrimarySelectionSourceV1Id,
};
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>>>,

2
src/client/tasks.rs
View file

@ -1,4 +1,3 @@
use std::collections::VecDeque;
use crate::client::{Client, ClientError};
use crate::object::ObjectId;
use crate::utils::buffd::{BufFdIn, BufFdOut, MsgParser};
@ -6,6 +5,7 @@ use crate::utils::oneshot::OneshotRx;
use crate::utils::vec_ext::VecExt;
use crate::ErrorFmt;
use futures::{select, FutureExt};
use std::collections::VecDeque;
use std::mem;
use std::rc::Rc;