Mouse movement works, but has issues with multiple monitors in Host

device

Author: PiterWeb

frontend/src/lib/mouse/mouse_hook.ts

@@ -51,12 +51,12 @@ export function handleMove(callback: mouseHandler) {
     const yAxis = event.pageY;
 		console.log(`Move x:${xAxis}, y:${yAxis}`);
 
-		const buf = new ArrayBuffer(1 + (8 * 8) * 2)
+		const buf = new ArrayBuffer(1 + (2 * 2))
 		const view = new DataView(buf);
 
 		view.setUint8(0, MouseType.Move)
-		view.setBigUint64(1, BigInt(xAxis))
-		view.setBigUint64(2 + 8 * 8, BigInt(yAxis))
+		view.setUint16(1, xAxis)
+		view.setUint16(1 + 2, yAxis)
 
 		return callback(buf);
 	};

src/devices/mouse/handler.go

@@ -12,13 +12,16 @@ import (
 
 var MouseEnabled = new(devices.DeviceEnabled).Disable()
 
-func HandleMouse(d *webrtc.DataChannel) error {
+func HandleMouse(d *webrtc.DataChannel) {
 
 	if d.Label() != "mouse" {
-		return nil
+		return
 	}
 
 	d.OnOpen(func() {
+		
+		robotgo.MouseSleep = 100
+		
 		log.Println("mouse data channel is open")
 	})
 
@@ -61,12 +64,13 @@ func HandleMouse(d *webrtc.DataChannel) error {
 
 			var state string
 
-			if btnState == mouseDown {
+			switch btnState {
+				case mouseDown:
 				state = "down"
-			} else if btnState == mouseUp {
+				case mouseUp:
 				state = "up"
 			}
-			
+						
 			switch clickBtn {
 				case mouseLeft:
 				robotgo.Toggle("left", state)
@@ -78,26 +82,29 @@ func HandleMouse(d *webrtc.DataChannel) error {
 
 		} else if msgType == typeMsgMove { // Handle move event
 
-			// TODO: do some logging to check the values
-			
-			x, err := binary.ReadUvarint(msgBuf)
+			x := make([]byte, 2)
+			_, err := msgBuf.Read(x)
 
 			if err != nil {
 				return
 			}
-			
-			y, err := binary.ReadUvarint(msgBuf)
+						
+			y := make([]byte, 2)
+			_, err = msgBuf.Read(y)
 
 			if err != nil {
 				return
 			}
 
-			robotgo.Move(int(x), int(y))
+			xNum := binary.BigEndian.Uint16(x)
+			yNum := binary.BigEndian.Uint16(y)
+			
+			// log.Printf("Mouse x: %d, y:%d\n", int(xNum), int(yNum))
+			
+			robotgo.Move(int(xNum), int(yNum))
 
 		}
 
 	})
 
-	return nil
-
 }