Merge 57fbee1490 into 17baf1647f

README.md

@@ -7,8 +7,6 @@
 
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/jetkvm.svg?style=social&label=Follow%20%40JetKVM)](https://twitter.com/jetkvm)
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/jetkvm/kvm)](https://goreportcard.com/report/github.com/jetkvm/kvm)
-
 </div>
 
 JetKVM is a high-performance, open-source KVM over IP (Keyboard, Video, Mouse) solution designed for efficient remote management of computers, servers, and workstations. Whether you're dealing with boot failures, installing a new operating system, adjusting BIOS settings, or simply taking control of a machine from afar, JetKVM provides the tools to get it done effectively.

internal/usbgadget/hid_mouse_absolute.go

@@ -107,16 +107,24 @@ func (u *UsbGadget) AbsMouseWheelReport(wheelY int8) error {
 	u.absMouseLock.Lock()
 	defer u.absMouseLock.Unlock()
 
-	// Only send a report if the value is non-zero
-	if wheelY == 0 {
+	// Accumulate the wheelY value
+	u.absMouseAccumulatedWheelY += float64(wheelY) / 8.0
+
+	// Only send a report if the accumulated value is significant
+	if abs(u.absMouseAccumulatedWheelY) < 1.0 {
 		return nil
 	}
 
+	scaledWheelY := int8(u.absMouseAccumulatedWheelY)
+
 	err := u.absMouseWriteHidFile([]byte{
-		2,            // Report ID 2
-		byte(wheelY), // Wheel Y (signed)
+		2,                  // Report ID 2
+		byte(scaledWheelY), // Scaled Wheel Y (signed)
 	})
 
+	// Reset the accumulator, keeping any remainder
+	u.absMouseAccumulatedWheelY -= float64(scaledWheelY)
+
 	u.resetUserInputTime()
 	return err
 }

internal/usbgadget/utils.go

@@ -7,6 +7,14 @@ import (
 	"path/filepath"
 )
 
+// Helper function to get absolute value of float64
+func abs(x float64) float64 {
+	if x < 0 {
+		return -x
+	}
+	return x
+}
+
 func joinPath(basePath string, paths []string) string {
 	pathArr := append([]string{basePath}, paths...)
 	return filepath.Join(pathArr...)

ui/src/components/WebRTCVideo.tsx

@@ -259,25 +259,25 @@ export default function WebRTCVideo() {
     (e: WheelEvent) => {
       if (blockWheelEvent) return;
 
-      // Determine if the wheel event is an accel scroll value
-      const isAccel = Math.abs(e.deltaY) >= 100;
+      // Determine if the wheel event is from a trackpad or a mouse wheel
+      const isTrackpad = Math.abs(e.deltaY) < trackpadThreshold;
 
-      // Calculate the accel scroll value
-      const accelScrollValue = e.deltaY / 100;
+      // Apply appropriate sensitivity based on input device
+      const scrollSensitivity = isTrackpad ? trackpadSensitivity : mouseSensitivity;
 
-      // Calculate the no accel scroll value
-      const noAccelScrollValue = e.deltaY > 0 ? 1 : (e.deltaY < 0 ? -1 : 0);
+      // Calculate the scroll value
+      const scroll = e.deltaY * scrollSensitivity;
 
-      // Get scroll value
-      const scrollValue = isAccel ? accelScrollValue : noAccelScrollValue;
+      // Apply clamping
+      const clampedScroll = Math.max(clampMin, Math.min(clampMax, scroll));
 
-      // Apply clamping (i.e. min and max mouse wheel hardware value)
-      const clampedScrollValue = Math.max(-127, Math.min(127, scrollValue));
+      // Round to the nearest integer
+      const roundedScroll = Math.round(clampedScroll);
 
-      // Invert the clamped scroll value to match expected behavior
-      const invertedScrollValue = -clampedScrollValue;
+      // Invert the scroll value to match expected behavior
+      const invertedScroll = -roundedScroll;
 
-      send("wheelReport", { wheelY : invertedScrollValue });
+      send("wheelReport", { wheelY: invertedScroll });
 
       // Apply blocking delay
       setBlockWheelEvent(true);