X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=18c0e85c3d1dfddfd82b865fdfef2b44a33dccbb;hb=7df3b620e21777dbefa24f381c1a95fafed1c16e;hp=5e9edd177c44f5cd5d1f92844c5483a003e9c03b;hpb=641bc819d1b399d2313e3328d111dd70777ecfea;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 5e9edd17..18c0e85c 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -6,20 +6,29 @@
   @brief The main class for the Openbox window manager
 */
 
+/*
+  cuz girls look soooo goood.. on the end of my DICK
+*/
+
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include "otk/screeninfo.hh"
 #include "otk/timerqueuemanager.hh"
+#include "otk/property.hh"
+#include "otk/configuration.hh"
 #include "xeventhandler.hh"
-#include "atom.hh"
+#include "client.hh"
 
 namespace ob {
 
+class OBScreen;
+
 //! The main class for the Openbox window manager.
 /*!
   Only a single instance of the Openbox class may be used in the application. A
@@ -46,6 +55,22 @@ public:
     State_Normal,   //!< The window manager is running in its normal state
     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;
   
 private:
   // stuff that can be passed on the command line
@@ -64,6 +89,12 @@ private:
   //! The value of argv[0], i.e. how this application was executed
   char *_argv0;
 
+  //! A list of all managed clients
+  ClientMap _clients;
+
+  //! A list of all the managed screens
+  ScreenList _screens;
+  
   //! Manages all timers for the application
   /*!
     Use of the otk::OBTimerQueueManager::fire funtion in this object ensures
@@ -74,12 +105,26 @@ private:
   //! The class which will handle raw XEvents
   OBXEventHandler _xeventhandler;
 
+  //! Cached atoms on the display
+  /*!
+    This is a pointer because the OBProperty class uses otk::OBDisplay::display
+    in its constructor, so, it needs to be initialized <b>after</b> the display
+    is initialized in this class' constructor.
+  */
+  otk::OBProperty *_property;
+
   //! The running state of the window manager
   RunState _state;
 
+  //! Mouse cursors used throughout Openbox
+  Cursors _cursors;
+
   //! When set to true, the Openbox::eventLoop function will stop and return
   bool _doshutdown;
 
+  //! The configuration of the application. TEMPORARY
+  otk::Configuration _config;
+
   //! Parses the command line used when executing this application
   void parseCommandLine(int argv, char **argv);
   //! Displays the version string to stdout
@@ -110,6 +155,18 @@ public:
   */
   inline otk::OBTimerQueueManager *timerManager() { return &_timermanager; }
 
+  //! Returns the otk::OBProperty instance for the window manager
+  inline const otk::OBProperty *property() const { return _property; }
+
+  //! Returns a managed screen
+  inline OBScreen *screen(int num) {
+    assert(num >= 0); assert(num < (signed)_screens.size());
+    return _screens[num];
+  }
+
+  //! Returns the mouse cursors used throughout Openbox
+  inline const Cursors &cursors() const { return _cursors; }
+
   //! The main function of the Openbox class
   /*!
     This function should be called after instantiating the Openbox class.
@@ -118,6 +175,15 @@ public:
   */
   void eventLoop();
 
+  //! Adds an OBClient to the client list for lookups
+  void addClient(Window window, OBClient *client);
+
+  //! Removes an OBClient from the client list for lookups
+  void removeClient(Window window);
+
+  //! Finds an OBClient based on its window id
+  OBClient *findClient(Window window);
+
   //! Requests that the window manager exit
   /*!
     Causes the Openbox::eventLoop function to stop looping, so that the window