gadget_disable.sh

@@ -9,6 +9,7 @@ echo "" > UDC
 echo "Clean up configs"
 rm configs/c.1/hid.kbd0
 rm configs/c.1/hid.mouse0
+rm configs/c.1/hid.mouse1
 rm configs/c.1/mass_storage.disk1
 rm configs/c.1/mass_storage.cdrom1
 
@@ -18,6 +19,7 @@ rmdir configs/c.1
 echo "Clean up functions"
 rmdir functions/hid.kbd0
 rmdir functions/hid.mouse0
+rmdir functions/hid.mouse1
 rmdir functions/mass_storage.disk1
 rmdir functions/mass_storage.cdrom1
 

gadget_enable.sh

@@ -5,19 +5,7 @@ gserial=$(awk '/Serial/ { print $3 }' /proc/cpuinfo)
 gmanufacturer="Petrkr.NET"
 gproduct="rPi KVM"
 
-KEYBOARD=""
+#Mouse 0 relative descriptor
-KEYBOARD="$KEYBOARD\\x05\\x01\\x09\\x06" # Usage generic desktop, Usage keyboard
-KEYBOARD="$KEYBOARD\\xa1\\x01\\x05\\x07" # Collection App, Use page Keyboard
-KEYBOARD="$KEYBOARD\\x19\\xe0\\x29\\xe7\\x15\\x00\\x25\\x01\\x75\\x01\\x95\\x08" # Usage min (LeftControl) max (Right GUI), log min 0 log min 1, report size 1 count 8
-KEYBOARD="$KEYBOARD\\x81\\x02" # Input data, variable, absolute
-KEYBOARD="$KEYBOARD\\x75\\x08\\x95\\x01" # Report size 8, count 1
-KEYBOARD="$KEYBOARD\\x81\\x03" # Input Const, variable, absolute
-KEYBOARD="$KEYBOARD\\x75\\x01\\x95\\x05" # Report size 1 count 5
-KEYBOARD="$KEYBOARD\\x05\\x08\\x19\\x01\\x29\\x05\\x91\\x02\\x95\\x01\\x75\\x03\\x91\\x03\\x95\\x06\\x75\\x08\\x15\\x00\\x25\\xff\\x05\\x07\\x19\\x00\\x29\\x65"
-KEYBOARD="$KEYBOARD\\x81\\x00" # Input data array absolute
-KEYBOARD="$KEYBOARD\\xc0" # End Collection Application
-
-#Mouse absolute descriptor
 MOUSE0=""
 MOUSE0="$MOUSE0\\x05\\x01\\x09\\x02" # Usage generic desktop, Usage mouse
 MOUSE0="$MOUSE0\\xa1\\x01\\x09\\x01" # Collection App, Usage Pointer
@@ -26,17 +14,31 @@ MOUSE0="$MOUSE0\\x05\\x09" # Use Page buttons
 MOUSE0="$MOUSE0\\x19\\x01\\x29\\x08\\x15\\x00\\x25\\x01\\x75\\x01\\x95\\x08" # Usage min 1, max 8, logical min 0, max 1, report 8, size 1
 MOUSE0="$MOUSE0\\x81\\x02" # Input data, variable, absolute
 MOUSE0="$MOUSE0\\x05\\x01" # Usage page generic desktop
-MOUSE0="$MOUSE0\\x09\\x30\\x35\\x00\\x46\\x80\\x07\\x15\\x00\\x26\\x80\\x07\\x75\\x10\\x95\\x01" # Usage X, Log min 0, log max 1920, size 16, report 1
+MOUSE0="$MOUSE0\\x09\\x30\\x09\\x31\\x09\\x38\\x15\\x81\\x25\\x7f\\x75\\x08\\x95\\x03" # Usage X,Y,Wheel, Log min -127, log max 127, size 8, report 3
 MOUSE0="$MOUSE0\\x81\\x02" # Input data, variable, absolute
