X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=cb078082a28be8ef906389efa9700c278ecaf0ba;hb=056ff3b50cddd39b6f45969c17611dc3bf396ae9;hp=7e95d40f01bed2f36d2a67a6131ab447a8d6c5cd;hpb=fe55bb846db1933d8d6f023236298940cab441f8;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 7e95d40f..cb078082 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -43,7 +43,19 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  //! All managed clients on the screen
+  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;
   
 private:
@@ -62,6 +74,7 @@ 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?
@@ -70,12 +83,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;
 
   //! 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>
@@ -92,15 +116,17 @@ private:
     Set the _NET_WORKAREA root window property.
   */
   void setWorkArea();
-  
+
 public:
 #ifndef SWIG
   //! Constructs a new OBScreen object
-  OBScreen(int screen, const otk::Configuration &config);
+  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
@@ -113,14 +139,14 @@ public:
   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);
-
-  //! Loads a new style on the screen
-  void loadStyle(const otk::Configuration &config);
+  //! 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();
@@ -135,6 +161,10 @@ public:
     it, etc.
   */
   void unmanageWindow(OBClient *client);
+
+  //! Raises/Lowers a client window above/below all others in its stacking
+  //! layer
+  void restack(bool raise, OBClient *client);
 };
 
 }