python has begun!

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index e4dd5cb6587856c38b5e5248bf7bfb510786dd89..f16d3464f0cd9fb5d60769025a9690387f24d673 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -6,7 +6,10 @@
 
 #include "../version.h"
 #include "openbox.hh"
+#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"
@@ -48,7 +51,7 @@ extern "C" {
 
 namespace ob {
 
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *Openbox::instance  = (Openbox *) 0;
 
 
 void Openbox::signalHandler(int signal)
@@ -74,6 +77,8 @@ void Openbox::signalHandler(int signal)
 
 
 Openbox::Openbox(int argc, char **argv)
+  : otk::OtkEventDispatcher(),
+    otk::OtkEventHandler()
 {
   struct sigaction action;
 
@@ -86,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
@@ -119,6 +127,10 @@ Openbox::Openbox(int argc, char **argv)
 
   _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);
@@ -128,8 +140,32 @@ Openbox::Openbox(int argc, char **argv)
   _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);
+  }
+
+  // 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
 }
 
@@ -232,14 +268,8 @@ void Openbox::showHelp()
 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();
   }
 }
 
@@ -247,14 +277,18 @@ 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);
 }
 
 
 void Openbox::removeClient(Window window)
 {
-  ClientMap::iterator it = _clients.find(window);
-  if (it != _clients.end())
-    _clients.erase(it);
+  _clients.erase(window);
 }