MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 14:45:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed remote desktop key mappings.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-02-23 14:07:42 -08:00
parent 6a4b5015f5
commit 1e2fba4458
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
public/scripts/agent-desktop-0.0.2.js
View File

@ -386,14 +386,19 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
return convertKeyCodeTable[e.code]; return convertKeyCodeTable[e.code];
} }
var extendedKeyTable = ['ShiftRight', 'AltRight', 'ControlRight', 'Home', 'End', 'Insert', 'Delete', 'PageUp', 'PageDown', 'NumpadDivide', 'NumpadEnter', 'NumLock', 'Pause'];
obj.SendKeyMsg = function (action, event) { obj.SendKeyMsg = function (action, event) {
if (action == null) return; if (action == null) return;
if (!event) { event = window.event; } if (!event) { event = window.event; }
if (event.code && (obj.localKeyMap == false)) {
var extendedKey = false;
if ((typeof event.code == 'string') && (event.code.startsWith('Arrow') || (extendedKeyTable.indexOf(event.code) >= 0))) { extendedKey = true; }
if ((extendedKey == false) && event.code && (event.code.startsWith('NumPad') == false) && (obj.localKeyMap == false)) {
// Convert "event.code" into a scancode. This works the same regardless of the keyboard language. // Convert "event.code" into a scancode. This works the same regardless of the keyboard language.
// Older browsers will not support this. // Older browsers will not support this.
var kc = convertKeyCode(event); var kc = convertKeyCode(event);
if (kc != null) { obj.SendKeyMsgKC(action, kc); } if (kc != null) { obj.SendKeyMsgKC(action, kc, extendedKey); }
} else { } else {
// Use this keycode, this works best with "US-EN" keyboards. // Use this keycode, this works best with "US-EN" keyboards.
// Older browser support this. // Older browser support this.
@ -401,7 +406,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
if (kc == 0x3B) { kc = 0xBA; } // Fix the ';' key if (kc == 0x3B) { kc = 0xBA; } // Fix the ';' key
else if (kc == 173) { kc = 189; } // Fix the '-' key for Firefox else if (kc == 173) { kc = 189; } // Fix the '-' key for Firefox
else if (kc == 61) { kc = 187; } // Fix the '=' key for Firefox else if (kc == 61) { kc = 187; } // Fix the '=' key for Firefox
obj.SendKeyMsgKC(action, kc); obj.SendKeyMsgKC(action, kc, extendedKey);
} }
} }
@ -412,9 +417,9 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
if (obj.State == 3) obj.send(String.fromCharCode(0x00, 0x11) + obj.shortToStr(4 + msg.length) + msg); // 0x11 = 17 MNG_KVM_MESSAGE if (obj.State == 3) obj.send(String.fromCharCode(0x00, 0x11) + obj.shortToStr(4 + msg.length) + msg); // 0x11 = 17 MNG_KVM_MESSAGE
} }
obj.SendKeyMsgKC = function (action, kc) { obj.SendKeyMsgKC = function (action, kc, extendedKey) {
if (obj.State != 3) return; if (obj.State != 3) return;
if (typeof action == 'object') { for (var i in action) { obj.SendKeyMsgKC(action[i][0], action[i][1]); } } if (typeof action == 'object') { for (var i in action) { obj.SendKeyMsgKC(action[i][0], action[i][1], action[i][2]); } }
else { else {
if (action == 1) { // Key Down if (action == 1) { // Key Down
if (obj.pressedKeys.indexOf(kc) == -1) { obj.pressedKeys.unshift(kc); } // Add key press to start of array if (obj.pressedKeys.indexOf(kc) == -1) { obj.pressedKeys.unshift(kc); } // Add key press to start of array
@ -422,9 +427,11 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
var i = obj.pressedKeys.indexOf(kc); var i = obj.pressedKeys.indexOf(kc);
if (i != -1) { obj.pressedKeys.splice(i, 1); } // Remove the key press from the pressed array if (i != -1) { obj.pressedKeys.splice(i, 1); } // Remove the key press from the pressed array
} }
if (obj.debugmode > 0) { console.log('Sending Key ' + kc + ', action ' + action); } if (obj.debugmode > 0) { console.log('Sending Key ' + kc + ', action ' + action); }
obj.send(String.fromCharCode(0x00, obj.InputType.KEY, 0x00, 0x06, (action - 1), kc));
var up = (action - 1);
if (extendedKey) { if (up == 1) { up = 3; } else { up = 4; } }
obj.send(String.fromCharCode(0x00, obj.InputType.KEY, 0x00, 0x06, up, kc));
} }
} }
@ -563,13 +570,13 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
obj.xxMouseWheel = function (e) { if (obj.State == 3) { obj.SendMouseMsg(obj.KeyAction.SCROLL, e); return false; } return true; } obj.xxMouseWheel = function (e) { if (obj.State == 3) { obj.SendMouseMsg(obj.KeyAction.SCROLL, e); return false; } return true; }
obj.xxKeyUp = function (e) { obj.xxKeyUp = function (e) {
if ((e.key != 'Dead') && (obj.State == 3)) { if ((e.key != 'Dead') && (obj.State == 3)) {
if ((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0))) { obj.SendKeyUnicode(obj.KeyAction.UP, e.key.charCodeAt(0)); } else { obj.SendKeyMsg(obj.KeyAction.UP, e); } if ((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0)) && (e.key.charCodeAt(0) < 42) && (e.key.charCodeAt(0) > 47)) { obj.SendKeyUnicode(obj.KeyAction.UP, e.key.charCodeAt(0)); } else { obj.SendKeyMsg(obj.KeyAction.UP, e); }
} }
if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false;
} }
obj.xxKeyDown = function (e) { obj.xxKeyDown = function (e) {
if ((e.key != 'Dead') && (obj.State == 3)) { if ((e.key != 'Dead') && (obj.State == 3)) {
if (!((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0)))) { if (!((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0)) && (e.key.charCodeAt(0) < 42) && (e.key.charCodeAt(0) > 47))) {
obj.SendKeyMsg(obj.KeyAction.DOWN, e); obj.SendKeyMsg(obj.KeyAction.DOWN, e);
if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false;
} }
@ -577,7 +584,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
} }
obj.xxKeyPress = function (e) { obj.xxKeyPress = function (e) {
if ((e.key != 'Dead') && (obj.State == 3)) { if ((e.key != 'Dead') && (obj.State == 3)) {
if ((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0))) { obj.SendKeyUnicode(obj.KeyAction.DOWN, e.key.charCodeAt(0)); } //else { obj.SendKeyMsg(obj.KeyAction.DOWN, e); } if ((typeof e.key == 'string') && (e.key.length == 1) && (e.ctrlKey != true) && (e.altKey != true) && ((obj.remoteKeyMap == false) || (obj.debugmode > 0)) && (e.key.charCodeAt(0) < 42) && (e.key.charCodeAt(0) > 47)) { obj.SendKeyUnicode(obj.KeyAction.DOWN, e.key.charCodeAt(0)); } //else { obj.SendKeyMsg(obj.KeyAction.DOWN, e); }
} }
if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false;
} }