X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9f34bd86d0dc2c2ea51fe9aa54533aa68cfadc64..e714c0719330427ea0b420e877de8605d81364c7:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 54b4063b..cf973c89 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -16,12 +16,18 @@ class eApplication;
 
 extern eApplication* eApp;
 
+#ifndef SWIG
 	/* TODO: remove these inlines. */
 static inline bool operator<( const timeval &t1, const timeval &t2 )
 {
 	return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec);
 }
 
+static inline bool operator<=( const timeval &t1, const timeval &t2 )
+{
+	return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec <= t2.tv_usec);
+}
+
 static inline timeval &operator+=( timeval &t1, const timeval &t2 )
 {
 	t1.tv_sec += t2.tv_sec;
@@ -118,6 +124,7 @@ static inline int timeval_to_usec(const timeval &t1)
 {
 	return t1.tv_sec*1000000 + t1.tv_usec;
 }
+#endif
 
 class eMainloop;
 
@@ -170,23 +177,29 @@ class eMainloop
 	friend class eSocketNotifier;
 	std::map<int, eSocketNotifier*> notifiers;
 	ePtrList<eTimer> m_timer_list;
-	bool app_exit_loop;
 	bool app_quit_now;
 	int loop_level;
-	void processOneEvent();
+	int processOneEvent(unsigned int user_timeout, PyObject **res=0, PyObject *additional=0);
 	int retval;
 	pthread_mutex_t recalcLock;
-public:
-	static void addTimeOffset(int offset);
+	
+	int m_now_is_invalid;
+	int m_interrupt_requested;
  	void addSocketNotifier(eSocketNotifier *sn);
 	void removeSocketNotifier(eSocketNotifier *sn);
 	void addTimer(eTimer* e);
 	void removeTimer(eTimer* e);
+public:
+	static void addTimeOffset(int offset);
 
+#ifndef SWIG
 	static ePtrList<eMainloop> existing_loops;
+#endif
+
 	eMainloop()
-		:app_quit_now(0),loop_level(0),retval(0)
+		:app_quit_now(0),loop_level(0),retval(0), m_interrupt_requested(0)
 	{
+		m_now_is_invalid = 0;
 		existing_loops.push_back(this);
 		pthread_mutex_init(&recalcLock, 0);
 	}
@@ -197,11 +210,25 @@ public:
 	}
 	int looplevel() { return loop_level; }
 
-		/* OBSOLETE. DONT USE. */
-	int exec();  // recursive enter the loop
+#ifndef SWIG
 	void quit(int ret=0); // leave all pending loops (recursive leave())
-	void enter_loop();
-	void exit_loop();
+#endif
+
+		/* a user supplied timeout. enter_loop will return with:
+		  0 - no timeout, no signal
+		  1 - timeout
+		  2 - signal
+		*/
+	int iterate(unsigned int timeout=0, PyObject **res=0, PyObject *additional=0);
+		
+		/* run will iterate endlessly until the app is quit, and return
+		   the exit code */
+	int runLoop();
+	
+		/* our new shared polling interface. */
+	PyObject *poll(PyObject *dict, PyObject *timeout);
+	void interruptPoll();
+	void reset();
 };
 
 /**
@@ -238,6 +265,7 @@ class eTimer
 	long interval;
 	bool bSingleShot;
 	bool bActive;
+	void addTimeOffset(int);
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -257,8 +285,9 @@ public:
 	void start(long msec, bool b=false);
 	void stop();
 	void changeInterval(long msek);
+#ifndef SWIG
 	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+#endif
 	void startLongTimer( int seconds );
-	void addTimeOffset(int);
 };
 #endif