#include "../version.h"
#include "openbox.hh"
+#include "otk/property.hh"
#include "otk/display.hh"
extern "C" {
namespace ob {
-
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) {
{
struct sigaction action;
- _state = State_Starting;
+ _state = State_Starting; // initializing everything
Openbox::instance = this;
_displayreq = (char*) 0;
_argv0 = argv[0];
+ _doshutdown = false;
parseCommandLine(argc, argv);
sigaction(SIGINT, &action, (struct sigaction *) 0);
sigaction(SIGHUP, &action, (struct sigaction *) 0);
-
+ _property = new otk::OBProperty();
+
_state = State_Normal; // done starting
}
Openbox::~Openbox()
{
+ _state = State_Exiting; // time to kill everything
+
// close the X display
otk::OBDisplay::destroy();
}
void Openbox::eventLoop()
{
- 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 {
_timermanager.fire();
}
}
+void Openbox::addClient(Window window, OBClient *client)
+{
+ _clients[window] = client;
+}
+
+
+void Openbox::removeClient(Window window)
+{
+ _clients[window] = (OBClient *) 0;
+}
+
+
+OBClient *Openbox::findClient(Window window)
+{
+ return _clients[window];
+}
+
}