X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=83891828b5a4303173c509f0d7bccb74520b250e;hb=506b5dbf6f2624df57f09b5c7ba15098b1590cd5;hp=b6c3d6d19f6581fb8f03750ed09119ed7ca20797;hpb=23a7f188297ba3cef1bf13f1be9407ff6eb9bd62;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index b6c3d6d1..83891828 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -18,6 +18,7 @@ extern "C" {
 #include <vector>
 #include <map>
 
+#include "python.hh"
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
@@ -51,9 +52,6 @@ public:
   */
   static Openbox *instance;
 
-  //! The action interface through which all user-available actions occur
-  static OBActions *actions;
-
   //! The posible running states of the window manager
   enum RunState {
     State_Starting, //!< The window manager is starting up (being created)
@@ -96,6 +94,7 @@ private:
 
   //! A list of all managed clients
   ClientMap _clients;
+  PyObject *_pyclients; // PyDictObject
 
   //! A list of all the managed screens
   ScreenList _screens;
@@ -115,6 +114,9 @@ private:
   */
   otk::OBProperty *_property;
 
+  //! The action interface through which all user-available actions occur
+  OBActions *_actions;
+
   //! The running state of the window manager
   RunState _state;
 
@@ -169,6 +171,8 @@ public:
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
+  inline PyObject *pyclients() const { return _pyclients; }
+
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.