git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
encoding.conf: add some polish two byte encoding transponders... thanks to Jarex
[enigma2.git]
/
lib
/
base
/
console.h
diff --git
a/lib/base/console.h
b/lib/base/console.h
index ddfd82a9d9d4ea7a298066d63e5b9cce68063064..e730b40ee97a5dd4c023ad6176fe22b85bcb2e22 100644
(file)
--- a/
lib/base/console.h
+++ b/
lib/base/console.h
@@
-1,46
+1,53
@@
#ifndef __LIB_BASE_CONSOLE_H__
#define __LIB_BASE_CONSOLE_H__
#ifndef __LIB_BASE_CONSOLE_H__
#define __LIB_BASE_CONSOLE_H__
+#include "Python.h"
#include <string>
#include <lib/base/ebase.h>
#include <lib/python/connections.h>
#include <queue>
#include <string>
#include <lib/base/ebase.h>
#include <lib/python/connections.h>
#include <queue>
-#ifndef SWIG
struct queue_data
{
queue_data( char *data, int len )
struct queue_data
{
queue_data( char *data, int len )
- :data(data), len(len)
+ :data(data), len(len)
, dataSent(0)
{
}
char *data;
int len;
{
}
char *data;
int len;
+ int dataSent;
};
};
-#endif
-class eConsoleAppContainer: public Object
+class eConsoleAppContainer: public Object
, public iObject
{
{
-#ifndef SWIG
+ DECLARE_REF(eConsoleAppContainer);
int fd[3];
int fd[3];
+ int filefd[3];
int pid;
int killstate;
int pid;
int killstate;
+ std::string m_cwd;
std::queue<struct queue_data> outbuf;
std::queue<struct queue_data> outbuf;
- e
SocketNotifier *in, *out, *
err;
+ e
Ptr<eSocketNotifier> in, out,
err;
void readyRead(int what);
void readyErrRead(int what);
void readyWrite(int what);
void closePipes();
void readyRead(int what);
void readyErrRead(int what);
void readyWrite(int what);
void closePipes();
-#endif
public:
eConsoleAppContainer();
public:
eConsoleAppContainer();
- int execute( const std::string &str );
~eConsoleAppContainer();
~eConsoleAppContainer();
+ int setCWD( const char *path );
+ int execute( const char *str );
+ int execute( const char *cmdline, const char *const argv[] );
int getPID() { return pid; }
void kill();
void sendCtrlC();
int getPID() { return pid; }
void kill();
void sendCtrlC();
+ void sendEOF();
void write( const char *data, int len );
void write( const char *data, int len );
+ void setFileFD(int num, int fd) { if (num >= 0 && num <= 2) filefd[num] = fd; }
bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
PSignal1<void, const char*> dataAvail;
bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
PSignal1<void, const char*> dataAvail;
+ PSignal1<void, const char*> stdoutAvail;
+ PSignal1<void, const char*> stderrAvail;
PSignal1<void,int> dataSent;
PSignal1<void,int> appClosed;
};
PSignal1<void,int> dataSent;
PSignal1<void,int> appClosed;
};