X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fopenbox.cc;h=f16d3464f0cd9fb5d60769025a9690387f24d673;hb=700984bd150d98a6876c117c2e1b1b3c72cffce1;hp=d95de520ed3530e97a2c001e3d76c48de47f45dc;hpb=925262bee2d1edfbec1c3fb1725f09cc926b4c7d;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index d95de520..f16d3464 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -9,6 +9,7 @@ #include "client.hh" #include "screen.hh" #include "actions.hh" +#include "python_client.hh" #include "otk/property.hh" #include "otk/display.hh" #include "otk/assassin.hh" @@ -51,7 +52,6 @@ extern "C" { namespace ob { Openbox *Openbox::instance = (Openbox *) 0; -OBActions *Openbox::actions = (OBActions *) 0; void Openbox::signalHandler(int signal) @@ -91,6 +91,9 @@ Openbox::Openbox(int argc, char **argv) _doshutdown = false; _rcfilepath = otk::expandTilde("~/.openbox/rc3"); + _pyclients = PyDict_New(); + assert(_pyclients); + parseCommandLine(argc, argv); // TEMPORARY: using the xrdb rc3 @@ -124,7 +127,9 @@ Openbox::Openbox(int argc, char **argv) _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); @@ -148,7 +153,19 @@ Openbox::Openbox(int argc, char **argv) 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 } @@ -260,6 +277,12 @@ void Openbox::eventLoop() void Openbox::addClient(Window window, OBClient *client) { _clients[window] = client; + + // maintain the python list here too + PyClientObject* pyclient = PyObject_New(PyClientObject, &PyClient_Type); + pyclient->window = window; + pyclient->client = client; + PyDict_SetItem(_pyclients, PyLong_FromLong(window), (PyObject*)pyclient); }