diff --git a/src/backend.rs b/src/backend.rs
index b618fcbd..30daa384 100644
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -176,7 +176,7 @@ pub enum InputEvent {
state: KeyState,
},
- AxisSmooth {
+ AxisPx {
dist: Fixed,
axis: ScrollAxis,
},
diff --git a/src/backends/metal/input.rs b/src/backends/metal/input.rs
index 86fd82f3..2c30595d 100644
--- a/src/backends/metal/input.rs
+++ b/src/backends/metal/input.rs
@@ -151,7 +151,7 @@ impl MetalBackend {
axis,
}
} else {
- InputEvent::AxisSmooth {
+ InputEvent::AxisPx {
dist: Fixed::from_f64(scroll),
axis,
}
diff --git a/src/ifs/wl_seat/event_handling.rs b/src/ifs/wl_seat/event_handling.rs
index 47c0077a..279f6497 100644
--- a/src/ifs/wl_seat/event_handling.rs
+++ b/src/ifs/wl_seat/event_handling.rs
@@ -195,7 +195,7 @@ impl WlSeatGlobal {
InputEvent::AxisSource { source } => self.pointer_owner.axis_source(source),
InputEvent::Axis120 { dist, axis } => self.pointer_owner.axis_120(dist, axis),
- InputEvent::AxisSmooth { dist, axis } => self.pointer_owner.axis_smooth(dist, axis),
+ InputEvent::AxisPx { dist, axis } => self.pointer_owner.axis_px(dist, axis),
InputEvent::AxisStop { axis } => self.pointer_owner.axis_stop(axis),
InputEvent::AxisFrame { time_usec } => self.pointer_owner.frame(dev, self, time_usec),
}
@@ -564,7 +564,7 @@ impl WlSeatGlobal {
}
let px = (delta as f64 / AXIS_120 as f64) * dev.px_per_scroll_wheel.get();
p.send_axis(time, axis, Fixed::from_f64(px));
- } else if let Some(delta) = event.smooth[i].get() {
+ } else if let Some(delta) = event.px[i].get() {
p.send_axis(time, axis, delta);
}
if p.seat.version >= AXIS_STOP_SINCE_VERSION && event.stop[i].get() {
diff --git a/src/ifs/wl_seat/pointer_owner.rs b/src/ifs/wl_seat/pointer_owner.rs
index fce723e3..0008cbbe 100644
--- a/src/ifs/wl_seat/pointer_owner.rs
+++ b/src/ifs/wl_seat/pointer_owner.rs
@@ -44,8 +44,8 @@ impl PointerOwnerHolder {
self.pending_scroll.v120[axis as usize].set(Some(delta));
}
- pub fn axis_smooth(&self, delta: Fixed, axis: ScrollAxis) {
- self.pending_scroll.smooth[axis as usize].set(Some(delta));
+ pub fn axis_px(&self, delta: Fixed, axis: ScrollAxis) {
+ self.pending_scroll.px[axis as usize].set(Some(delta));
}
pub fn axis_stop(&self, axis: ScrollAxis) {
diff --git a/src/ifs/wl_seat/wl_pointer.rs b/src/ifs/wl_seat/wl_pointer.rs
index ca33efb9..8677602e 100644
--- a/src/ifs/wl_seat/wl_pointer.rs
+++ b/src/ifs/wl_seat/wl_pointer.rs
@@ -38,7 +38,7 @@ pub const AXIS_VALUE120_SINCE_VERSION: u32 = 8;
#[derive(Default, Debug)]
pub struct PendingScroll {
pub v120: [Cell