#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;
_doshutdown = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
+ _clients = (PyDictObject*) PyDict_New();
+ assert(_clients);
+
parseCommandLine(argc, argv);
// TEMPORARY: using the xrdb rc3
_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));
- _screens[0]->loadStyle(_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);
+ }
+
+ // initialize the python interface
+ Py_SetProgramName(argv[0]);
+ Py_Initialize();
+ initopenbox(); // initialize the static 'openbox' module
+ FILE *rcpyfd = fopen("/home/natas/.openbox/user.py", "r");
+ if (!rcpyfd) {
+ printf("failed to load python file /home/natas/.openbox/user.py\n");
+ } else {
+ PyRun_SimpleFile(rcpyfd, "/home/natas/.openbox/user.py");
+ fclose(rcpyfd);
+ }
+
_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
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::addClient(Window window, OBClient *client)
{
- _clients[window] = client;
+ // maintain the python list here too
+ PyDict_SetItem((PyObject*)_clients, PyLong_FromLong(window),
+ (PyObject*)client);
}
void Openbox::removeClient(Window window)
{
- ClientMap::iterator it = _clients.find(window);
- if (it != _clients.end())
- _clients.erase(it);
+ PyDict_DelItem((PyObject*)_clients, PyLong_FromLong(window));
}
OBClient *Openbox::findClient(Window window)
{
- /*
- NOTE: we dont use _clients[] to find the value because that will insert
- a new null into the hash, which really sucks when we want to clean up the
- hash at shutdown!
- */
- ClientMap::iterator it = _clients.find(window);
- if (it != _clients.end())
- return it->second;
- else
- return (OBClient*) 0;
+ PyClientObject *client = PyDist_GetItem((PyObject*)_clients,
+ PyLong_FromLong(window));
+ if (client)
+ return client->client;
+ return 0;
}
}