bfg-common 1.5.506 → 1.5.508

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

@@ -1,203 +1,227 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.InputProcess = $.spcExtend(wdi.EventObject.prototype, {
-  clientGui: null,
-  spiceConnection: null,
-  capsLockPressed: false,
-  numLockPressed: false,
-  shiftPressed: false,
-
-  init: function (c) {
-    this.superInit()
-    this.clientGui = c.clientGui
-    this.spiceConnection = c.spiceConnection
-  },
-
-  dispose: function () {
-    this.clearEvents()
-    this.clientGui = null
-    this.spiceConnection = null
-  },
-
-  process: function (spiceMessage) {
-    switch (spiceMessage.messageType) {
-      case wdi.SpiceVars.SPICE_MSG_INPUTS_MOUSE_MOTION_ACK:
-        this.clientGui.motion_ack()
-        break
-    }
-  },
-
-  send: function (data, type) {
-    var packet, scanCodes, i
-
-    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,
-        }),
-      })
-      this.spiceConnection.send(packet)
-    } else if (type == 'mousedown') {
-      packet = new wdi.SpiceMessage({
-        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_PRESS,
-        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-        args: new wdi.RedcMousePress({
-          button_id: data[1] + 1,
-          buttons_state: 1 << data[1],
-        }),
-      })
-      this.spiceConnection.send(packet)
-    } else if (type == 'mouseup') {
-      packet = new wdi.SpiceMessage({
-        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_RELEASE,
-        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-        args: new wdi.RedcMousePress({
-          button_id: data[1] + 1,
-          buttons_state: 0,
-        }),
-      })
-      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') {
-      packet = new wdi.SpiceMessage({
-        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_MOTION,
-        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
-        args: new wdi.RedcMouseMotion({
-          x: data[1][0],
-          y: data[1][1],
-          buttons_state: 0,
-        }),
-      })
-      this.spiceConnection.send(packet)
-    }
-  },
-
-  isKeyboardShortcut: function (type, event) {
-    if (type === 'keydown') {
-      var keycode = event['keyCode']
-      wdi.Keymap.controlPressed(keycode, type, event)
-      var ctrlShortcut = wdi.Keymap.handledByCtrlKeyCode(type, keycode, true)
-      return ctrlShortcut
-    }
-  },
-})
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.InputProcess = $.spcExtend(wdi.EventObject.prototype, {
+  clientGui: null,
+  spiceConnection: null,
+  capsLockPressed: false,
+  numLockPressed: false,
+  shiftPressed: false,
+  mouseLastX: -1,
+  mouseLastY: -1,
+
+  init: function (c) {
+    this.superInit()
+    this.clientGui = c.clientGui
+    this.spiceConnection = c.spiceConnection
+  },
+
+  dispose: function () {
+    this.clearEvents()
+    this.clientGui = null
+    this.spiceConnection = null
+  },
+
+  process: function (spiceMessage) {
+    switch (spiceMessage.messageType) {
+      case wdi.SpiceVars.SPICE_MSG_INPUTS_MOUSE_MOTION_ACK:
+        this.clientGui.motion_ack()
+        break
+    }
+  },
+
+  send: function (data, type) {
+    var packet, scanCodes, i
+
+    const { $mouse } = useNuxtApp()
+    if (type == 'mousemove') {
+      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({
+        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_PRESS,
+        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+        args: new wdi.RedcMousePress({
+          button_id: data[1] + 1,
+          buttons_state: 1 << data[1],
+        }),
+      })
+      this.spiceConnection.send(packet)
+    } else if (type == 'mouseup') {
+      packet = new wdi.SpiceMessage({
+        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_RELEASE,
+        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+        args: new wdi.RedcMousePress({
+          button_id: data[1] + 1,
+          buttons_state: 0,
+        }),
+      })
+      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') {
+      packet = new wdi.SpiceMessage({
+        messageType: wdi.SpiceVars.SPICE_MSGC_INPUTS_MOUSE_MOTION,
+        channel: wdi.SpiceVars.SPICE_CHANNEL_INPUTS,
+        args: new wdi.RedcMouseMotion({
+          x: data[1][0],
+          y: data[1][1],
+          buttons_state: 0,
+        }),
+      })
+      this.spiceConnection.send(packet)
+    }
+  },
+
+  isKeyboardShortcut: function (type, event) {
+    if (type === 'keydown') {
+      var keycode = event['keyCode']
+      wdi.Keymap.controlPressed(keycode, type, event)
+      var ctrlShortcut = wdi.Keymap.handledByCtrlKeyCode(type, keycode, true)
+      return ctrlShortcut
+    }
+  },
+})

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

@@ -1,78 +1,82 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-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;
-	},
-
-	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];
-
-		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);
-				}
-				if (spiceMessage.args.current_mouse_mode == 1) {
-					channel.fire('mouseMode', spiceMessage.args.current_mouse_mode);
-				}
-				// the mouse mode must be change both if we have agent or not
-				this.changeMouseMode();
-				break;
-			case wdi.SpiceVars.SPICE_MSG_MAIN_AGENT_DATA:
-				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;
-			case wdi.SpiceVars.SPICE_MSG_MAIN_MULTI_MEDIA_TIME:
-				this.app.multimediaTime = spiceMessage.args.multimedia_time;
-				break;
-			case wdi.SpiceVars.SPICE_MSG_MAIN_CHANNELS_LIST:
-				channel.fire('channelListAvailable', spiceMessage.args.channels);
-				break;
-		}
-	},
-
-	changeMouseMode: function() {
-		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);
-	}
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+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;
+		this.currentMouseMode = wdi.SpiceMouseModeTypes.SPICE_MOUSE_MODE_CLIENT;
+	},
+
+	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];
+
+		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);
+				}
+				if (spiceMessage.args.current_mouse_mode == 1) {
+					channel.fire('mouseMode', spiceMessage.args.current_mouse_mode);
+				}
+				// the mouse mode must be change both if we have agent or not
+				this.changeMouseMode();
+				break;
+			case wdi.SpiceVars.SPICE_MSG_MAIN_AGENT_DATA:
+				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;
+			case wdi.SpiceVars.SPICE_MSG_MAIN_MULTI_MEDIA_TIME:
+				this.app.multimediaTime = spiceMessage.args.multimedia_time;
+				break;
+			case wdi.SpiceVars.SPICE_MSG_MAIN_CHANNELS_LIST:
+				channel.fire('channelListAvailable', spiceMessage.args.channels);
+				break;
+		}
+	},
+
+	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: mode // Custom code
+			})
+		});
+		this.spiceConnection.send(packet);
+		this.currentMouseMode = mode // Custom code
+		const { $mouse } = useNuxtApp()
+		$mouse.changeMode(mode)
+	}
+});