external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Fixed X11 detect, added browser full screen.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2018-11-28 10:50:25 -08:00
parent 2f7399cd58
commit 1f4816db21
7 changed files with 64 additions and 2192 deletions
Download patch file Download diff file Expand all files Collapse all files

1
agents/meshcore.js
View file

@ -19,6 +19,7 @@ process.on('uncaughtException', function (ex) {
require('MeshAgent').SendCommand({ "action": "msg", "type": "console", "value": "uncaughtException1: " + ex });
});
// NOTE: This seems to cause big problems, don't enable the debugger in the server's meshcore.
//attachDebugger({ webport: 9999, wait: 1 }).then(function (prt) { console.log('Point Browser for Debug to port: ' + prt); });
// Mesh Rights

2163
agents/modules_meshcore/duktape-debugger.jsx
View file

File diff suppressed because one or more lines are too long

30
agents/modules_meshcore/monitor-info.js
View file

@ -44,24 +44,18 @@ function monitorinfo()
if (info._user32.EnumDisplayMonitors(0, 0, this._monitorinfo.callback, this._monitorinfo.dwData).Val == 0) {
rejector('LastError=' + info._kernel32.GetLastError().Val);
return;
}
else {
} else {
resolver(this._monitorinfo.callback.results);
}
}));
}
}
else if(process.platform == 'linux')
else if (process.platform == 'linux')
{
// First thing we need to do, is determine where the X11 libraries are
var askOS = false;
try
{
if (require('user-sessions').isRoot()) { askOS = true; }
}
catch (e)
{ }
try { if (require('user-sessions').isRoot()) { askOS = true; } } catch (e) { }
if (askOS)
{
@ -74,17 +68,15 @@ function monitorinfo()
var paths = p.stdout._lines.split('\n');
var searchPath = '';
for (var i in paths)
{
if (paths[i].endsWith(':'))
{
for (var i in paths) {
if (paths[i].endsWith(':')) {
searchPath = paths[i].substring(0, paths[i].length - 1);
}
else
{
if (paths[i].split('libX11.').length > 1) { Object.defineProperty(this, 'Location_X11LIB', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
if (paths[i].split('libXtst.').length > 1) { Object.defineProperty(this, 'Location_X11TST', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
if (paths[i].split('libXext.').length > 1) { Object.defineProperty(this, 'Location_X11EXT', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
} else {
try { // Added by Ylian: Try/catch to fix X11 detection, not sure if this is correct.
if (paths[i].split('libX11.').length > 1) { Object.defineProperty(this, 'Location_X11LIB', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
if (paths[i].split('libXtst.').length > 1) { Object.defineProperty(this, 'Location_X11TST', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
if (paths[i].split('libXext.').length > 1) { Object.defineProperty(this, 'Location_X11EXT', { value: searchPath + '/' + paths[i].split('->')[1].trim() }); }
} catch (ex) { }
}
}
}