-MOUSE0="$MOUSE0\\x05\\x01" # Usage page generic desktop
-MOUSE0="$MOUSE0\\x09\\x31\\x35\\x00\\x46\\x38\\x04\\x15\\x00\\x26\\x38\\x04\\x75\\x10\\x95\\x01" # Usage Y, Log min 0, log max 1080, size 16, report 1
-MOUSE0="$MOUSE0\\x81\\x02" # Input data, variable, absolute
-MOUSE0="$MOUSE0\\x05\\x01" # Usage page generic desktop
-MOUSE0="$MOUSE0\\x09\\x38\\x35\\x00\\x45\\x00\\x15\\x81\\x25\\x7f\\x75\\x08\\x95\\x01" # Usage Wheel, log min -127, max 127, size 8, report 1
-MOUSE0="$MOUSE0\\x81\\x06" # Input data, variable, relative
 MOUSE0="$MOUSE0\\xc0" # End collection Physical
 MOUSE0="$MOUSE0\\xc0" # End collection Application
 
+#Mouse 1 absolute descriptor
+MOUSE1=""
+MOUSE1="$MOUSE1\\x05\\x01\\x09\\x02" # Usage generic desktop, Usage mouse
+MOUSE1="$MOUSE1\\xa1\\x01\\x09\\x01" # Collection App, Usage Pointer
+MOUSE1="$MOUSE1\\xa1\\x00" # Collection Physical
+MOUSE1="$MOUSE1\\x05\\x09" # Use Page buttons
+MOUSE1="$MOUSE1\\x19\\x01\\x29\\x08\\x15\\x00\\x25\\x01\\x75\\x01\\x95\\x08" # Usage min 1, max 8, logical min 0, max 1, report 8, size 1
+MOUSE1="$MOUSE1\\x81\\x02" # Input data, variable, absolute
+MOUSE1="$MOUSE1\\x05\\x01" # Usage page generic desktop
+MOUSE1="$MOUSE1\\x09\\x30\\x16\\x00\\x00\\x26\\x80\\x07\\x75\\x10\\x95\\x01" # Usage X, Log min 0, log max 1920, size 16, report 1
+MOUSE1="$MOUSE1\\x81\\x02" # Input data, variable, absolute
+MOUSE1="$MOUSE1\\x05\\x01" # Usage page generic desktop
+MOUSE1="$MOUSE1\\x09\\x31\\x16\\x00\\x00\\x26\\x38\\x04\\x75\\x10\\x95\\x01" # Usage Y, Log min 0, log max 1080, size 16, report 1
+MOUSE1="$MOUSE1\\x81\\x02" # Input data, variable, absolute
+MOUSE1="$MOUSE1\\x05\\x01" # Usage page generic desktop
+MOUSE1="$MOUSE1\\x09\\x38\\x15\\x81\\x25\\x7f\\x75\\x08\\x95\\x01" # Usage Wheel, log min -127, max 127, size 8, report 1
+MOUSE1="$MOUSE1\\x81\\x06" # Input data, variable, relative
+MOUSE1="$MOUSE1\\xc0" # End collection Physical
+MOUSE1="$MOUSE1\\xc0" # End collection Application
+
 cd /sys/kernel/config/usb_gadget/
 mkdir -p $gname
 cd $gname
@@ -64,30 +66,36 @@ mkdir -p functions/hid.kbd0
 echo 1 > functions/hid.kbd0/protocol
 echo 1 > functions/hid.kbd0/subclass
 echo 8 > functions/hid.kbd0/report_length
-echo -ne $KEYBOARD > functions/hid.kbd0/report_desc
+echo -ne \\x05\\x01\\x09\\x06\\xa1\\x01\\x05\\x07\\x19\\xe0\\x29\\xe7\\x15\\x00\\x25\\x01\\x75\\x01\\x95\\x08\\x81\\x02\\x95\\x01\\x75\\x08\\x81\\x03\\x95\\x05\\x75\\x01\\x05\\x08\\x19\\x01\\x29\\x05\\x91\\x02\\x95\\x01\\x75\\x03\\x91\\x03\\x95\\x06\\x75\\x08\\x15\\x00\\x25\\xff\\x05\\x07\\x19\\x00\\x29\\x65\\x81\\x00\\xc0 > functions/hid.kbd0/report_desc
 
