X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=e57ab2edbcb679ce87313144f9ca0afeae6ed561;hb=c7b22b4f9cee63d860ad4f6617cd5210299b9d8b;hp=d4d42a7c826d45c2bfa02a0ef7d7bb2d94c2967a;hpb=cee305244662d352a7ad5ab7ae22f6221c064d3d;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index d4d42a7c..e57ab2ed 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,10 +10,11 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "client.hh"
+#include "rootwindow.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
-#include "otk/point.hh"
 #include "otk/style.hh"
 #include "otk/configuration.hh" // TEMPORARY
 
@@ -22,14 +23,13 @@ extern "C" {
 namespace ob {
 
 class OBClient;
+class OBRootWindow;
 
 //! Manages a single screen
 /*!
 */
 class OBScreen {
 public:
-  //! Holds a list of OBClient objects
-  typedef std::vector<OBClient*> ClientList;
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
 
@@ -42,6 +42,9 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! All managed clients on the screen (in order of being mapped)
+  OBClient::List clients;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -58,26 +61,32 @@ private:
   //! The style with which to render on the screen
   otk::Style _style;
 
+  //! The screen's root window
+  OBRootWindow _root;
+  
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
-  //! The dimentions of the screen
-  otk::Point _size;
-
-  //! All managed clients on the screen
-  ClientList _clients;
-
   //! Area usable for placement etc (total - struts)
   otk::Rect _area;
 
-  //! Areas of the screen reserved by applications
-  StrutList _struts;
+  //! Combined strut from all of the clients' struts
+  otk::Strut _strut;
 
+  //!  An offscreen window which gets focus when nothing else has it
+  Window _focuswindow;
+
+  //! An offscreen window which shows that a NETWM compliant window manager is
+  //! running
+  Window _supportwindow;
+
+  //! A list of all managed clients on the screen, in their stacking order
+  OBClient::List _stacking;
 
-  //! Manage any pre-existing windows on the screen
-  void manageExisting();
   //! Calculate the OBScreen::_area member
   void calcArea();
+  //! Set the list of supported NETWM atoms on the root window
+  void setSupportedAtoms();
   //! Set the client list on the root window
   /*!
     Sets the _NET_CLIENT_LIST root window property.<br>
@@ -94,29 +103,55 @@ private:
     Set the _NET_WORKAREA root window property.
   */
   void setWorkArea();
-  
+
 public:
+#ifndef SWIG
   //! Constructs a new OBScreen object
   OBScreen(int screen);
   //! Destroys the OBScreen object
   virtual ~OBScreen();
+#endif
 
+  inline int number() const { return _number; }
+  
+  //! Returns if the screen was successfully managed
+  /*!
+    If this is false, then the screen should be deleted and should NOT be
+    used.
+  */
+  inline bool managed() const { return _managed; }
   //! Returns the Image Control used for rendering on the screen
   inline otk::BImageControl *imageControl() { return _image_control; }
-  //! Returns the dimentions of the screen
-  inline const otk::Point &size() const { return _size; }
   //! Returns the area of the screen not reserved by applications' Struts
   inline const otk::Rect &area() const { return _area; }
+  //! Returns the style in use on the screen
+  inline const otk::Style *style() const { return &_style; }
+  //!  An offscreen window which gets focus when nothing else has it
+  inline Window focuswindow() const { return _focuswindow; }
 
-  //! Adds a window's strut to the screen's list of reserved spaces
-  void addStrut(otk::Strut *strut);
-  //! Removes a window's strut from the screen's list of reserved spaces
-  void removeStrut(otk::Strut *strut);
+  //! Update's the screen's combined strut of all the clients.
+  /*!
+    Clients should call this whenever they change their strut.
+  */
+  void updateStrut();
 
-  //! Loads a new style on the screen
-  void loadStyle(const otk::Configuration &config);
+  //! Manage any pre-existing windows on the screen
+  void manageExisting();
+  //! Manage a client window
+  /*!
+    This gives the window a frame, reparents it, selects events on it, etc.
+  */
+  void manageWindow(Window window);
+  //! Unmanage a client
+  /*!
+    This removes the window's frame, reparents it to root, unselects events on
+    it, etc.
+  */
+  void unmanageWindow(OBClient *client);
 
-  inline const otk::Style *style() const { return &_style; }
+  //! Raises/Lowers a client window above/below all others in its stacking
+  //! layer
+  void restack(bool raise, OBClient *client);
 };
 
 }