namespace ob {
Openbox *Openbox::instance = (Openbox *) 0;
-OBActions *Openbox::actions = (OBActions *) 0;
void Openbox::signalHandler(int signal)
_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();
- Openbox::actions = new OBActions();
+ _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);
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
}
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)
{
- _clients[window] = 0;
- 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;
}
}