kossLAN/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

4
src/ifs/wl_seat/handling.rs
View file

@ -1,5 +1,5 @@
use crate::backend::{KeyState, OutputId, ScrollAxis, SeatEvent, SeatId};
use crate::client::{ClientId};
use crate::client::ClientId;
use crate::fixed::Fixed;
use crate::ifs::wl_data_device::WlDataDevice;
use crate::ifs::wl_seat::wl_keyboard::WlKeyboard;
@ -14,10 +14,10 @@ use crate::ifs::wl_surface::WlSurface;
use crate::ifs::zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1;
use crate::tree::{FloatNode, FoundNode, Node};
use crate::utils::smallmap::SmallMap;
use crate::wire::{WlDataOfferId, ZwpPrimarySelectionOfferV1Id};
use crate::xkbcommon::{ModifierState, XKB_KEY_DOWN, XKB_KEY_UP};
use std::ops::{Deref, DerefMut};
use std::rc::Rc;
use crate::wire::{WlDataOfferId, ZwpPrimarySelectionOfferV1Id};
#[derive(Default)]
pub struct NodeSeatState {

16
src/ifs/wl_seat/wl_keyboard.rs
View file

@ -1,14 +1,13 @@
use crate::client::{ClientError};
use crate::client::ClientError;
use crate::ifs::wl_seat::WlSeat;
use crate::object::Object;
use crate::utils::buffd::MsgParser;
use crate::utils::buffd::MsgParserError;
use crate::wire::wl_keyboard::*;
use crate::wire::{WlKeyboardId, WlSurfaceId};
use std::rc::Rc;
use thiserror::Error;
use uapi::{c, Errno, OwnedFd};
use crate::wire::wl_keyboard::*;
use crate::utils::buffd::MsgParserError;
use crate::wire::{WlKeyboardId, WlSurfaceId};
pub const REPEAT_INFO_SINCE: u32 = 4;
@ -71,12 +70,7 @@ impl WlKeyboard {
})
}
pub fn send_enter(
self: &Rc<Self>,
serial: u32,
surface: WlSurfaceId,
keys: &[u32],
) {
pub fn send_enter(self: &Rc<Self>, serial: u32, surface: WlSurfaceId, keys: &[u32]) {
self.seat.client.event(Enter {
self_id: self.id,
serial,

27
src/ifs/wl_seat/wl_pointer.rs
View file

@ -1,16 +1,15 @@
use crate::client::{ClientError};
use crate::client::ClientError;
use crate::cursor::Cursor;
use crate::fixed::Fixed;
use crate::ifs::wl_seat::WlSeat;
use crate::ifs::wl_surface::WlSurfaceError;
use crate::object::Object;
use crate::utils::buffd::MsgParser;
use crate::utils::buffd::MsgParserError;
use crate::wire::wl_pointer::*;
use crate::wire::{WlPointerId, WlSurfaceId};
use std::rc::Rc;
use thiserror::Error;
use crate::ifs::wl_surface::WlSurfaceError;
use crate::wire::wl_pointer::*;
use crate::utils::buffd::MsgParserError;
use crate::wire::{WlPointerId, WlSurfaceId};
#[allow(dead_code)]
const ROLE: u32 = 0;
@ -45,13 +44,7 @@ impl WlPointer {
}
}
pub fn send_enter(
&self,
serial: u32,
surface: WlSurfaceId,
x: Fixed,
y: Fixed,
) {
pub fn send_enter(&self, serial: u32, surface: WlSurfaceId, x: Fixed, y: Fixed) {
self.seat.client.event(Enter {
self_id: self.id,
serial,
@ -78,13 +71,7 @@ impl WlPointer {
})
}
pub fn send_button(
&self,
serial: u32,
time: u32,
button: u32,
state: u32,
) {
pub fn send_button(&self, serial: u32, time: u32, button: u32, state: u32) {
self.seat.client.event(Button {
self_id: self.id,
serial,

9
src/ifs/wl_seat/wl_touch.rs
View file

@ -1,13 +1,12 @@
use crate::client::ClientError;
use crate::ifs::wl_seat::WlSeat;
use crate::object::Object;
use crate::utils::buffd::MsgParser;
use crate::utils::buffd::MsgParserError;
use crate::wire::wl_touch::*;
use crate::wire::WlTouchId;
use std::rc::Rc;
use thiserror::Error;
use crate::client::ClientError;
use crate::wire::wl_touch::*;
use crate::utils::buffd::MsgParserError;
use crate::wire::WlTouchId;
#[allow(dead_code)]
const DOWN: u32 = 0;