update to cleaned up otk api

[chaz/openbox] / src / openbox.hh

diff --git a/src/openbox.hh b/src/openbox.hh
index b6c3d6d19f6581fb8f03750ed09119ed7ca20797..30dc9f688c50e6289837533dd186697379d551d9 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -16,8 +16,8 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include <map>
 
+#include "python.hh"
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
@@ -51,9 +51,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)
@@ -71,9 +68,6 @@ public:
     Cursor ur_angle; //!< For resizing the right corner of a window
   };
   
-  //! A map for looking up a specific client class from the window id
-  typedef std::map<Window, OBClient *> ClientMap;
-
   //! A list of OBScreen classes
   typedef std::vector<OBScreen *> ScreenList;
   
@@ -95,7 +89,7 @@ private:
   char *_argv0;
 
   //! A list of all managed clients
-  ClientMap _clients;
+  PyDictObject *_clients;
 
   //! A list of all the managed screens
   ScreenList _screens;
@@ -115,6 +109,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 +166,8 @@ public:
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
+  inline PyDictObject *clients() const { return _clients; }
+
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.