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

diff --git a/src/openbox.hh b/src/openbox.hh
index 30dc9f68..1489ffb7 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __openbox_hh
 #define   __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"
@@ -31,6 +31,17 @@ class OBScreen;
 class OBClient;
 class OBActions;
 
+//! Mouse cursors used throughout Openbox
+struct Cursors {
+  Cursor session;  //!< The default mouse cursor
+  Cursor move;     //!< For moving a window
+  Cursor ll_angle; //!< For resizing the bottom left corner of a window
+  Cursor lr_angle; //!< For resizing the bottom right corner of a window
+  Cursor ul_angle; //!< For resizing the top left corner of a window
+  Cursor ur_angle; //!< For resizing the right corner of a window
+};
+
+
 //! The main class for the Openbox window manager
 /*!
   Only a single instance of the Openbox class may be used in the application. A
@@ -58,16 +69,9 @@ public:
     State_Exiting   //!< The window manager is exiting (being destroyed)
   };
 
-  //! Mouse cursors used throughout Openbox
-  struct Cursors {
-    Cursor session;  //!< The default mouse cursor
-    Cursor move;     //!< For moving a window
-    Cursor ll_angle; //!< For resizing the bottom left corner of a window
-    Cursor lr_angle; //!< For resizing the bottom right corner of a window
-    Cursor ul_angle; //!< For resizing the top left corner of a window
-    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;
   
@@ -83,13 +87,18 @@ private:
     Defaults to $(HOME)/.openbox/menu3
   */
   std::string _menufilepath;
+  //! Path to the script file to execute on startup
+  /*!
+    Defaults to $(HOME)/.openbox/user.py
+  */
+  std::string _scriptfilepath;
   //! The display requested by the user, or null to use the DISPLAY env var
   char *_displayreq;
   //! The value of argv[0], i.e. how this application was executed
   char *_argv0;
 
   //! A list of all managed clients
-  PyDictObject *_clients;
+  ClientMap _clients;
 
   //! A list of all the managed screens
   ScreenList _screens;
@@ -135,6 +144,7 @@ private:
   static void signalHandler(int signal);
 
 public:
+#ifndef SWIG
   //! Openbox constructor.
   /*!
     \param argc Number of command line arguments, as received in main()
@@ -143,6 +153,7 @@ public:
   Openbox(int argc, char **argv);
   //! Openbox destructor.
   virtual ~Openbox();
+#endif
 
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
@@ -160,14 +171,20 @@ public:
   //! Returns a managed screen
   inline OBScreen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
+    if (num >= screenCount())
+      return NULL;
     return _screens[num];
   }
 
+  //! Returns the number of managed screens
+  inline int screenCount() const {
+    return (signed)_screens.size();
+  }
+
   //! Returns the mouse cursors used throughout Openbox
   inline const Cursors &cursors() const { return _cursors; }
 
-  inline PyDictObject *clients() const { return _clients; }
-
+#ifndef SWIG
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.
@@ -175,6 +192,7 @@ public:
     The Openbox::shutdown method will cause this function to exit.
   */
   void eventLoop();
+#endif
 
   //! Adds an OBClient to the client list for lookups
   void addClient(Window window, OBClient *client);