X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cd621fe499141885e5a0d8b4e42a0f8a7f41a9ac..37834a1d83f2586c5b4a5a49afd0146c73713037:/lib/python/enigma_python.i

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index ae15d0d9..35290230 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -29,18 +29,12 @@
 
 
 Oh, things like "operator= is private in this context" etc.
-is usually caused by not marking PSignals as immutable.
-
+is usually caused by not marking PSignals as immutable. 
 */
 
-%define RefCount(...)
-%typemap(newfree) __VA_ARGS__ * { eDebug("adding ref"); $1->AddRef(); }
-%extend __VA_ARGS__  { ~__VA_ARGS__() { eDebug("removing ref!"); self->Release(); } }
-%ignore __VA_ARGS__::~__VA_ARGS__();
-%enddef
-
 %module enigma
 %{
+
 #define SWIG_COMPILE
 #include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
@@ -48,48 +42,155 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/base/econfig.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/gui/ewidget.h>
 #include <lib/gui/elabel.h>
+#include <lib/gui/einput.h>
+#include <lib/gui/einputstring.h>
+#include <lib/gui/einputnumber.h>
+#include <lib/gui/epixmap.h>
 #include <lib/gui/ebutton.h>
 #include <lib/gui/ewindow.h>
 #include <lib/gui/ewidgetdesktop.h>
+#include <lib/gui/ewindowstyle.h>
+#include <lib/gui/ewindowstyleskinned.h>
+#include <lib/gui/ewidgetanimation.h>
 #include <lib/gui/eslider.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/dvb/db.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/etimezone.h>
+#include <lib/gdi/lcd.h>
+#include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/python/python.h>
 
 extern void runMainloop();
+extern void quitMainloop(int exit_code);
+extern void setLCD(const char *c);
+extern void setLCDClock(const char *c);
+extern eApplication *getApplication();
 
 extern PSignal1<void,int> &keyPressedSignal();
 %}
 
-RefCount(eListboxPythonStringContent)
+%feature("ref")   iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
+%feature("unref") iObject "$this->Release(); /* eDebug(\"Release! %s:%d\", __FILE__, __LINE__); */ "
+
+
+/* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */
+
+%define %typemap_output_simple(Type)
+ %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp),
+              Type &OUTPUT ($*1_ltype temp)
+   "$1 = new Type;";
+ %fragment("t_out_helper"{Type},"header",
+     fragment="t_output_helper") {}
+ %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT
+   "$result = t_output_helper($result, (SWIG_NewPointerObj((void*)($1), $1_descriptor, 1)));"
+%enddef
+
+%define %typemap_output_ptr(Type)
+ %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp),
+              Type &OUTPUT ($*1_ltype temp)
+   "$1 = new Type;";
+ %fragment("t_out_helper"{Type},"header",
+     fragment="t_output_helper") {}
+ %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT
+		// generate None if smartpointer is NULL
+   "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (Py_INCREF(Py_None), Py_None)));"
+%enddef
+
 
 #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 <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>
+
 %template(eServiceCenterPtr) ePtr<eServiceCenter>;
+%include <lib/service/event.h>
+
 
+// TODO: embed these...
 %immutable eButton::selected;
+%immutable eInput::changed;
+%immutable eComponentScan::statusChanged;
+%immutable eComponentScan::newService;
+%immutable pNavigation::m_event;
+%immutable eListbox::selectionChanged;
 
+%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/region.h>
 %include <lib/gui/ewidget.h>
 %include <lib/gui/elabel.h>
+%include <lib/gui/einput.h>
+%include <lib/gui/einputstring.h>
+%include <lib/gui/einputnumber.h>
+%include <lib/gui/epixmap.h>
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>
 %include <lib/gui/ewidgetdesktop.h>
 %include <lib/gui/elistbox.h>
 %include <lib/gui/elistboxcontent.h>
+%include <lib/gui/ewindowstyle.h>
+%include <lib/gui/ewindowstyleskinned.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/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/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>;
+
+/**************  signals  **************/
 
 template<class R> class PSignal0
 {
@@ -122,23 +223,38 @@ public:
 }
 
 
-/**************  base  **************/
-
-%immutable eTimer::timeout;
-
-class eTimer
-{
-public:
-	eTimer(eMainloop *context = eApp);
-	PSignal0<void> timeout;
-
-	void start(long msec, bool singleShot=false);
-	void stop();
-	void changeInterval(long msek);
-};
-
 /**************  debug  **************/
 
 void runMainloop();
+void quitMainloop(int exit_code);
+void setLCD(const char*);
+void setLCDClock(const char*);
+eApplication *getApplication();
 %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);
+}
+%}