X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7c12c1089cfbee5b0a390d5f3de37f85de210263..ffa2904fdef579b0f7f9e9cf20eecbd1d997ac48:/lib/python/enigma_python.i

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 15bc16e2..ae8bf92d 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -1,22 +1,86 @@
+/*
+  NOTE: you have two options when adding classes so that
+  they are callable *from* python.
+  
+   - either you %include the header file
+   - or you re-declare it
+   
+  In both cases, you must #include the required
+  header file (i.e. the header file itself), otherwise
+  enigma_python_wrap.cxx won't build.
+  
+	In case you import the whole header file,
+	please make sure that no unimportant stuff
+	is wrapped, as this makes the wrapper stuff
+	much more complex and it can probably break 
+	very easily because of missing typemaps etc.
+	
+	you could make use of dizzy macros to ensure
+	that some stuff is left out when parsed as SWIG
+	definitions, but be sure to not modify the binary 
+	representation. DON'T USE #ifdef SWIG_COMPILE
+	for leaving out stuff (unless you *really* know
+	what you are doing,of course!). you WILL break it.
+		
+	The better way (with more work) is to re-declare
+	the class. It won't be compiled, so you can
+	leave out stuff as you like.
+
+
+
+Oh, things like "operator= is private in this context" etc.
+is usually caused by not marking PSignals as immutable. 
+*/
+
 %module enigma
 %{
+
 #define SWIG_COMPILE
+#include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
 #include <lib/base/eerror.h>
 #include <lib/base/econfig.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
+#include <lib/service/event.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/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/nav/pcore.h>
+#include <lib/actions/action.h>
+#include <lib/gdi/gfont.h>
+#include <lib/gdi/epng.h>
+
+extern void runMainloop();
+extern void quitMainloop();
+
+extern PSignal1<void,int> &keyPressedSignal();
 %}
 
+%feature("ref")   iObject "$this->AddRef(); eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); "
+%feature("unref") iObject "$this->Release(); eDebug(\"Release! %s:%d\", __FILE__, __LINE__); "
+
+%newobject eDebugClassPtr::operator->;
+
 #define DEBUG
+%include "typemaps.i"
 %include "stl.i"
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
@@ -24,9 +88,16 @@
 %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 pNavigation::m_event;
 
 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
@@ -34,10 +105,33 @@
 %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/service/listboxservice.h>
+%include <lib/components/scan.h>
+%include <lib/nav/pcore.h>
+%include <lib/actions/action.h>
+%include <lib/gdi/gfont.h>
+%include <lib/gdi/epng.h>
+
+%include <lib/gdi/gpixmap.h>
+/**************  eptr  **************/
+
+%template(eActionMapPtr) ePtr<eActionMap>;
+%apply eActionMapPtr OUTPUT { eActionMapPtr &ptr }
+%apply eActionMap* *OUTPUT { eActionMap **ptr }
+
+/**************  signals  **************/
 
 template<class R> class PSignal0
 {
@@ -69,3 +163,25 @@ public:
 	$1 = $input->get();
 }
 
+/**************  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();
+%immutable keyPressed;
+PSignal1<void,int> &keyPressedSignal();
+