From 373de009f7e98b0c6f3a78f31c1e5c120cd722ed Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 3 Nov 2002 12:48:10 +0000 Subject: [PATCH] new timers, timer manager --- otk/image.hh | 2 +- otk/imagecontrol.cc | 2 +- src/blackbox.cc | 12 +----------- src/blackbox.hh | 7 ++----- src/openbox.cc | 39 +-------------------------------------- src/openbox.hh | 6 ++++++ src/timer.cc | 38 +++++++++++++++++++------------------- src/timer.hh | 30 +++++++++++++++++------------- src/window.cc | 2 +- src/window.hh | 2 +- 10 files changed, 50 insertions(+), 90 deletions(-) diff --git a/otk/image.hh b/otk/image.hh index eedd6512..ac5794b5 100644 --- a/otk/image.hh +++ b/otk/image.hh @@ -116,7 +116,7 @@ public: private: bool dither; const ScreenInfo *screeninfo; - ob::BTimer *timer; + ob::OBTimer *timer; Colormap colormap; diff --git a/otk/imagecontrol.cc b/otk/imagecontrol.cc index 062c959d..7120f1cf 100644 --- a/otk/imagecontrol.cc +++ b/otk/imagecontrol.cc @@ -58,7 +58,7 @@ BImageControl::BImageControl(const ScreenInfo *scrn, timer->setTimeout(cache_timeout); timer->start();*/ } else { - timer = (ob::BTimer *) 0; + timer = (ob::OBTimer *) 0; } colors = (XColor *) 0; diff --git a/src/blackbox.cc b/src/blackbox.cc index a845431a..e5e498a3 100644 --- a/src/blackbox.cc +++ b/src/blackbox.cc @@ -158,7 +158,7 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc) reconfigure_wait = False; - timer = new BTimer(this, this); + timer = new OBTimer(this); timer->setTimeout(0l); } @@ -1215,14 +1215,4 @@ void Blackbox::setFocusedWindow(BlackboxWindow *win) { } -void Blackbox::addTimer(BTimer *timer) { - (void)timer; -} - - -void Blackbox::removeTimer(BTimer *timer) { - (void)timer; -} - - } diff --git a/src/blackbox.hh b/src/blackbox.hh index 71acf513..947c0a99 100644 --- a/src/blackbox.hh +++ b/src/blackbox.hh @@ -69,7 +69,7 @@ class Blackbox; class BlackboxWindow; class BWindowGroup; -class Blackbox : public Openbox, public TimeoutHandler, public TimerQueueManager { +class Blackbox : public Openbox, public TimeoutHandler { private: struct BCursor { Cursor session, move, ll_angle, lr_angle, ul_angle, ur_angle; @@ -109,7 +109,7 @@ private: BScreen *active_screen; BlackboxWindow *focused_window, *changing_window; - BTimer *timer; + OBTimer *timer; Configuration config; XAtom *xatom; @@ -216,9 +216,6 @@ public: virtual void timeout(void); enum { B_AmericanDate = 1, B_EuropeanDate }; - - virtual void addTimer(BTimer *timer); - virtual void removeTimer(BTimer *timer); }; } diff --git a/src/openbox.cc b/src/openbox.cc index 440c4f70..1af59c25 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -208,50 +208,13 @@ void Openbox::showHelp() void Openbox::eventLoop() { - const int xfd = ConnectionNumber(otk::OBDisplay::display); - while (_state == State_Normal) { if (XPending(otk::OBDisplay::display)) { XEvent e; XNextEvent(otk::OBDisplay::display, &e); process_event(&e); } else { - fd_set rfds; - timeval now, tm, *timeout = (timeval *) 0; - - FD_ZERO(&rfds); - FD_SET(xfd, &rfds); - -/* if (! timerList.empty()) { - const BTimer* const timer = timerList.top(); - - gettimeofday(&now, 0); - tm = timer->timeRemaining(now); - - timeout = &tm; - } - - select(xfd + 1, &rfds, 0, 0, timeout); - - // check for timer timeout - gettimeofday(&now, 0); - - // there is a small chance for deadlock here: - // *IF* the timer list keeps getting refreshed *AND* the time between - // timer->start() and timer->shouldFire() is within the timer's period - // then the timer will keep firing. This should be VERY near impossible. - while (! timerList.empty()) { - BTimer *timer = timerList.top(); - if (! timer->shouldFire(now)) - break; - - timerList.pop(); - - timer->fireTimeout(); - timer->halt(); - if (timer->isRecurring()) - timer->start(); - }*/ + _timermanager.fire(); } } } diff --git a/src/openbox.hh b/src/openbox.hh index 96cb2158..4649f7a9 100644 --- a/src/openbox.hh +++ b/src/openbox.hh @@ -10,6 +10,7 @@ extern "C" { #include #include "otk/screeninfo.hh" +#include "timer.hh" namespace ob { @@ -34,6 +35,9 @@ private: char *_displayreq; // display requested by the user char *_argv0; // argv[0], how the program was called + OBTimerQueueManager _timermanager; // manages timers, so that they fire when + // their time elapses + RunState _state; // the state of the window manager ScreenInfoList _screenInfoList; // info for all screens on the display @@ -58,6 +62,8 @@ public: //! Returns the state of the window manager (starting, exiting, etc). inline RunState state() const { return _state; } + inline OBTimerQueueManager *timerManager() { return &_timermanager; } + void eventLoop(); // XXX: TEMPORARY!#!@%*!^#*!#!#! diff --git a/src/timer.cc b/src/timer.cc index 9066fd01..856ac8f7 100644 --- a/src/timer.cc +++ b/src/timer.cc @@ -5,66 +5,66 @@ #endif // HAVE_CONFIG_H #include "otk/display.hh" +#include "openbox.hh" #include "timer.hh" #include "util.hh" namespace ob { -BTimer::BTimer(OBTimerQueueManager *m, TimeoutHandler *h) { - manager = m; +OBTimer::OBTimer(TimeoutHandler *h) { handler = h; recur = timing = False; } -BTimer::~BTimer(void) { +OBTimer::~OBTimer(void) { if (timing) stop(); } -void BTimer::setTimeout(long t) { +void OBTimer::setTimeout(long t) { _timeout.tv_sec = t / 1000; _timeout.tv_usec = t % 1000; _timeout.tv_usec *= 1000; } -void BTimer::setTimeout(const timeval &t) { +void OBTimer::setTimeout(const timeval &t) { _timeout.tv_sec = t.tv_sec; _timeout.tv_usec = t.tv_usec; } -void BTimer::start(void) { +void OBTimer::start(void) { gettimeofday(&_start, 0); if (! timing) { timing = True; - manager->addTimer(this); + Openbox::instance->timerManager()->addTimer(this); } } -void BTimer::stop(void) { +void OBTimer::stop(void) { timing = False; - manager->removeTimer(this); + Openbox::instance->timerManager()->removeTimer(this); } -void BTimer::halt(void) { +void OBTimer::halt(void) { timing = False; } -void BTimer::fireTimeout(void) { +void OBTimer::fireTimeout(void) { if (handler) handler->timeout(); } -timeval BTimer::timeRemaining(const timeval &tm) const { +timeval OBTimer::timeRemaining(const timeval &tm) const { timeval ret = endpoint(); ret.tv_sec -= tm.tv_sec; @@ -74,7 +74,7 @@ timeval BTimer::timeRemaining(const timeval &tm) const { } -timeval BTimer::endpoint(void) const { +timeval OBTimer::endpoint(void) const { timeval ret; ret.tv_sec = _start.tv_sec + _timeout.tv_sec; @@ -84,7 +84,7 @@ timeval BTimer::endpoint(void) const { } -bool BTimer::shouldFire(const timeval &tm) const { +bool OBTimer::shouldFire(const timeval &tm) const { timeval end = endpoint(); return ! ((tm.tv_sec < end.tv_sec) || @@ -92,7 +92,7 @@ bool BTimer::shouldFire(const timeval &tm) const { } -void OBTimerQueueManager::go() +void OBTimerQueueManager::fire() { fd_set rfds; timeval now, tm, *timeout = (timeval *) 0; @@ -103,7 +103,7 @@ void OBTimerQueueManager::go() FD_SET(xfd, &rfds); // break on any x events if (! timerList.empty()) { - const BTimer* const timer = timerList.top(); + const OBTimer* const timer = timerList.top(); gettimeofday(&now, 0); tm = timer->timeRemaining(now); @@ -121,7 +121,7 @@ void OBTimerQueueManager::go() // timer->start() and timer->shouldFire() is within the timer's period // then the timer will keep firing. This should be VERY near impossible. while (! timerList.empty()) { - BTimer *timer = timerList.top(); + OBTimer *timer = timerList.top(); if (! timer->shouldFire(now)) break; @@ -135,13 +135,13 @@ void OBTimerQueueManager::go() } -void OBTimerQueueManager::addTimer(BTimer *timer) +void OBTimerQueueManager::addTimer(OBTimer *timer) { assert(timer); timerList.push(timer); } -void OBTimerQueueManager::removeTimer(BTimer* timer) +void OBTimerQueueManager::removeTimer(OBTimer* timer) { assert(timer); timerList.release(timer); diff --git a/src/timer.hh b/src/timer.hh index 2eb5065f..774d0e49 100644 --- a/src/timer.hh +++ b/src/timer.hh @@ -29,20 +29,19 @@ public: virtual void timeout(void) = 0; }; -class BTimer { +class OBTimer { private: - OBTimerQueueManager *manager; TimeoutHandler *handler; bool timing, recur; timeval _start, _timeout; - BTimer(const BTimer&); - BTimer& operator=(const BTimer&); + OBTimer(const OBTimer&); + OBTimer& operator=(const OBTimer&); public: - BTimer(OBTimerQueueManager *m, TimeoutHandler *h); - virtual ~BTimer(void); + OBTimer(TimeoutHandler *h); + virtual ~OBTimer(void); void fireTimeout(void); @@ -65,7 +64,7 @@ public: void stop(void); // manager releases timer void halt(void); // halts the timer - bool operator<(const BTimer& other) const + bool operator<(const OBTimer& other) const { return shouldFire(other.endpoint()); } }; @@ -95,12 +94,13 @@ private: }; struct TimerLessThan { - bool operator()(const BTimer* const l, const BTimer* const r) const { + bool operator()(const OBTimer* const l, const OBTimer* const r) const { return *r < *l; } }; -typedef _timer_queue, TimerLessThan> TimerQueue; +typedef _timer_queue, TimerLessThan> TimerQueue; class OBTimerQueueManager { private: @@ -108,11 +108,15 @@ private: public: OBTimerQueueManager() {} virtual ~OBTimerQueueManager() {} + + //! Will wait for and fire the next timer in the queue. + /*! + The function will stop waiting if an event is received from the X server. + */ + virtual void fire(); - virtual void go(); - - virtual void addTimer(BTimer* timer); - virtual void removeTimer(BTimer* timer); + virtual void addTimer(OBTimer* timer); + virtual void removeTimer(OBTimer* timer); }; } diff --git a/src/window.cc b/src/window.cc index 94589a2d..2e7ba087 100644 --- a/src/window.cc +++ b/src/window.cc @@ -135,7 +135,7 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) { lastButtonPressTime = 0; - timer = new BTimer(blackbox, this); + timer = new OBTimer(this); timer->setTimeout(blackbox->getAutoRaiseDelay()); // get size, aspect, minimum/maximum size and other hints set by the diff --git a/src/window.hh b/src/window.hh index 4070cffe..c8ccc341 100644 --- a/src/window.hh +++ b/src/window.hh @@ -105,7 +105,7 @@ private: Blackbox *blackbox; BScreen *screen; XAtom *xatom; - BTimer *timer; + OBTimer *timer; BlackboxAttributes blackbox_attrib; Time lastButtonPressTime; // used for double clicks, when were we clicked -- 2.39.2