- Rename `CursorMoved` to `PointerMoved`. - Rename `CursorEntered` to `PointerEntered`. - Rename `CursorLeft` to `PointerLeft`. - Rename `MouseInput` to `PointerButton`. - Add `position` to every `PointerEvent`. - Remove `Touch`, which is folded into the `Pointer*` events. - New `PointerType` added to `PointerEntered` and `PointerLeft`, signifying which pointer type is the source of this event. - New `PointerSource` added to `PointerMoved`, similar to `PointerType` but holding additional data. - New `ButtonSource` added to `PointerButton`, similar to `PointerType` but holding pointer type specific buttons. Use `ButtonSource::mouse_button()` to easily normalize any pointer button type to a generic mouse button. - In the same spirit rename `DeviceEvent::MouseMotion` to `PointerMotion`. - Remove `Force::Calibrated::altitude_angle`. Fixes #3833. Fixes #883. Fixes #336. Co-authored-by: Kirill Chibisov <contact@kchibisov.com>
44 lines
1 KiB
Rust
44 lines
1 KiB
Rust
use crate::event::FingerId as RootFingerId;
|
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub struct DeviceId(pub(crate) u32);
|
|
|
|
impl DeviceId {
|
|
pub fn new(pointer_id: i32) -> Option<Self> {
|
|
if let Ok(pointer_id) = u32::try_from(pointer_id) {
|
|
Some(Self(pointer_id))
|
|
} else if pointer_id == -1 {
|
|
None
|
|
} else {
|
|
tracing::error!("found unexpected negative `PointerEvent.pointerId`: {pointer_id}");
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub struct FingerId {
|
|
pointer_id: i32,
|
|
primary: bool,
|
|
}
|
|
|
|
impl FingerId {
|
|
pub fn new(pointer_id: i32, primary: bool) -> Self {
|
|
Self { pointer_id, primary }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub const fn dummy() -> Self {
|
|
Self { pointer_id: -1, primary: false }
|
|
}
|
|
|
|
pub fn is_primary(self) -> bool {
|
|
self.primary
|
|
}
|
|
}
|
|
|
|
impl From<FingerId> for RootFingerId {
|
|
fn from(id: FingerId) -> Self {
|
|
Self(id)
|
|
}
|
|
}
|