-echo "  HID Mouse"
+echo "  HID Mouse Relative"
 mkdir -p functions/hid.mouse0
 echo 2 > functions/hid.mouse0/protocol
 echo 1 > functions/hid.mouse0/subclass
 echo 8 > functions/hid.mouse0/report_length
 echo -ne $MOUSE0 > functions/hid.mouse0/report_desc
 
+echo "  HID Mouse Absolute"
+mkdir -p functions/hid.mouse1
+echo 2 > functions/hid.mouse1/protocol
+echo 1 > functions/hid.mouse1/subclass
+echo 8 > functions/hid.mouse1/report_length
+echo -ne $MOUSE1 > functions/hid.mouse1/report_desc
+
 
 echo "  Mass storage"
 mkdir -p functions/mass_storage.disk1
-echo "RPi KVM DISK" > functions/mass_storage.disk1/lun.0/inquiry_string
 
 echo "  CD-ROM"
 mkdir -p functions/mass_storage.cdrom1
 echo 1 > functions/mass_storage.cdrom1/lun.0/cdrom
 echo 1 > functions/mass_storage.cdrom1/lun.0/removable
-echo "RPi KVM CDROM" > functions/mass_storage.cdrom1/lun.0/inquiry_string
 
 
 echo "Activating gadgeds"
 ln -s functions/hid.kbd0 configs/c.1/
 ln -s functions/hid.mouse0 configs/c.1/
+ln -s functions/hid.mouse1 configs/c.1/
 ln -s functions/mass_storage.disk1 configs/c.1/
 ln -s functions/mass_storage.cdrom1 configs/c.1/
 
@@ -98,3 +106,4 @@ ls /sys/class/udc > UDC
 echo "Change permissions"
 chgrp input /dev/hidg0; chmod 660 /dev/hidg0
 chgrp input /dev/hidg1; chmod 660 /dev/hidg1
+chgrp input /dev/hidg2; chmod 660 /dev/hidg2

hid_descriptors.txt

@@ -1,5 +1,3 @@
-https://github.com/arduino/Arduino/blob/da9641410a4b8fa0865f0a31d0b884d14f5e7670/hardware/arduino/avr/cores/arduino/HID.cpp
-
 05 01 // Usage page Generic desktop
 09 02 // Usage Mouse
 
@@ -36,9 +34,6 @@ a1 01 // Collection Application
 c0 // End collection
 
 
-00010101
-00100101
-
 input bytes (4 bytes)
  0 - 0 data / 1 constant
  1 - 0 array / 1 variable

hidinput.py

@@ -2,27 +2,29 @@ from flask import Response
 from flask import Flask
 from flask import render_template
 from flask import request
-from flask_socketio import SocketIO
+import threading
 import argparse
 import json
-import struct
 
 from hidkeycodes import hidkeycodes
 from jskeycodes import jscodehidmap
 
 
+lock = threading.Lock()
+
 # initialize a flask object
 app = Flask(__name__)
-socketio = SocketIO(app)
 
 hiddev = None
+hidmouse = None
 hidmouseabs = None
 
 
 def hid_init():
-    global hiddev, hidmouseabs
+    global hiddev, hidmouse, hidmouseabs
     hiddev = open('/dev/hidg0', 'rb+')
-    hidmouseabs = open('/dev/hidg1', 'rb+')
+    hidmouse = open('/dev/hidg1', 'rb+')
+    hidmouseabs = open('/dev/hidg2', 'rb+')
 
 
 def hid_write(data):
@@ -33,6 +35,20 @@ def hid_write(data):
     hiddev.flush()
 
 
+def hid_mouse_write(btn, x, y, wheel):
+    if hidmouse is None:
+        return False
+
+    data = bytearray(4)
+    data[0] = btn
+    data[1] = x
+    data[2] = y
+    data[3] = wheel
+
+    hidmouse.write(data)
+    hidmouse.flush()
+
+
 def hid_mouse_writeabs(btn, x, y, wheel):
     if hidmouseabs is None:
         return False
