fix timer issues (esp clock not updating on multiple screens)

1 files changed, 8 insertions, 6 deletions

diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 773d5b8..189c2af 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -74,12 +74,14 @@ public:
     /// update all timers
     static void updateTimers(int file_descriptor);
 
-    inline int isTiming() const { return m_timing; }
-    inline int getInterval() const { return m_interval; }
-    inline int doOnce() const { return m_once; }
+    int isTiming() const { return m_timing; }
+    int getInterval() const { return m_interval; }
     
-    inline const timeval &getTimeout() const { return m_timeout; }
-    inline const timeval &getStartTime() const { return m_start; }
+    int doOnce() const { return m_once; }
+    
+    const timeval &getTimeout() const { return m_timeout; }
+    const timeval &getStartTime() const { return m_start; }
+    void makeEndTime(timeval &tm) const;
 
 protected:
     /// force a timeout
@@ -92,7 +94,7 @@ private:
     static void removeTimer(Timer *timer);
         
     typedef std::list<Timer *> TimerList;
-    static TimerList m_timerlist; ///< list of all timers
+    static TimerList m_timerlist; ///< list of all timers, sorted by next trigger time (start + timeout)
         
     RefCount<Command> m_handler; ///< what to do on a timeout