Explicitly set canvas cursor to show up on remote desktop.
Ylian Saint-Hilaire committed
Feb 6, 2019 at 12:05 UTC
f8be20be0a74cf6315b00d4100945ed8439385f9
9 files changed
+8
-6
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
meshuser.js
+1
-1
@@ -1604,7 +1604,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1604
// Generate a 8 digit integer with even random probability for each value.
1605
function getRandomEightDigitInteger() {
1606
var bigInt;
1607
- do { bigInt = obj.parent.crypto.randomBytes(4).readUInt32BE(0); } while (bigInt > 4200000000);
1607
+ do { bigInt = obj.parent.crypto.randomBytes(4).readUInt32BE(0); } while (bigInt >= 4200000000);
1608
return bigInt % 100000000;
1609
}
1610
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.2.7-j",
3
+ "version": "0.2.7-k",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
public/scripts/agent-desktop-0.0.2.js
+1
@@ -70,6 +70,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
70
obj.xxStateChange = function (newstate) {
71
if (obj.State == newstate) return;
72
obj.State = newstate;
73
+ obj.CanvasId.style.cursor = 'default';
74
//console.log('xxStateChange', newstate);
75
switch (newstate) {
76
case 0: {
public/scripts/amt-desktop-0.0.2.js
+2
-2
@@ -68,9 +68,9 @@ var CreateAmtRemoteDesktop = function (divid, scrolldiv) {
68
obj.canvas.fillRect(0, 0, obj.width, obj.height);
69
obj.canvas.canvas.width = obj.rwidth = obj.width = 640;
70
obj.canvas.canvas.height = obj.rheight = obj.height = 400;
71
- QS(obj.canvasid).cursor = 'auto';
71
+ QS(obj.canvasid).cursor = 'default';
72
} else {
73
- if (!obj.showmouse) { QS(obj.canvasid).cursor = 'none'; }
73
+ QS(obj.canvasid).cursor = obj.showmouse ?'default':'none';
74
}
75
}
76
public/scripts/amt-redir-ws-0.1.0.js
+3
-2
@@ -60,7 +60,7 @@ var CreateAmtRedirect = function (module, authCookie) {
60
}
61
62
obj.xxOnMessage = function (e) {
63
- if (obj.debugmode == 1) { console.log('Recv', e.data); }
63
+ //if (obj.debugmode == 1) { console.log('Recv', e.data); }
64
obj.inDataCount++;
65
if (typeof e.data == 'object') {
66
var f = new FileReader();
@@ -88,6 +88,7 @@ var CreateAmtRedirect = function (module, authCookie) {
88
};
89
90
obj.xxOnSocketData = function (data) {
91
+ //if (obj.debugmode == 1) { console.log('Recv', data.length, rstr2hex(data)); }
92
if (!data || obj.connectstate == -1) return;
93
94
if (typeof data === 'object') {
@@ -249,7 +250,7 @@ var CreateAmtRedirect = function (module, authCookie) {
250
obj.xxSend = function (x) {
251
//obj.Debug("Redir Send(" + x.length + "): " + rstr2hex(x));
252
if (obj.socket != null && obj.socket.readyState == WebSocket.OPEN) {
252
- if (obj.debugmode == 1) { console.log('Send', x); }
253
+ //if (obj.debugmode == 1) { console.log('Send', x.length, rstr2hex(x)); }
254
var b = new Uint8Array(x.length);
255
for (var i = 0; i < x.length; ++i) { b[i] = x.charCodeAt(i); }
256
obj.socket.send(b.buffer);