@@ -83,57 +99,54 @@ def get_hid_by_jscode(rawkeycode):
 
     return hidkeycode, (hidkeyname is not None and "MOD" in hidkeyname)
 
-
 @app.route("/")
 def index():
     return render_template("hid.html")
 
-@app.route("/kvm.html")
-def kvm():
-    return render_template("kvm.html")
-
 @app.route("/mouse.html")
 def mouseindex():
     return render_template("mouse.html")
 
-@app.route("/keyboard.html")
+@app.route("/hid/mouse", methods=["POST"])
-def keyboardIndex():
+def mouse():
-    return render_template("keyboard.html")
+    mouseevent = json.loads(request.data)
-
-
-@socketio.on('mouseEventRaw')
-def handle_mouseEvent(data):
-    print(data)
-
-    btn = data[0]
-    x = data[1]
-    y = data[2]
-    wheel = data[3]
-
-    print("RAW Btn: {}, X: {}, Y: {}, W: {}".format(btn, x, y, wheel))
-
-    hid_mouse_writeabs(btn, x, y, wheel)
-
-
-@socketio.on('mouseEvent')
-def handle_mouseEvent(data):
-    mouseevent = json.loads(data)
     print(mouseevent)
+
+    btn = mouseevent['btn']
+    x = mouseevent['x']
+    y = mouseevent['y']
+    wheel = mouseevent['wheel']
+
+    x = x if x >= 0 else 255-abs(x)
+    y = y if y >= 0 else 255-abs(y)
+
+    print("X: {}, Y: {}".format(x, y))
+
+    hid_mouse_write(btn, x, y, wheel)
+
+    return Response("", mimetype="text/plain")
+
+@app.route("/hid/mouseabs", methods=["POST"])
+def mouseabs():
+    mouseevent = json.loads(request.data)
+    print(mouseevent)
+
     btn = mouseevent['btn']
     x = mouseevent['x']
     y = mouseevent['y']
     wheel = mouseevent['wheel']
-    wheel = wheel if wheel >= 0 else 255-abs(wheel)
 
     print("X: {}, Y: {}".format(x, y))
 
     hid_mouse_writeabs(btn, x, y, wheel)
 
+    return Response("", mimetype="text/plain")
 
-@socketio.on('kbdEvent')
+
-def handle_kbdEvent(data):
+@app.route("/hid/keyboard", methods=["POST"])
-    keyevent = json.loads(data)
+def keypress():
-    print("Raw data: {}".format(data))
+    keyevent = json.loads(request.data)
+    print("Raw data: {}".format(request.data))
 
     rawkeycode = keyevent['code']
     hidkeycode, mod = get_hid_by_jscode(rawkeycode)
@@ -149,8 +162,8 @@ def handle_kbdEvent(data):
         except Exception as e:
             print("Error sending HID message", e)
 
+    return Response("Press {}".format(hidkeycode), mimetype="text/plain")
 
-hid_init()
 
 # check to see if this is the main thread of execution
 if __name__ == '__main__':
@@ -164,5 +177,12 @@ if __name__ == '__main__':
         help="# of frames used to construct the background model")
     args = vars(ap.parse_args())
 
+    hid_init()
+
     app.run(host=args["ip"], port=args["port"], debug=True,
-            use_reloader=False)
+            threaded=True, use_reloader=False)
+
+    # Clean up
+    if hiddev is not None:
+        print("Closing hid")
+        hiddev.close()

runhidinput.sh

@@ -1 +0,0 @@
-uwsgi --http [::]:8001 --gevent 1000 --http-websockets --master --wsgi-file hidinput.py --callable app

runsockettest.sh

@@ -1 +0,0 @@
-uwsgi --http :8001 --gevent 1000 --http-websockets --master --wsgi-file socketiotest.py --callable app

socketiotest.py

