backend: add ButtonState
This commit is contained in:
parent
e22e6680b6
commit
0e1be7544f
17 changed files with 75 additions and 66 deletions
|
|
@ -1,6 +1,6 @@
|
|||
use {
|
||||
crate::{
|
||||
backend::KeyState,
|
||||
backend::ButtonState,
|
||||
cursor::KnownCursor,
|
||||
cursor_user::CursorUser,
|
||||
fixed::Fixed,
|
||||
|
|
@ -1700,11 +1700,11 @@ impl Node for ContainerNode {
|
|||
seat: &Rc<WlSeatGlobal>,
|
||||
time_usec: u64,
|
||||
button: u32,
|
||||
state: KeyState,
|
||||
state: ButtonState,
|
||||
_serial: u64,
|
||||
) {
|
||||
let id = CursorType::Seat(seat.id());
|
||||
self.button(id, seat, time_usec, state == KeyState::Pressed, button);
|
||||
self.button(id, seat, time_usec, state == ButtonState::Pressed, button);
|
||||
}
|
||||
|
||||
fn node_on_axis_event(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, event: &PendingScroll) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use {
|
||||
crate::{
|
||||
backend::KeyState,
|
||||
backend::ButtonState,
|
||||
cursor::KnownCursor,
|
||||
cursor_user::CursorUser,
|
||||
fixed::Fixed,
|
||||
|
|
@ -776,10 +776,10 @@ impl Node for FloatNode {
|
|||
seat: &Rc<WlSeatGlobal>,
|
||||
time_usec: u64,
|
||||
button: u32,
|
||||
state: KeyState,
|
||||
state: ButtonState,
|
||||
_serial: u64,
|
||||
) {
|
||||
if button == BTN_RIGHT && state == KeyState::Pressed {
|
||||
if button == BTN_RIGHT && state == ButtonState::Pressed {
|
||||
self.toggle_pinned();
|
||||
}
|
||||
if button != BTN_LEFT {
|
||||
|
|
@ -790,7 +790,7 @@ impl Node for FloatNode {
|
|||
seat.pointer_cursor(),
|
||||
seat,
|
||||
time_usec,
|
||||
state == KeyState::Pressed,
|
||||
state == ButtonState::Pressed,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
use {
|
||||
crate::{
|
||||
backend::{
|
||||
BackendColorSpace, BackendConnectorState, BackendEotfs, HardwareCursor, KeyState, Mode,
|
||||
BackendColorSpace, BackendConnectorState, BackendEotfs, ButtonState, HardwareCursor,
|
||||
Mode,
|
||||
},
|
||||
client::ClientId,
|
||||
cmm::cmm_description::ColorDescription,
|
||||
|
|
@ -1685,13 +1686,13 @@ impl Node for OutputNode {
|
|||
seat: &Rc<WlSeatGlobal>,
|
||||
_time_usec: u64,
|
||||
button: u32,
|
||||
state: KeyState,
|
||||
state: ButtonState,
|
||||
_serial: u64,
|
||||
) {
|
||||
if button != BTN_LEFT {
|
||||
return;
|
||||
}
|
||||
if state != KeyState::Pressed {
|
||||
if state != ButtonState::Pressed {
|
||||
self.pointer_down.remove(&seat.id());
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue