#include "i18n.h"
#include "BaseDisplay.h"
-#include "LinkedList.h"
#include "Timer.h"
+#include <algorithm>
+
// X error handler to handle any and all X errors while the application is
// running
static Bool internal_error = False;
XSetErrorHandler((XErrorHandler) handleXErrors);
- timerList = new LinkedList<BTimer>;
-
- screenInfoList = new LinkedList<ScreenInfo>;
- for (int i = 0; i < number_of_screens; i++) {
- ScreenInfo *screeninfo = new ScreenInfo(*this, i);
- screenInfoList->insert(screeninfo);
- }
+ screenInfoList.reserve(ScreenCount(display));
+ for (int i = 0; i < number_of_screens; i++)
+ screenInfoList.push_back(new ScreenInfo(*this, i));
#ifndef NOCLOBBER
NumLockMask = ScrollLockMask = 0;
BaseDisplay::~BaseDisplay(void) {
- while (screenInfoList->count()) {
- ScreenInfo *si = screenInfoList->first();
-
- screenInfoList->remove(si);
- delete si;
- }
-
- delete screenInfoList;
-
+ std::for_each(screenInfoList.begin(), screenInfoList.end(),
+ PointerAssassin());
// we don't create the BTimers, we don't delete them
- while (timerList->count())
- timerList->remove(0);
-
- delete timerList;
if (application_name != NULL)
delete [] application_name;
FD_ZERO(&rfds);
FD_SET(xfd, &rfds);
- if (timerList->count()) {
+ if (!timerList.empty()) {
gettimeofday(&now, 0);
tm.tv_sec = tm.tv_usec = 0l;
- BTimer *timer = timerList->first();
+ BTimer *timer = timerList.front();
+ ASSERT(timer != NULL);
tm.tv_sec = timer->getStartTime().tv_sec +
timer->getTimeout().tv_sec - now.tv_sec;
// check for timer timeout
gettimeofday(&now, 0);
- LinkedListIterator<BTimer> it(timerList);
- for(BTimer *timer = it.current(); timer; it++, timer = it.current()) {
+ TimerList::iterator it;
+ for (it = timerList.begin(); it != timerList.end(); ) {
+ BTimer *timer = *it;
+ ++it; // the timer may be removed from the list, so move ahead now
+ ASSERT(timer != NULL);
tm.tv_sec = timer->getStartTime().tv_sec +
timer->getTimeout().tv_sec;
tm.tv_usec = timer->getStartTime().tv_usec +
timer->fireTimeout();
// restart the current timer so that the start time is updated
- if (! timer->doOnce()) timer->start();
- else timer->stop();
+ if (! timer->doOnce())
+ timer->start();
+ else {
+ timer->stop();
+// delete timer; // USE THIS?
+ }
}
}
}
void BaseDisplay::addTimer(BTimer *timer) {
- if (! timer) return;
+ ASSERT(timer != (BTimer *) 0);
- LinkedListIterator<BTimer> it(timerList);
- int index = 0;
- for (BTimer *tmp = it.current(); tmp; it++, index++, tmp = it.current())
+ TimerList::iterator it;
+ for (it = timerList.begin(); it != timerList.end(); ++it) {
+ BTimer *tmp = *it;
if ((tmp->getTimeout().tv_sec > timer->getTimeout().tv_sec) ||
((tmp->getTimeout().tv_sec == timer->getTimeout().tv_sec) &&
(tmp->getTimeout().tv_usec >= timer->getTimeout().tv_usec)))
break;
+ }
- timerList->insert(timer, index);
+ timerList.insert(it, timer);
}
void BaseDisplay::removeTimer(BTimer *timer) {
- timerList->remove(timer);
+ timerList.remove(timer);
}