Fixed cursor drifting bug

remdeskd/mod/remdeshid/remdeshid.go

@@ -67,6 +67,7 @@ func (c *Controller) Connect() error {
 					} else {
 						log.Println(err.Error())
 					}
+					c.readStopChan = nil
 					return
 				}
 				if n > 0 {

remdeskd/www/index.html

@@ -20,6 +20,7 @@
     <button id="startButton">Start</button>
     <button id="stopButton">Stop</button>
     <button id="capture">Capture</button>
+    <button id="screenshot">Win + Shift + S</button>
     <script>
         let socket;
         let protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
@@ -27,7 +28,9 @@
         let socketURL = `${protocol}://${window.location.hostname}:${port}/hid`;
         
         /* Mouse */
-        document.getElementById('capture').addEventListener('click', function() {
+        document.getElementById('capture').addEventListener('click', function(event) {
+            event.preventDefault();
+            event.stopPropagation();
             document.body.requestPointerLock();
             document.addEventListener('mousemove', handleMouseMove);
             document.addEventListener('mousedown', handleMouseDown);
@@ -99,6 +102,26 @@
             document.removeEventListener('keyup', handleKeyUp);
         });
 
+        document.getElementById('screenshot').addEventListener('click', function() {
+            if (socket) {
+                // Send keydown for Shift
+                socket.send(JSON.stringify({ t: 'kw', s: 'kd', d: 'LEFT_Shift' }));
+                // Send keydown for Windows key
+                socket.send(JSON.stringify({ t: 'kw', s: 'kd', d: 'Meta' }));
+                // Send keydown for S
+                socket.send(JSON.stringify({ t: 'kw', s: 'kd', d: 's' }));
+                
+                setTimeout(function() {
+                    // Send keyup for S
+                    socket.send(JSON.stringify({ t: 'kw', s: 'ku', d: 's' }));
+                    // Send keyup for Windows key
+                    socket.send(JSON.stringify({ t: 'kw', s: 'ku', d: 'Meta' }));
+                    // Send keyup for Shift
+                    socket.send(JSON.stringify({ t: 'kw', s: 'ku', d: 'LEFT_Shift' }));
+                }, 1000);
+            }
+        });
+
         function isNumpadEvent(event) {
             return event.location === 3;
         }

usbkvm/usbkvm_fw/keyboard_emu.ino

@@ -6,20 +6,27 @@
   When opr_type is set to 0x01, the sub-handler will process the
   request here.
 
- -- Keyboard Opcode --
+ -- Keyboard opr_type --
+  0x01 = Keyboard Write
+
+ -- Keyboard opr_subtype --
   0x00 = Reserved
   0x01 = keyboard write
+    opr_payload: (ASCII bytes in range of 32 to 127)
   0x02 = keyboard press
+    opr_payload: (ASCII bytes in range of 32 to 127)
   0x03 = keyboard release
-    (ASCII bytes in range of 32 to 127)
+    opr_payload: (ASCII bytes in range of 32 to 127)
 
   0x04 = Modifier key combination press 
+    opr_payload: See usbkvm_fw.h "Modifier Keys IDs" defination
   0x05 = Modifier key combination release 
-    See usbkvm_fw.h Modifier Keys IDs defination
+    opr_payload: See usbkvm_fw.h "Modifier Keys IDs" defination
   
   0x06 = Function key press
+    opr_payload: (key ID same as release)
   0x07 = Function key release
-    (IDs follows USB_HID numbers)
+    opr_payload: IDs follows USB_HID numbers
     0xC2 = KEY_F1
     0xC3 = KEY_F2
     0xC4 = KEY_F3
@@ -31,8 +38,9 @@
     0xFB = KEY_F24
   
   0x08 = Other keys press
+    opr_payload: (key ID same as release)
   0x09 = Other keys release
-    (IDs follows USB_HID numbers)
+    opr_payload: IDs follows USB_HID numbers
     0xDA = KEY_UP_ARROW
     0xD9 = KEY_DOWN_ARROW
     0xD8 = KEY_LEFT_ARROW
@@ -50,13 +58,23 @@
     0xC1 = KEY_CAPS_LOCK
 
   0x0A = Numpad key press
+    opr_payload: See usbkvm_fw.h "Numpad Buttons IDs" defination
   0x0B = Numpad key release
-    See usbkvm_fw.h Numpad Buttons IDs defination
+    opr_payload: See usbkvm_fw.h "Numpad Buttons IDs" defination
+
+  -- Special opr_subtypes --
+  Notes: These special subtypes do not have opr_payload, but you 
+  still need to fill in some value for subtypes as the min opr
+  sequence length is 3. 0x00 will be a good opr_payload placeholder.
 
-  -- Special Opcode --
-  0xFE = Ctrl + Alt + Delete
-  0xFF = Reset all keys state
+  0xF9 = Pause | Break (hardware offload)
+  0xFA = Print Screen (hardware offload)
+  0xFB = Scroll Lock (hardware offload)
+  0xFC = Toggle NumLock (hardware offload)
+  0xFD = Ctrl + Alt + Delete (hardware offload)
+  0xFE = Reset all keys state
 
+  0xFF = Reserved
 */
 
 #include "usbkvm_fw.h"

usbkvm/usbkvm_fw/mouse_emu.ino

@@ -6,7 +6,7 @@
   When opr_type is set to 0x02, the sub-handler will process the
   request here.
 
- -- Mouse Opcode --
+ -- Mouse Write (opr_type = 0x02) --
   0x00 = Reserved
   0x01 = Mouse Click
   0x02 = Mouse Press
@@ -20,6 +20,27 @@
     0x02 = [max, 0] (top right)
     0x03 = [max, max] (bottom right)
   0x05 = Release All Mouse Buttons
+
+-- Mouse Move (opr_type = 0x03) --
+  This operation is a special case that
+  takes an additional 4 payloads
+  byte[0] opr_type (0x03)
+  byte[1] val_x (max 0x7E)
+  byte[2] val_y (max 0x7E)
+  byte[3] signed_x (0x00 = positive, 0x01 = negative)
+  byte[4] signed_y (0x00 = positive, 0x01 = negative)
+
+-- Mouse Scroll (opr_type = 0x04) --
+  This operation is another special case
+  that use opr_subtype field as direction and 
+  opr_payload as tilt value
+  Note: the value is directly written to the USB_HID report
+  the resp is dependent to the OS
+
+  opr_subtype
+  0x00 = positive
+  0x01 = negative
+  opr_value = tilt (max 0x7E) 
 */
 
 #include "usbkvm_fw.h"
@@ -86,6 +107,7 @@ uint8_t mouse_wheel(uint8_t direction, uint8_t utilt) {
 uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
   switch (subtype) {
     case SUBTYPE_MOUSE_CLICK:
+      Mouse_move(0,0);
       if (value == PAYLOAD_MOUSE_BTN_LEFT) {
         Mouse_click(MOUSE_LEFT);
       } else if (value == PAYLOAD_MOUSE_BTN_RIGHT) {
@@ -97,6 +119,7 @@ uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
       }
       return resp_ok;
     case SUBTYPE_MOUSE_PRESS:
+      Mouse_move(0,0);
       if (value == PAYLOAD_MOUSE_BTN_LEFT) {
         Mouse_press(MOUSE_LEFT);
       } else if (value == PAYLOAD_MOUSE_BTN_RIGHT) {
@@ -133,6 +156,7 @@ uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
       } else {
         return resp_invalid_key_value;
       }
+      Mouse_move(0,0);
       return resp_ok;
     case SUBTYPE_MOUSE_RESET:
       Mouse_release(MOUSE_LEFT);

usbkvm/usbkvm_fw/usbkvm_fw.h

@@ -37,7 +37,7 @@
 #define SUBTYPE_KEYBOARD_OTHERKEY_RELEASE 0x09      //Other keys release
 #define SUBTYPE_KEYBOARD_NUMPAD_PRESS 0x0A          //Numpad numeric press
 #define SUBTYPE_KEYBOARD_NUMPAD_RELEASE 0x0B        //Numpad numeric release
-#define SUBTYPE_KEYBOARD_SPECIAL_PAUSE 0xF9         //Pause | Break
+#define SUBTYPE_KEYBOARD_SPECIAL_PAUSE 0xF9         //Pause | Break (hardware offload)
 #define SUBTYPE_KEYBOARD_SPECIAL_PRINT_SCREEN 0xFA  //Print Screen (hardware offload)
 #define SUBTYPE_KEYBOARD_SPECIAL_SCROLL_LOCK 0xFB   //Scroll Lock (hardware offload)
 #define SUBTYPE_KEYBOARD_SPECIAL_NUMLOCK 0xFC       //Toggle NumLock (hardware offload)