add eConsoleAppContainer to execute shell scripts or applications from python without...

[enigma2.git] / lib / python / enigma_python.i

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 483bfb62ef75604c05eced0f1e265ce3d324d01e..42315ce78663de05314dbd6f87786cae79664e59 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -39,13 +39,12 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
 #include <lib/base/eerror.h>
 #include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
 #include <lib/base/eerror.h>

-#include <lib/base/econfig.h>
+#include <lib/base/console.h>

 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
 #include <lib/service/event.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
 #include <lib/service/event.h>

-
+#include <lib/gdi/font.h>

 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/gpixmap.h>

-

 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>
 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>


@@ -59,24 +58,35 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/ewindowstyleskinned.h>
 #include <lib/gui/ewidgetanimation.h>
 #include <lib/gui/eslider.h>
 #include <lib/gui/ewindowstyleskinned.h>
 #include <lib/gui/ewidgetanimation.h>
 #include <lib/gui/eslider.h>

+#include <lib/gui/epositiongauge.h>

 #include <lib/python/connections.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
 #include <lib/components/scan.h>
 #include <lib/python/connections.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
 #include <lib/components/scan.h>

+#include <lib/components/listboxepg.h>

 #include <lib/nav/pcore.h>
 #include <lib/actions/action.h>
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>
 #include <lib/nav/pcore.h>
 #include <lib/actions/action.h>
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>

+#include <lib/dvb/db.h>

 #include <lib/dvb/volume.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/volume.h>
 #include <lib/dvb/sec.h>

+#include <lib/dvb/epgcache.h>
+#include <lib/dvb/frontendparms.h>
+#include <lib/dvb/dvbtime.h>

 #include <lib/driver/avswitch.h>
 #include <lib/driver/rfmod.h>
 #include <lib/driver/avswitch.h>
 #include <lib/driver/rfmod.h>

+#include <lib/driver/etimezone.h>
+#include <lib/gdi/lcd.h>
+#include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/python/python.h>

 
 extern void runMainloop();
 
 extern void runMainloop();

-extern void quitMainloop();
+extern void quitMainloop(int exit_code);

 extern void setLCD(const char *c);
 extern void setLCDClock(const char *c);
 extern void setLCD(const char *c);
 extern void setLCDClock(const char *c);

+extern eApplication *getApplication();

 
 extern PSignal1<void,int> &keyPressedSignal();
 %}
 
 extern PSignal1<void,int> &keyPressedSignal();
 %}


@@ -110,12 +120,16 @@ extern PSignal1<void,int> &keyPressedSignal();
 
 
 #define DEBUG
 
 
 #define DEBUG

+typedef long time_t;

 %include "typemaps.i"
 %include "stl.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
 %include "typemaps.i"
 %include "stl.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>

-%include <lib/base/econfig.h>
+
+%immutable eTimer::timeout;
+%immutable eSocketNotifier::activated;
+%include <lib/base/ebase.h>

 %include <lib/base/smartptr.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>
 %include <lib/base/smartptr.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>


@@ -125,11 +139,19 @@ extern PSignal1<void,int> &keyPressedSignal();
 
 
 // TODO: embed these...
 
 
 // TODO: embed these...

+%immutable eConsoleAppContainer::appClosed;
+%immutable eConsoleAppContainer::dataAvail;
+%immutable eConsoleAppContainer::dataSent;

 %immutable eButton::selected;
 %immutable eInput::changed;
 %immutable eComponentScan::statusChanged;
 %immutable eButton::selected;
 %immutable eInput::changed;
 %immutable eComponentScan::statusChanged;

+%immutable eComponentScan::newService;

 %immutable pNavigation::m_event;
 %immutable pNavigation::m_event;

+%immutable eListbox::selectionChanged;

 
 

+%include <lib/base/console.h>
+%include <lib/gdi/font.h>
+%include <lib/gdi/gpixmap.h>

 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>
 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>


@@ -143,6 +165,7 @@ extern PSignal1<void,int> &keyPressedSignal();
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>

+%include <lib/gui/epositiongauge.h>

 %include <lib/gui/ewidgetdesktop.h>
 %include <lib/gui/elistbox.h>
 %include <lib/gui/elistboxcontent.h>
 %include <lib/gui/ewidgetdesktop.h>
 %include <lib/gui/elistbox.h>
 %include <lib/gui/elistboxcontent.h>


