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

autocommit 2022-01-29 15:55:49 CET

Browse source
This commit is contained in:
Julian Orth 2022-01-29 15:55:49 +01:00
parent 3d7c8ccdbf
commit 11d3604de4
40 changed files with 576 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ifs/wl_seat/mod.rs
View file

@ -7,7 +7,7 @@ use crate::backend::{KeyState, OutputId, ScrollAxis, Seat, SeatEvent};
use crate::client::{Client, ClientId, DynEventFormatter};
use crate::fixed::Fixed;
use crate::globals::{Global, GlobalName};
use crate::ifs::wl_seat::wl_keyboard::{REPEAT_INFO_SINCE, WlKeyboard, WlKeyboardId};
use crate::ifs::wl_seat::wl_keyboard::{WlKeyboard, WlKeyboardId, REPEAT_INFO_SINCE};
use crate::ifs::wl_seat::wl_pointer::{WlPointer, WlPointerId, POINTER_FRAME_SINCE_VERSION};
use crate::ifs::wl_seat::wl_touch::WlTouch;
use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::{XdgToplevel, XdgToplevelId};

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

@ -22,7 +22,7 @@ pub enum WlSeatError {
#[error(transparent)]
ClientError(Box<ClientError>),
}
efrom!(WlSeatError, ClientError, ClientError);
efrom!(WlSeatError, ClientError);
#[derive(Debug, Error)]
pub enum GetPointerError {
@ -31,7 +31,7 @@ pub enum GetPointerError {
#[error(transparent)]
ClientError(Box<ClientError>),
}
efrom!(GetPointerError, ClientError, ClientError);
efrom!(GetPointerError, ClientError);
efrom!(GetPointerError, ParseError, MsgParserError);
#[derive(Debug, Error)]
@ -43,7 +43,7 @@ pub enum GetKeyboardError {
#[error(transparent)]
WlKeyboardError(Box<WlKeyboardError>),
}
efrom!(GetKeyboardError, ClientError, ClientError);
efrom!(GetKeyboardError, ClientError);
efrom!(GetKeyboardError, ParseError, MsgParserError);
efrom!(GetKeyboardError, WlKeyboardError, WlKeyboardError);

4
src/ifs/wl_seat/wl_pointer/types.rs
View file

@ -20,7 +20,7 @@ pub enum WlPointerError {
#[error("Could not process a `release` request")]
ReleaseError(#[from] ReleaseError),
}
efrom!(WlPointerError, ClientError, ClientError);
efrom!(WlPointerError, ClientError);
#[derive(Debug, Error)]
pub enum SetCursorError {
@ -30,7 +30,7 @@ pub enum SetCursorError {
ClientError(Box<ClientError>),
}
efrom!(SetCursorError, ParseError, MsgParserError);
efrom!(SetCursorError, ClientError, ClientError);
efrom!(SetCursorError, ClientError);
#[derive(Debug, Error)]
pub enum ReleaseError {

4
src/ifs/wl_seat/wl_touch/types.rs
View file

@ -10,7 +10,7 @@ pub enum WlTouchError {
#[error("Could not process a `release` request")]
ReleaseError(#[from] ReleaseError),
}
efrom!(WlTouchError, ClientError, ClientError);
efrom!(WlTouchError, ClientError);
#[derive(Debug, Error)]
pub enum ReleaseError {
@ -20,7 +20,7 @@ pub enum ReleaseError {
ClientError(Box<ClientError>),
}
efrom!(ReleaseError, ParseError, MsgParserError);
efrom!(ReleaseError, ClientError, ClientError);
efrom!(ReleaseError, ClientError);
pub(super) struct Release;
impl RequestParser<'_> for Release {