#include "../version.h"
#include "openbox.hh"
+#include "client.hh"
#include "screen.hh"
+#include "actions.hh"
#include "otk/property.hh"
#include "otk/display.hh"
#include "otk/assassin.hh"
namespace ob {
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *Openbox::instance = (Openbox *) 0;
void Openbox::signalHandler(int signal)
Openbox::Openbox(int argc, char **argv)
+ : otk::OtkEventDispatcher(),
+ otk::OtkEventHandler()
{
struct sigaction action;
_property = new otk::OBProperty();
+ _actions = new OBActions();
+
+ setMasterHandler(_actions); // set as the master event handler
+
// create the mouse cursors we'll use
_cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);
_cursors.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur);
_cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
// initialize all the screens
- _screens.push_back(new OBScreen(0, _config));
+ OBScreen *screen;
+ screen = new OBScreen(0, _config);
+ if (screen->managed()) {
+ _screens.push_back(screen);
+ _screens[0]->manageExisting();
+ // XXX: "change to" the first workspace on the screen to initialize stuff
+ } else
+ delete screen;
+
+ if (_screens.empty()) {
+ printf(_("No screens were found without a window manager. Exiting.\n"));
+ ::exit(1);
+ }
_state = State_Normal; // done starting
}
void Openbox::eventLoop()
{
while (!_doshutdown) {
- if (XPending(otk::OBDisplay::display)) {
- XEvent e;
- XNextEvent(otk::OBDisplay::display, &e);
- //process_event(&e);
- _xeventhandler.handle(e);
- } else {
- _timermanager.fire();
- }
+ dispatchEvents(); // from OtkEventDispatcher
+ _timermanager.fire();
}
}
void Openbox::removeClient(Window window)
{
- ClientMap::iterator it = _clients.find(window);
- if (it != _clients.end())
- _clients.erase(it);
+ _clients.erase(window);
}