@@ -151,21 +174,26 @@ extern PSignal1<void,int> &keyPressedSignal();
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/service/listboxservice.h>
 %include <lib/components/scan.h>
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/service/listboxservice.h>
 %include <lib/components/scan.h>

+%include <lib/components/listboxepg.h>

 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/gdi/epng.h>
 %include <lib/dvb/volume.h>
 %include <lib/dvb/sec.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/gdi/epng.h>
 %include <lib/dvb/volume.h>
 %include <lib/dvb/sec.h>

+%include <lib/dvb/epgcache.h>
+%include <lib/dvb/frontendparms.h>
+%include <lib/dvb/dvbtime.h>

 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>
 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>

-
-%include <lib/gdi/gpixmap.h>
+%include <lib/driver/etimezone.h>
+%include <lib/gdi/lcd.h>
+%include <lib/dvb_ci/dvbci_ui.h>
+%include <lib/dvb/db.h>
+%include <lib/python/python.h>

 /**************  eptr  **************/
 
 %template(eActionMapPtr) ePtr<eActionMap>;
 /**************  eptr  **************/
 
 %template(eActionMapPtr) ePtr<eActionMap>;

-%apply eActionMapPtr OUTPUT { eActionMapPtr &ptr }
-%apply eActionMap* *OUTPUT { eActionMap **ptr }

 
 /**************  signals  **************/
 
 
 /**************  signals  **************/
 


@@ -175,13 +203,13 @@ public:
        PyObject *get();
 };
 
        PyObject *get();
 };
 

-template<class R, class P0> class PSignal1
-{
-public:
-       PyObject *get();
-};
+%template(PSignal0V) PSignal0<void>;

 
 

-template<class R, class P0, class P1> class PSignal2
+%typemap(out) PSignal0V {
+       $1 = $input->get();
+}
+
+template<class R, class P0> class PSignal1

 {
 public:
        PyObject *get();
 {
 public:
        PyObject *get();


@@ -193,33 +221,56 @@ public:
        $1 = $input->get();
 }
 
        $1 = $input->get();
 }
 

-%template(PSignal0V) PSignal0<void>;
+template<class R, class P0> class PSignal1Str
+{
+public:
+       PyObject *get();
+};

 
 

-%typemap(out) PSignal0V {
+%template(PSignal1VS) PSignal1Str<void,const char*>;
+
+%typemap(out) PSignal1VS {

        $1 = $input->get();
 }
 
        $1 = $input->get();
 }
 

-/**************  base  **************/
-
-%immutable eTimer::timeout;
-
-class eTimer
+template<class R, class P0, class P1> class PSignal2

 {
 public:
 {
 public:

-       eTimer(eMainloop *context = eApp);
-       PSignal0<void> timeout;
-
-       void start(long msec, bool singleShot=false);
-       void stop();
-       void changeInterval(long msek);
+       PyObject *get();

 };
 
 /**************  debug  **************/
 
 void runMainloop();
 };
 
 /**************  debug  **************/
 
 void runMainloop();

-void quitMainloop();
+void quitMainloop(int exit_code);

 void setLCD(const char*);
 void setLCDClock(const char*);
 void setLCD(const char*);
 void setLCDClock(const char*);

+eApplication *getApplication();

 %immutable keyPressed;
 PSignal1<void,int> &keyPressedSignal();
 
 %immutable keyPressed;
 PSignal1<void,int> &keyPressedSignal();
 

+%{
+RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
+{      
+       ePtr<gPixmap> *res;
+
+       res = 0;
+       result = 0;
+       if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrTgPixmap_t, SWIG_POINTER_EXCEPTION | 0))
+               return -1;
+       if (!res)
+               return -1;
+       result = *res;
+       return 0;
+}
+PyObject *New_TestObj()
+{
+    TestObj *result = (TestObj *)new TestObj();
+    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
+}
+PyObject *New_eServiceReference(const eServiceReference &ref)
+{
+    eServiceReference *result = new eServiceReference(ref);
+    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_eServiceReference, 1);
+}
+%}