@@ -1,19 +0,0 @@
-from flask import Flask, render_template
-from flask_socketio import SocketIO
-
-app = Flask(__name__)
-socketio = SocketIO(app)
-
-@app.route("/")
-def index():
-    return render_template("socketio.html")
-
-
-@socketio.on('my event')
-def handle_my_custom_event(json):
-    print('received json: ' + str(json))
-
-
-if __name__ == '__main__':
-    socketio.run(host="0.0.0.0", port=8001, app=app)
-

templates/hid.html

@@ -6,110 +6,76 @@
   <style>
   </style>
   <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
-  <script>
-    function zapis(t) {
-      $("div").text(t);
-    }
-    
-    var previous;
-    
-    $(window).bind('keydown', function(event) {
-      event.preventDefault();
-      var str = String.fromCharCode(event.which).toLowerCase();
-    
-      var ctrl = event.ctrlKey;
-      if (previous == 17) {
-        ctrl = true;
-      }
-    
-      var obj = {
-        ctrlKey: ctrl,
-        shiftKey: event.shiftKey,
-        altKey: event.altKey,
-        which: event.which,
-      code: event.code,
-        str: str
-      }
-    
-      if (event.which != 16 && event.which != 17 && event.which != 18) {
-        console.log(obj);
-    
-        var ret = $.ajax({
-            type: "POST",
-            url: "hid/keyboard",
-            data: JSON.stringify(obj),
-            contentType: "application/json; charset=utf-8",
-            dataType: "json"
-        });
-    
-      console.log(ret);
-      }
-    
-      var text = "";
-      if (ctrl) {
-        text = text + ' + Control';
-      }
-      if (event.shiftKey) {
-        text = text + ' + Shift';
-      }
-      if (event.altKey) {
-        text = text + ' + Alt';
-      }
-      text = text + ' + ' + str;
-      text = text.substr(3);
-      zapis(text);
-    
-      previous = event.keyCode;
-    
-    });
-    var btn=0;
-    var posX=0;
-    var posY=0;
-    var wheel=0;
-    
-    var socket = io();
-    
-    $(document).ready(function(){
-    
-      $("canvas").mousedown(function(event){
-        btn=event.buttons;
-        handleMouse();
-      });
-      $("canvas").mouseup(function(event){
-        btn=event.buttons;
-        handleMouse();
-      });
-      $("canvas").mousemove(function(event){
-        posX=event.offsetX;
-        posY=event.offsetY;
-        handleMouse();
-      });
-    });
-    
-    function handleMouse() {
-      $("span").text(btn +", "+ posX + ", " + posY);
-      sendMouse(btn, posX, posY, wheel);
-    }
-    
-    function sendMouse(btn, x, y) {
-      var obj = {
-        x: x,
-        y: y,
-        btn: btn,
-        wheel: wheel,
-      }
-    
-      socket.emit('mouseEvent', JSON.stringify(obj));
-    };
-    </script>
 </head>
 <body>
-  HID Remote Keyboard and mouse<br/>
+	HID input service, POST data to /keyboard or /mouse <br/>
+<div>
+</div>
 
-<div></div>
+<br/>
+Server response: <span></span>
+
+<script>
+function zapis(t) {
+  $("div").text(t);
+}
+
+var previous;
+
+$(window).bind('keydown', function(event) {
+  event.preventDefault();
+  var str = String.fromCharCode(event.which).toLowerCase();
+
+  var ctrl = event.ctrlKey;
+  if (previous == 17) {
+    ctrl = true;
+  }
+
+  var obj = {
+    ctrlKey: ctrl,
+    shiftKey: event.shiftKey,
+    altKey: event.altKey,
+    which: event.which,
+	code: event.code,
+    str: str
+  }
+
+  if (event.which != 16 && event.which != 17 && event.which != 18) {
+    console.log(obj);
+
+    var ret = $.ajax({
+        type: "POST",
+        url: "hid/keyboard",
+        data: JSON.stringify(obj),
+        contentType: "application/json; charset=utf-8",
+        dataType: "json"
+    });
+
+	$("span").text(ret.responseText);
+	console.log(ret);
+	
+
+  }
+
+  var text = "";
+  if (ctrl) {
+    text = text + ' + Control';
+  }
+  if (event.shiftKey) {
+    text = text + ' + Shift';
+  }
+  if (event.altKey) {
+    text = text + ' + Alt';
+  }
+  text = text + ' + ' + str;
+  text = text.substr(3);
+  zapis(text);
+
+  previous = event.keyCode;
+
+});
+
+</script>
  
