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

diff --git a/src/screen.hh b/src/screen.hh
index ce6d6dea..e57ab2ed 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,6 +10,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "client.hh"
 #include "rootwindow.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
@@ -29,8 +30,6 @@ class OBRootWindow;
 */
 class OBScreen {
 public:
-  //! Holds a list of OBClient objects
-  typedef std::list<OBClient*> ClientList;
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
 
@@ -43,20 +42,8 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  enum StackLayer {
-    Layer_Icon,       // 0 - iconified windows, in any order at all
-    Layer_Desktop,    // 1 - desktop windows
-    Layer_Below,      // 2 - normal windows w/ below
-    Layer_Normal,     // 3 - normal windows
-    Layer_Above,      // 4 - normal windows w/ above
-    Layer_Top,        // 5 - always-on-top-windows (docks?)
-    Layer_Fullscreen, // 6 - fullscreeen windows
-    Layer_Internal,   // 7 - openbox windows/menus
-    NUM_LAYERS
-  };
-
   //! All managed clients on the screen (in order of being mapped)
-  ClientList clients;
+  OBClient::List clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -83,17 +70,23 @@ private:
   //! 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
-  ClientList _stacking;
+  OBClient::List _stacking;
 
   //! 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>
@@ -119,6 +112,8 @@ public:
   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
@@ -134,10 +129,11 @@ public:
   //!  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();
 
   //! Manage any pre-existing windows on the screen
   void manageExisting();
@@ -153,11 +149,9 @@ public:
   */
   void unmanageWindow(OBClient *client);
 
-  //! Raises a client window above all others in its stacking layer
-  void raise(OBClient *client);
-
-  //! Lowers a client window below all others in its stacking layer
-  void lower(OBClient *client);
+  //! Raises/Lowers a client window above/below all others in its stacking
+  //! layer
+  void restack(bool raise, OBClient *client);
 };
 
 }