#include "../version.h"
#include "openbox.hh"
+#include "client.hh"
+#include "screen.hh"
#include "otk/property.hh"
#include "otk/display.hh"
+#include "otk/assassin.hh"
+#include "otk/util.hh" // TEMPORARY
extern "C" {
#include <X11/cursorfont.h>
#define _(str) gettext(str)
}
+#include <algorithm>
+
namespace ob {
Openbox *Openbox::instance = (Openbox *) 0;
Openbox::Openbox(int argc, char **argv)
+ : otk::OtkEventDispatcher(),
+ otk::OtkEventHandler()
{
struct sigaction action;
_displayreq = (char*) 0;
_argv0 = argv[0];
_doshutdown = false;
+ _rcfilepath = otk::expandTilde("~/.openbox/rc3");
parseCommandLine(argc, argv);
+ // TEMPORARY: using the xrdb rc3
+ _config.setFile(_rcfilepath);
+ if (!_config.load()) {
+ printf("failed to load rc file %s\n", _config.file().c_str());
+ ::exit(2);
+ }
+ std::string s;
+ _config.getValue("session.styleFile", s);
+ _config.setFile(s);
+ if (!_config.load()) {
+ printf("failed to load style %s\n", _config.file().c_str());
+ ::exit(2);
+ }
+
// open the X display (and gets some info about it, and its screens)
otk::OBDisplay::initialize(_displayreq);
assert(otk::OBDisplay::display);
_cursors.lr_angle = XCreateFontCursor(otk::OBDisplay::display, XC_lr_angle);
_cursors.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle);
_cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
+
+ // initialize all the screens
+ 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
}
{
_state = State_Exiting; // time to kill everything
- // unmanage all windows
- while (!_clients.empty())
- _xeventhandler.unmanageWindow(_clients.begin()->second);
+ std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
// close the X display
otk::OBDisplay::destroy();
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)
{
+ _clients[window] = 0;
ClientMap::iterator it = _clients.find(window);
if (it != _clients.end())
_clients.erase(it);