From 82af4671f090b98a10250232a0a960e2e7ca0aba Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 5 Jul 2026 00:40:04 +0900
Subject: [PATCH] wvr_server: tweak wheel values & cleanup

---
 wayvr/src/backend/wayvr/client.rs | 12 +++++------
 wayvr/src/backend/wayvr/window.rs | 34 -------------------------------
 wayvr/src/overlays/wayvr.rs       |  3 ---
 3 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/wayvr/src/backend/wayvr/client.rs b/wayvr/src/backend/wayvr/client.rs
index 72fd9aa7..61330b90 100644
--- a/wayvr/src/backend/wayvr/client.rs
+++ b/wayvr/src/backend/wayvr/client.rs
@@ -323,9 +323,9 @@ impl WayVRCompositor {
     pub fn send_pointer_axis_wheel(&mut self, delta: super::WheelDelta) {
         let time = super::time::get_millis() as u32;
 
-        let multiplier = 64.0; // stolen from uniput.rs
+        let multiplier = 32.0;
         let delta_x = (delta.x * multiplier) as i32;
-        let delta_y = (delta.y * multiplier) as i32;
+        let delta_y = (-delta.y * multiplier) as i32;
 
         if delta_x == 0 && delta_y == 0 {
             return;
@@ -335,14 +335,14 @@ impl WayVRCompositor {
 
         if delta_x != 0 {
             frame = frame
-                .value(Axis::Horizontal, delta_x as f64 * 15.0)
-                .v120(Axis::Horizontal, delta_x * 120);
+                .value(Axis::Horizontal, delta_x as f64)
+                .v120(Axis::Horizontal, delta_x);
         }
 
         if delta_y != 0 {
             frame = frame
-                .value(Axis::Vertical, delta_y as f64 * 15.0)
-                .v120(Axis::Vertical, delta_y * 120);
+                .value(Axis::Vertical, delta_y as f64)
+                .v120(Axis::Vertical, delta_y);
         }
 
         self.seat_pointer.axis(&mut self.state, frame);
diff --git a/wayvr/src/backend/wayvr/window.rs b/wayvr/src/backend/wayvr/window.rs
index de454370..d6b965f3 100644
--- a/wayvr/src/backend/wayvr/window.rs
+++ b/wayvr/src/backend/wayvr/window.rs
@@ -110,40 +110,6 @@ impl Window {
 
         manager.seat_pointer.frame(&mut manager.state);
     }
-
-    pub(super) fn send_mouse_scroll(manager: &mut WayVRCompositor, delta: WheelDelta) {
-        // workaround: it seems that with one event most applications work fine, but cage doesn't
-        manager.seat_pointer.axis(
-            &mut manager.state,
-            input::pointer::AxisFrame {
-                source: Some(AxisSource::Continuous),
-                relative_direction: (
-                    AxisRelativeDirection::Identical,
-                    AxisRelativeDirection::Identical,
-                ),
-                time: 0,
-                axis: (f64::from(delta.x), 0.0),
-                v120: Some(((delta.x * 64.0) as i32, 0)),
-                stop: (false, false),
-            },
-        );
-
-        manager.seat_pointer.axis(
-            &mut manager.state,
-            input::pointer::AxisFrame {
-                source: Some(AxisSource::Continuous),
-                relative_direction: (
-                    AxisRelativeDirection::Identical,
-                    AxisRelativeDirection::Identical,
-                ),
-                time: 0,
-                axis: (0.0, f64::from(-delta.y)),
-                v120: Some((0, (delta.y * -64.0) as i32)),
-                stop: (false, false),
-            },
-        );
-        manager.seat_pointer.frame(&mut manager.state);
-    }
 }
 
 #[derive(Debug)]
diff --git a/wayvr/src/overlays/wayvr.rs b/wayvr/src/overlays/wayvr.rs
index b13bb6e6..3ce555ba 100644
--- a/wayvr/src/overlays/wayvr.rs
+++ b/wayvr/src/overlays/wayvr.rs
@@ -115,7 +115,6 @@ struct RenderedSurface {
     image: Arc<ImageView>,
     pos: Vec2,
     size: Vec2,
-    dmabuf: bool,
 }
 
 enum WvrHitTarget {
@@ -500,7 +499,6 @@ impl OverlayBackend for WvrWindowBackend {
                             image,
                             pos: vec2(point.x as _, point.y as _),
                             size: vec2(size[0], size[1]),
-                            dmabuf: false,
                         })
                     } else {
                         None
@@ -1004,7 +1002,6 @@ fn collect_rendered_surface_tree(root: &WlSurface) -> Vec<RenderedSurface> {
                     image: surf.image,
                     pos: vec2(pos.x as f32, pos.y as f32),
                     size: vec2(extent[0] / scale, extent[1] / scale),
-                    dmabuf: surf.dmabuf,
                 });
             }
         },