bfg-common 1.5.512 → 1.5.514

package/public/spice-console/process/cursorprocess.js

@@ -19,21 +19,31 @@
 
 wdi.CursorProcess = $.spcExtend(wdi.EventObject.prototype, {
 	imageData: null,
-	
+
 	process: function(spiceMessage) {
 		switch (spiceMessage.messageType) {
 			case wdi.SpiceVars.SPICE_MSG_CURSOR_INIT:
 			case wdi.SpiceVars.SPICE_MSG_CURSOR_SET:
-				var wdiCursor = this.extractCursor(spiceMessage);
-				if(wdiCursor) {
-					wdi.VirtualMouse.setHotspot(0, 0);
-					wdi.VirtualMouse.setMouse(wdiCursor.data, wdiCursor.header.hot_spot_x, wdiCursor.header.hot_spot_y);
+				var wdiCursor = this.extractCursor(spiceMessage)
+				if (wdiCursor) {
+					wdi.VirtualMouse.setHotspot(0, 0)
+					wdi.VirtualMouse.setMouse(
+						wdiCursor.data,
+						wdiCursor.header.hot_spot_x,
+						wdiCursor.header.hot_spot_y
+					)
 				}
-				break;
+				break
+			// Custom code
+			case wdi.SpiceVars.SPICE_MSG_CURSOR_MOVE:
+				var position = spiceMessage.args.position;
+				wdi.VirtualMouse.updateCursor(position.x, position.y)
+				break
+			// Custom code end
 			case wdi.SpiceVars.SPICE_MSG_CURSOR_HIDE:
 				// на windows-е скрывалась мишка когда на экоане входа мишка пересекала левую границу
 				// wdi.VirtualMouse.hideMouse();
-				break;
+				break
 		}
 	},
 
@@ -51,22 +61,22 @@ wdi.CursorProcess = $.spcExtend(wdi.EventObject.prototype, {
 		ctx.putImageData(data, 0, 0);
 		return imageData.toDataURL("image/png");
 	},
-	
+
 	extractCursor: function(spiceMessage) {
 		var flags = spiceMessage.args.cursor.flags;
 		var position = spiceMessage.args.position;
 		var visible = spiceMessage.args.visible;
-		
+
 		//if there is no cursor, return null
 		if(flags & 1) {
 			return null;
 		}
-	
+
 		var imageData = null;
-		
+
 		//cursor from cache?
 		if(flags & wdi.SpiceCursorFlags.SPICE_CURSOR_FLAGS_FROM_CACHE) {
-			imageData = wdi.ImageCache.getCursorFrom(spiceMessage.args.cursor);			
+			imageData = wdi.ImageCache.getCursorFrom(spiceMessage.args.cursor);
 		} else {
 			//cursor from packet
 			//any case should return url
@@ -88,22 +98,22 @@ wdi.CursorProcess = $.spcExtend(wdi.EventObject.prototype, {
 				case wdi.SpiceCursorType.SPICE_CURSOR_TYPE_COLOR32:
 				case wdi.SpiceCursorType.SPICE_CURSOR_TYPE_ENUM_END:
 					break;
-			}	
+			}
 		}
-	
+
 		//got no cursor? error!
 		if(!imageData) {
 			return null;
 		}
-	
+
 		//we have cursor, cache it?
 		if(flags & wdi.SpiceCursorFlags.SPICE_CURSOR_FLAGS_CACHE_ME) {
 			wdi.ImageCache.addCursor(spiceMessage.args.cursor, imageData);
 		}
-		
+
 		return {
-			data: imageData, 
-			position: position, 
+			data: imageData,
+			position: position,
 			visible: visible,
 			header: spiceMessage.args.cursor.header
 		};

package/public/spice-console/process/inputprocess.js

@@ -23,6 +23,8 @@ wdi.InputProcess = $.spcExtend(wdi.EventObject.prototype, {
   capsLockPressed: false,
   numLockPressed: false,
   shiftPressed: false,
+  mouseLastX: -1,
+  mouseLastY: -1,
 
   init: function (c) {
     this.superInit()
@@ -47,17 +49,39 @@ wdi.InputProcess = $.spcExtend(wdi.EventObject.prototype, {
   send: function (data, type) {
     var packet, scanCodes, i
 
+    const { $mouse } = useNuxtApp()
     if (type == 'mousemove') {
-      packet = new wdi.SpiceMessage({
-        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_POSITION,
-        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-        args: new wdi.RedcMousePosition({
-          x: data[1][0] + wdi.VirtualMouse.hotspot.x,
-          y: data[1][1] + wdi.VirtualMouse.hotspot.y,
-          buttons_state: data[1][2],
-          display_id: 0,
-        }),
-      })
+      if (
+        $mouse.mode.value === wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT
+      ) {
+        packet = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_POSITION,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.RedcMousePosition({
+            x: data[1][0] + wdi.VirtualMouse.hotspot.x,
+            y: data[1][1] + wdi.VirtualMouse.hotspot.y,
+            buttons_state: data[1][2],
+            display_id: 0,
+          }),
+        })
+      } else if (
+        $mouse.mode.value === wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_SERVER
+      ) {
+        const dx = this.mouseLastX !== -1 ? data[1][0] - this.mouseLastX : 0
+        const dy = this.mouseLastY !== -1 ? data[1][1] - this.mouseLastY : 0
+        packet = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_MOTION,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.RedcMouseMotion({
+            x: dx,
+            y: dy,
+            buttons_state: 0,
+          }),
+        })
+        this.mouseLastX = data[1][0]
+        this.mouseLastY = data[1][1]
+      }
+
       this.spiceConnection.send(packet)
     } else if (type == 'mousedown') {
       packet = new wdi.SpiceMessage({
@@ -80,105 +104,105 @@ wdi.InputProcess = $.spcExtend(wdi.EventObject.prototype, {
       })
       this.spiceConnection.send(packet)
     } else if (type == 'keydown' || type == 'keypress') {
-		scanCodes = wdi.Keymap.getScanCodes(data[1][0])
-
-		const originalEvent = data[1][0].originalEvent
-
-		if (
-			type == 'keydown' &&
-			data[1][0].keyCode !== 20 &&
-			((!wdi.Keymap.isVirtualKeyboard &&
-					originalEvent &&
-					originalEvent.getModifierState &&
-					wdi.Keymap.capsLock !== originalEvent.getModifierState('CapsLock')) ||
-				(wdi.Keymap.isVirtualKeyboard &&
-					wdi.Keymap.isVirtualCapsLockOn !== wdi.Keymap.capsLock))
-		) {
-			const capsLockPacket = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode([58, 0, 0]),
-			})
-			this.capsLockPressed = true
-			this.spiceConnection.send(capsLockPacket)
-		}
-
-		if (
-			type == 'keydown' &&
-			originalEvent &&
-			originalEvent.getModifierState &&
-			data[1][0].keyCode !== 144 &&
-			wdi.Keymap.numLock !== originalEvent.getModifierState('NumLock')
-		) {
-			const numLockPacket = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode([69, 0, 0]),
-			})
-			this.numLockPressed = true
-			this.spiceConnection.send(numLockPacket)
-		}
-
-		for (i = 0; i < scanCodes.length; i++) {
-			packet = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode(scanCodes[i]),
-			})
-
-			if (scanCodes[0] && scanCodes[0][0] === 42) {
-				this.shiftPressed = true
-			}
-			this.spiceConnection.send(packet)
-		}
-	} else if (type == 'keyup') {
-		scanCodes = wdi.Keymap.getScanCodes(data[1][0])
-
-		if (
-			scanCodes &&
-			scanCodes[0] &&
-			scanCodes[0][0] === 199 &&
-			scanCodes[0][1] === 0 &&
-			scanCodes[0][2] === 0
-		) {
-			scanCodes = [[224, 199, 0, 0]]
-		}
-
-		if (this.capsLockPressed) {
-			const capsLockPacket = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode([186, 0, 0]),
-			})
-			this.spiceConnection.send(capsLockPacket)
-			this.capsLockPressed = false
-		}
-
-		if (this.numLockPressed) {
-			const numLockPacket = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode([197, 0, 0]),
-			})
-			this.spiceConnection.send(numLockPacket)
-			this.numLockPressed = false
-		}
-
-		if (scanCodes[0] && scanCodes[0][0] === 142) {
-			this.shiftPressed = false
-		}
-
-		for (i = 0; i < scanCodes.length; i++) {
-			packet = new wdi.SpiceMessage({
-				messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
-				channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-				args: new wdi.SpiceScanCode(scanCodes[i]),
-			})
-
-			this.spiceConnection.send(packet)
-		}
-		this.clientGui.inputManager.input.val('_')
-	} else if (type == 'joystick') {
+      scanCodes = wdi.Keymap.getScanCodes(data[1][0])
+
+      const originalEvent = data[1][0].originalEvent
+
+      if (
+        type == 'keydown' &&
+        data[1][0].keyCode !== 20 &&
+        ((!wdi.Keymap.isVirtualKeyboard &&
+          originalEvent &&
+          originalEvent.getModifierState &&
+          wdi.Keymap.capsLock !== originalEvent.getModifierState('CapsLock')) ||
+          (wdi.Keymap.isVirtualKeyboard &&
+            wdi.Keymap.isVirtualCapsLockOn !== wdi.Keymap.capsLock))
+      ) {
+        const capsLockPacket = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode([58, 0, 0]),
+        })
+        this.capsLockPressed = true
+        this.spiceConnection.send(capsLockPacket)
+      }
+
+      if (
+        type == 'keydown' &&
+        originalEvent &&
+        originalEvent.getModifierState &&
+        data[1][0].keyCode !== 144 &&
+        wdi.Keymap.numLock !== originalEvent.getModifierState('NumLock')
+      ) {
+        const numLockPacket = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode([69, 0, 0]),
+        })
+        this.numLockPressed = true
+        this.spiceConnection.send(numLockPacket)
+      }
+
+      for (i = 0; i < scanCodes.length; i++) {
+        packet = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_DOWN,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode(scanCodes[i]),
+        })
+
+        if (scanCodes[0] && scanCodes[0][0] === 42) {
+          this.shiftPressed = true
+        }
+        this.spiceConnection.send(packet)
+      }
+    } else if (type == 'keyup') {
+      scanCodes = wdi.Keymap.getScanCodes(data[1][0])
+
+      if (
+        scanCodes &&
+        scanCodes[0] &&
+        scanCodes[0][0] === 199 &&
+        scanCodes[0][1] === 0 &&
+        scanCodes[0][2] === 0
+      ) {
+        scanCodes = [[224, 199, 0, 0]]
+      }
+
+      if (this.capsLockPressed) {
+        const capsLockPacket = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode([186, 0, 0]),
+        })
+        this.spiceConnection.send(capsLockPacket)
+        this.capsLockPressed = false
+      }
+
+      if (this.numLockPressed) {
+        const numLockPacket = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode([197, 0, 0]),
+        })
+        this.spiceConnection.send(numLockPacket)
+        this.numLockPressed = false
+      }
+
+      if (scanCodes[0] && scanCodes[0][0] === 142) {
+        this.shiftPressed = false
+      }
+
+      for (i = 0; i < scanCodes.length; i++) {
+        packet = new wdi.SpiceMessage({
+          messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_KEY_UP,
+          channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+          args: new wdi.SpiceScanCode(scanCodes[i]),
+        })
+
+        this.spiceConnection.send(packet)
+      }
+      this.clientGui.inputManager.input.val('_')
+    } else if (type == 'joystick') {
       packet = new wdi.SpiceMessage({
         messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_MOTION,
         channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,

package/public/spice-console/process/mainprocess.js

@@ -18,61 +18,193 @@
 */
 
 wdi.MainProcess = $.spcExtend(wdi.EventObject.prototype, {
-	init: function(c) {
-		this.superInit();
-		this.app = c.app;
-		this.spiceConnection = c.app.spiceConnection;
-		this.agent = c.app.agent;
+	init: function (c) {
+		this.superInit()
+		this.app = c.app
+		this.spiceConnection = c.app.spiceConnection
+		this.agent = c.app.agent
+		this.currentMouseMode = wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT
 	},
 
-	dispose: function() {
-		this.clearEvents();
-		this.app = null;
-		this.spiceConnection = null;
-		this.agent = null;
+	dispose: function () {
+		this.clearEvents()
+		this.app = null
+		this.spiceConnection = null
+		this.agent = null
 	},
 
-	process: function(spiceMessage) {
-		var channel = this.spiceConnection.channels[wdi.SpiceVars.SPICE_CHANNEL_MAIN];
+	process: function (spiceMessage) {
+		var channel =
+			this.spiceConnection.channels[wdi.SpiceVars.SPICE_CHANNEL_MAIN]
 
-		switch(spiceMessage.messageType) {
+		switch (spiceMessage.messageType) {
 			case wdi.SpiceVars.SPICE_MSG_MAIN_INIT:
-				channel.connectionId = spiceMessage.args.session_id;
-				channel.fire('connectionId', channel.connectionId);
-				if(spiceMessage.args.agent_connected == 1) {
-					channel.fire('initAgent', spiceMessage.args.agent_tokens);
+				channel.connectionId = spiceMessage.args.session_id
+				channel.fire('connectionId', channel.connectionId)
+				if (spiceMessage.args.agent_connected == 1) {
+					channel.fire('initAgent', spiceMessage.args.agent_tokens)
 				}
 				if (spiceMessage.args.current_mouse_mode == 1) {
-					channel.fire('mouseMode', spiceMessage.args.current_mouse_mode);
+					channel.fire('mouseMode', spiceMessage.args.current_mouse_mode)
 				}
 				// the mouse mode must be change both if we have agent or not
-				this.changeMouseMode();
-				break;
+				this.changeMouseMode()
+				break
 			case wdi.SpiceVars.SPICE_MSG_MAIN_AGENT_DATA:
-				var packet = spiceMessage.args;
-				this.agent.onAgentData(packet);
-			   	break;
+				var packet = spiceMessage.args
+				this.agent.onAgentData(packet)
+				break
 			case wdi.SpiceVars.SPICE_MSG_MAIN_AGENT_CONNECTED:
-				channel.fire('initAgent', spiceMessage.args.agent_tokens);
-				this.changeMouseMode();
-				break;
+				channel.fire('initAgent', spiceMessage.args.agent_tokens)
+				this.changeMouseMode()
+				break
 			case wdi.SpiceVars.SPICE_MSG_MAIN_MULTI_MEDIA_TIME:
-				this.app.multimediaTime = spiceMessage.args.multimedia_time;
-				break;
+				this.app.multimediaTime = spiceMessage.args.multimedia_time
+				break
 			case wdi.SpiceVars.SPICE_MSG_MAIN_CHANNELS_LIST:
-				channel.fire('channelListAvailable', spiceMessage.args.channels);
-				break;
+				channel.fire('channelListAvailable', spiceMessage.args.channels)
+				break
 		}
 	},
 
-	changeMouseMode: function() {
+	changeMouseMode: function (
+		mode = wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT
+	) {
 		var packet = new wdi.SpiceMessage({
 			messageType: wdi.SpiceVars.SPICE_MSGC_MAIN_MOUSE_MODE_REQUEST,
 			channel: wdi.SpiceVars.SPICE_CHANNEL_MAIN,
 			args: new wdi.SpiceMouseModeRequest({
-				request_mode: wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT
-			})
-		});
-		this.spiceConnection.send(packet);
-	}
-});
+				request_mode: mode, // Custom code
+			}),
+		})
+		this.spiceConnection.send(packet)
+
+		// Custom code
+		this.currentMouseMode = mode
+		const { $mouse } = useNuxtApp()
+		$mouse.changeMode(mode)
+		// Initialize the cursor
+		if (mode === wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_SERVER) {
+			wdi.VirtualMouse.initCursor();
+
+			const canvas = document.getElementById('eventLayer');
+			canvas.requestPointerLock?.();
+
+			const rect = canvas.getBoundingClientRect();
+
+			let posX = 0;
+			let posY = 0;
+
+			function initPosDefault() {
+				posX = canvas.width / 2;
+				posY = canvas.height / 2;
+			}
+
+			function dispatchMouseEventToCanvas(type, options = {}) {
+				// console.log(clientX, 111111, clientY)
+				const ev = new MouseEvent(type, {
+					bubbles: false,
+					cancelable: true,
+					view: window,
+					clientX: posX,
+					clientY: posY,
+					button: options.button ?? 0,
+					buttons: options.buttons ?? 0,
+					ctrlKey: options.ctrlKey ?? false,
+					shiftKey: options.shiftKey ?? false,
+					altKey: options.altKey ?? false,
+					metaKey: options.metaKey ?? false,
+					isLocked: true
+				});
+
+				canvas.dispatchEvent(ev);
+			}
+
+			function dispatchWheelToCanvas(sourceEvent) {
+				const we = new WheelEvent('wheel', {
+					bubbles: false,
+					cancelable: true,
+					clientX: posX,
+					clientY: posY,
+					deltaX: sourceEvent.deltaX,
+					deltaY: sourceEvent.deltaY,
+					deltaZ: sourceEvent.deltaZ,
+					deltaMode: sourceEvent.deltaMode,
+				});
+				canvas.dispatchEvent(we);
+			}
+
+			function onDocMouseMove(e) {
+				if (!e.isTrusted) return;
+
+				const dx = e.movementX || 0;
+				const dy = e.movementY || 0;
+
+				posX += dx;
+				posY += dy;
+
+				dispatchMouseEventToCanvas('mousemove', {
+					buttons: e.buttons,
+					ctrlKey: e.ctrlKey,
+					shiftKey: e.shiftKey,
+					altKey: e.altKey,
+					metaKey: e.metaKey,
+				});
+			}
+
+			function onDocMouseDown(e) {
+				if (!e.isTrusted) return;
+				dispatchMouseEventToCanvas('mousedown', {
+					button: e.button,
+					buttons: e.buttons,
+					ctrlKey: e.ctrlKey,
+					shiftKey: e.shiftKey,
+					altKey: e.altKey,
+					metaKey: e.metaKey,
+				});
+			}
+			function onDocMouseUp(e) {
+				if (!e.isTrusted) return;
+				dispatchMouseEventToCanvas('mouseup', {
+					button: e.button,
+					buttons: e.buttons,
+					ctrlKey: e.ctrlKey,
+					shiftKey: e.shiftKey,
+					altKey: e.altKey,
+					metaKey: e.metaKey,
+				});
+			}
+			function onDocWheel(e) {
+				if (!e.isTrusted) return;
+				dispatchWheelToCanvas(e);
+			}
+
+			// Регистрируем pointerlockchange один раз (защита от повторной регистрации)
+			if (!this._pointerLockInitialized) {
+				this._pointerLockInitialized = true;
+				const onPointerLockChange = () => {
+					const locked = document.pointerLockElement === canvas;
+					if (locked) {
+						document.addEventListener('mousemove', onDocMouseMove);
+						document.addEventListener('mousedown', onDocMouseDown);
+						document.addEventListener('mouseup', onDocMouseUp);
+						document.addEventListener('wheel', onDocWheel, { passive: false });
+					} else {
+						document.removeEventListener('mousemove', onDocMouseMove);
+						document.removeEventListener('mousedown', onDocMouseDown);
+						document.removeEventListener('mouseup', onDocMouseUp);
+						document.removeEventListener('wheel', onDocWheel, { passive: false });
+
+						this.changeMouseMode(wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT)
+						wdi.VirtualMouse.removeCursor()
+					}
+				};
+
+				document.addEventListener('pointerlockchange', onPointerLockChange);
+			}
+
+			// Инициализация позиции (можно взять из последнего известного положения)
+			initPosDefault();
+		}
+	},
+})