MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

1. Improved clipboard on linux if xclip is installed

Browse Source 
2. Fixed compiler warnings
This commit is contained in:
Bryan Roe
2020-06-03 15:54:09 -07:00
parent 08bcfbfcc5
commit 51a3bc5384
4 changed files with 93 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
microscript/ILibDuktape_ChildProcess.c
View File

@@ -280,7 +280,6 @@ duk_ret_t ILibDuktape_SpawnedProcess_SIGCHLD_sink(duk_context *ctx)
}
else
{
printf("Not DETACHED\n");
// We are not detached, so we need to call the same method that broken pipe would've
ILibDuktape_ChildProcess_SubProcess *childprocess = (ILibDuktape_ChildProcess_SubProcess*)Duktape_GetBufferProperty(ctx, -1, ILibDuktape_ChildProcess_MemBuf);
if (childprocess != NULL)

10
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

5
microscript/ILibDuktape_ScriptContainer.c
View File

@@ -24,6 +24,7 @@ limitations under the License.
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
#ifndef NO_IFADDR
#include <ifaddrs.h>
#endif
@@ -1012,12 +1013,10 @@ void ILibDuktape_ScriptContainer_Process_SignalListener_PreSelect(void* object,
}
void ILibDuktape_ScriptContainer_Process_SignalListener_PostSelect(void* object, int slct, fd_set *readset, fd_set *writeset, fd_set *errorset)
{
int s;
int bytesRead = 0;
char sigbuffer[255];
ILibChain_Link *link = (ILibChain_Link*)object;
duk_context *ctx = (duk_context*)((void**)link->ExtraMemoryPtr)[0];
void *h = ((void**)link->ExtraMemoryPtr)[1];
char *tmp;
if (FD_ISSET(SignalDescriptors[0], readset))
@@ -1210,7 +1209,7 @@ duk_ret_t ILibDuktape_ScriptContainer_removeListenerSink(duk_context *ctx)
{
#ifdef _POSIX
struct sigaction action;
char *name = duk_require_string(ctx, 0);
char *name = (char*)duk_require_string(ctx, 0);
duk_push_this(ctx); // [process]
if (strcmp(name, "SIGCHLD") == 0 && ILibDuktape_EventEmitter_HasListenersEx(ctx, -1, "SIGCHLD")==0)

91
modules/clipboard.js
View File

@@ -74,7 +74,7 @@ function dispatchRead(sid)
id = sid;
}
if(id == 0)
if(id == 0 || (process.platform == 'linux' && require('clipboard').xclip))
{
return (module.exports.read());
}
@@ -134,9 +134,9 @@ function dispatchWrite(data, sid)
id = sid;
}
if(id == 0)
if (id == 0 || (process.platform == 'linux' && require('clipboard').xclip))
{
module.exports(data);
return(module.exports(data));
}
else
{
@@ -174,6 +174,40 @@ function dispatchWrite(data, sid)
}
}
function lin_xclip_readtext(ret)
{
var id;
try
{
id = require('user-sessions').consoleUid();
}
catch (e)
{
ret._rej(e);
return (ret);
}
var xinfo = require('monitor-info').getXInfo(id);
ret.child = require('child_process').execFile(require('clipboard').xclip, ['xlclip', '-selection', 'c', '-o'], { uid: id, env: xinfo.exportEnv() });
ret.child.promise = ret;
ret.child.stderr.str = ''; ret.child.stderr.on('data', function (c) { this.str += c.toString(); });
ret.child.stdout.str = ''; ret.child.stdout.on('data', function (c) { this.str += c.toString(); });
ret.child.on('exit', function ()
{
if (this.stderr.str != '')
{
this.promise._rej(this.stderr.str.trim());
}
else
{
this.promise._res(this.stdout.str);
}
});
return (ret);
}
function lin_readtext()
{
var ret = new promise(function (res, rej) { this._res = res; this._rej = rej; });
@@ -194,9 +228,13 @@ function lin_readtext()
}
else
{
if (require('clipboard').xclip)
{
lin_xclip_readtext(ret);
return (ret);
}
var GM = require('monitor-info')._gm;
ret._getInfoPromise = require('monitor-info').getInfo();
ret._getInfoPromise._masterPromise = ret;
ret._getInfoPromise.then(function (mon)
@@ -250,6 +288,35 @@ function lin_readtext()
}
return (ret);
}
function lin_xclip_copy(txt)
{
var ret = new promise(function (res, rej) { this._res = res; this._rej = rej; });
var id;
try
{
id = require('user-sessions').consoleUid();
}
catch(e)
{
ret._rej(e);
return (ret);
}
var xinfo = require('monitor-info').getXInfo(id);
ret.child = require('child_process').execFile(require('clipboard').xclip, ['xlclip', '-selection', 'c'], { uid: id, env: xinfo.exportEnv() });
ret.child.promise = ret;
ret.child.stderr.on('data', function (c) { console.log(c.toString()); });
ret.child.stdout.on('data', function (c) { console.log(c.toString()); });
ret.child.on('exit', function () { this.promise._res(); });
ret.child.stdin.write(txt, function ()
{
this.end();
});
return (ret);
}
function lin_copytext(txt)
{
var X11 = require('monitor-info')._X11;
@@ -259,6 +326,10 @@ function lin_copytext(txt)
}
else
{
if (require('clipboard').xclip)
{
return (lin_xclip_copy(txt));
}
var GM = require('monitor-info')._gm;
var ret = new promise(function (res, rej) { this._res = res; this._rej = rej; });
ret._txt = txt;
@@ -425,6 +496,16 @@ switch(process.platform)
case 'linux':
module.exports = lin_copytext;
module.exports.read = lin_readtext;
Object.defineProperty(module.exports, "xclip", {
value: (function ()
{
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });
child.stdin.write("whereis xclip | awk '{ print $2; }'\nexit\n");
child.waitExit();
return (child.stdout.str.trim() != "" ? child.stdout.str.trim() : null);
})()
});
break;
case 'darwin':
break;