-<span></span><br/><br/>
-<canvas width=1920 height=1080 style="border: 1px solid black" oncontextmenu="return false" onwheel='wheel=event.deltaY*-1; handleMouse(); wheel=0; return false;' ></canvas>
 </body>
 </html>

templates/keyboard.html

@@ -1,74 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Klávesnice remote SSH</title>
-  <style>
-  </style>
-  <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
-</head>
-<body>
-	HID input keyboard, POST data to /keyboard<br/>
-<div>
-</div>
-
-<br/>
-Server response: <span></span>
-
-<script>
-var socket = io();
-
-
-function zapis(t) {
-  $("div").text(t);
-}
-
-var previous;
-
-$(window).bind('keydown', function(event) {
-  event.preventDefault();
-  var str = String.fromCharCode(event.which).toLowerCase();
-
-  var ctrl = event.ctrlKey;
-  if (previous == 17) {
-    ctrl = true;
-  }
-
-  var obj = {
-    ctrlKey: ctrl,
-    shiftKey: event.shiftKey,
-    altKey: event.altKey,
-    which: event.which,
-	  code: event.code,
-    str: str
-  }
-
-  if (event.which != 16 && event.which != 17 && event.which != 18) {
-    console.log(obj);
-
-    socket.emit('kbdEvent', JSON.stringify(obj));
-  }
-
-  var text = "";
-  if (ctrl) {
-    text = text + ' + Control';
-  }
-  if (event.shiftKey) {
-    text = text + ' + Shift';
-  }
-  if (event.altKey) {
-    text = text + ' + Alt';
-  }
-  text = text + ' + ' + str;
-  text = text.substr(3);
-  zapis(text);
-
-  previous = event.keyCode;
-
-});
-
-</script>
- 
-</body>
-</html>

templates/kvm.html

@@ -1,107 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Raspberry Pi KVM</title>
-  <style>
-  </style>
-  <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
-  <script>
-
-    var socket = io();
-
-    var previous;
-    
-    $(window).bind('keydown', function(event) {
-      event.preventDefault();
-      var str = String.fromCharCode(event.which).toLowerCase();
-    
-      var ctrl = event.ctrlKey;
-      if (previous == 17) {
-        ctrl = true;
-      }
-    
-      var obj = {
-        ctrlKey: ctrl,
-        shiftKey: event.shiftKey,
-        altKey: event.altKey,
-        which: event.which,
-      code: event.code,
-        str: str
-      }
-    
-      if (event.which != 16 && event.which != 17 && event.which != 18) {
-        console.log(obj);
-        socket.emit('kbdEvent', JSON.stringify(obj));
-      }
-    
-      var text = "";
-      if (ctrl) {
-        text = text + ' + Control';
-      }
-      if (event.shiftKey) {
-        text = text + ' + Shift';
-      }
-      if (event.altKey) {
-        text = text + ' + Alt';
-      }
-      text = text + ' + ' + str;
-      text = text.substr(3);
-      
-      previous = event.keyCode;
-    
-    });
-    var btn=0;
-    var posX=0;
-    var posY=0;
-    var wheel=0;
-
-    $(document).ready(function(){
-    
-      $("img").mousedown(function(event){
-        btn=event.buttons;
-        handleMouse();
-      });
-      $("img").mouseup(function(event){
-        btn=event.buttons;
-        handleMouse();
-      });
-      $("img").mousemove(function(event){
-        posX=event.offsetX;
-        posY=event.offsetY;
-        handleMouse();
-      });
-    });
-    
-    function handleMouse() {
-      $("span").text(btn +", "+ posX + ", " + posY);
-      sendMouse(btn, posX, posY, wheel);
-    }
-    
-    function sendMouse(btn, x, y) {
-      var obj = {
-        x: x,
-        y: y,
-        btn: btn,
-        wheel: wheel,
-      }
-
-      var data = new Array(4);
-      data[0] = btn;
-      data[1] = x;
-      data[2] = y;
-      data[3] = wheel;
-    
-      //socket.emit('mouseEvent', JSON.stringify(obj));
-      socket.emit('mouseEventRaw', data);
-    };
-    </script>
-</head>
-<body>
-KVM<br/>
- 
-<span></span><br/><br/>
-<img src="http://[2a01:510:d501:2800:1b8f:607e:9885:99c7]:8000/video_feed" draggable=false width=1920 height=1080 style="border: 1px solid black" oncontextmenu="return false" onwheel='wheel=event.deltaY*-1; handleMouse(); wheel=0; return false;' >
-</body>
-</html>

