Openbox *Openbox::instance = (Openbox *) 0;
-int Openbox::xerrorHandler(Display *d, XErrorEvent *e)
-{
-#ifdef DEBUG
- char errtxt[128];
-
- XGetErrorText(d, e->error_code, errtxt, 128);
- printf("X Error: %s\n", errtxt);
-#else
- (void)d;
- (void)e;
-#endif
-
- return false;
-}
-
-
void Openbox::signalHandler(int signal)
{
switch (signal) {
case SIGTERM:
case SIGPIPE:
printf("Caught signal %d. Exiting.", signal);
- // XXX: Make Openbox exit
+ instance->shutdown();
+
break;
case SIGFPE:
case SIGSEGV:
{
struct sigaction action;
- _state = State_Starting;
+ _state = State_Starting; // initializing everything
Openbox::instance = this;
Openbox::~Openbox()
{
+ _state = State_Exiting; // time to kill everything
+
// close the X display
otk::OBDisplay::destroy();
}
void Openbox::eventLoop()
{
- const int xfd = ConnectionNumber(otk::OBDisplay::display);
-
- while (_state == State_Normal) {
+ while (!_doshutdown) {
if (XPending(otk::OBDisplay::display)) {
XEvent e;
XNextEvent(otk::OBDisplay::display, &e);
- process_event(&e);
+ //process_event(&e);
+ _xeventhandler.handle(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();
}
}
}