X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=30dc9f688c50e6289837533dd186697379d551d9;hb=68194ce957db36ead19a39fdc7636a220befafe9;hp=8c2015f95870af95005b39bc65525f048762b1e4;hpb=74cb09bb2cc4832463a57743b1495eef24237d2a;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 8c2015f9..30dc9f68 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -16,21 +16,22 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include <map>
 
+#include "python.hh"
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
 #include "otk/eventhandler.hh"
-#include "client.hh"
 
 namespace ob {
 
 class OBScreen;
+class OBClient;
+class OBActions;
 
-//! The main class for the Openbox window manager.
+//! The main class for the Openbox window manager
 /*!
   Only a single instance of the Openbox class may be used in the application. A
   pointer to this instance is held in the Openbox::instance static member
@@ -43,7 +44,7 @@ class OBScreen;
 class Openbox : public otk::OtkEventDispatcher, public otk::OtkEventHandler
 {
 public:
-  //! The single instance of the Openbox class for the application.
+  //! The single instance of the Openbox class for the application
   /*!
     Since this variable is globally available in the application, the Openbox
     class does not need to be passed around to any of the other classes.
@@ -67,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;
   
@@ -91,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;
@@ -111,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;
 
@@ -165,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.
@@ -188,8 +191,6 @@ public:
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
-
-  virtual void mapRequestHandler(const XMapRequestEvent &);
 };
 
 }