templates/mouse.html

@@ -6,20 +6,23 @@
   <style>
   </style>
   <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
 </head>
 <body>
 	HID mouse service, POST data to /mouse <br/>
 <div>
 </div>
+
+<input type="button" onclick="sendMouse(0, 0, -10);" value="^" />
+<input type="button" onclick="sendMouse(0, -10, 0);" value="<" />
+<input type="button" onclick="sendMouse(0, 10, 0);" value=">" />
+<input type="button" onclick="sendMouse(0, 0, 10);" value="v" /><br />
+<input type="button" onclick="sendMouse(1, 0, 0);" value="LEFT" />
+<input type="button" onclick="sendMouse(2, 0, 0);" value="RIGHT" />
 <script>
 
 var btn=0;
 var posX=0;
 var posY=0;
-var wheel=0;
-
-var socket = io();
 
 $(document).ready(function(){
 
@@ -31,16 +34,19 @@ $(document).ready(function(){
 		btn=event.buttons;
 		handleMouse();
 	});
-	$("canvas").mousemove(function(event){
+
-		posX=event.offsetX;
+	  $("canvas").mousemove(function(event){
-		posY=event.offsetY;
+//		  sendMouse(0, event.originalEvent.movementX, event.originalEvent.movementY);
-		handleMouse();
+		  posX=event.offsetX;
-	});
+		  posY=event.offsetY;
+		  handleMouse();
+	  });
+
 });
 
 function handleMouse() {
 	$("span").text(btn +", "+ posX + ", " + posY);
-	sendMouse(btn, posX, posY, wheel);
+	sendMouse(btn, posX, posY);
 }
 
 function sendMouse(btn, x, y) {
@@ -48,15 +54,22 @@ function sendMouse(btn, x, y) {
     x: x,
     y: y,
     btn: btn,
-    wheel: wheel,
+    wheel: 0,
   }
 
-  socket.emit('mouseEvent', JSON.stringify(obj));
+  var ret = $.ajax({
+      type: "POST",
+      url: "hid/mouseabs",
+      data: JSON.stringify(obj),
+      contentType: "application/json; charset=utf-8",
+      dataType: "json"
+  });
+  
 };
 
 </script>
 <span></span><br/><br/>
-<canvas width=1920 height=1080 style="border: 1px solid black" oncontextmenu="return false" onwheel='wheel=event.deltaY*-1; handleMouse(); wheel=0; return false;' ></canvas>
+<canvas width=500 height=500 style="border: 1px solid black" oncontextmenu="return false"></canvas>
 <!--<img src="placeholder.png" width=1920 height=1080 onmousemove='console.log("aaa");' />-->
 </body>
 </html>

templates/socketio.html

@@ -1,14 +0,0 @@
-<html>
-<body>
-<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
-	<script type="text/javascript" charset="utf-8">
-		    var socket = io();
-    socket.on('connect', function() {
-	            socket.emit('my event', {data: 'I\'m connected!'});
-	        });
-</script>
-
-ahoj3
-<input type="button" onClick="socket.emit('my event', 'test');" value="test" />
-</body>
-</html>