X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=fa28676498fb7409a06aaec7fc5bb322ce6e4734;hb=4dd8520e929b76f95926ffc746b733a7e416f080;hp=a35e4ca0229dbd77904ffe20b3f6d9b13839c2b2;hpb=5f78b51429b204f89b654d634bb4cc8cb78b95f6;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index a35e4ca0..fa286764 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -43,6 +43,21 @@ 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;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -59,20 +74,23 @@ 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;
 
-  //! 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;
 
+  //!  An offscreen window which gets focus when nothing else has it
+  Window _focuswindow;
+
+  //! A list of all managed clients on the screen, in their stacking order
+  ClientList _stacking;
 
   //! Calculate the OBScreen::_area member
   void calcArea();
@@ -92,15 +110,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,17 +133,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; }
-
-  inline ClientList clients() { return _clients; }
+  //!  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);
-
   //! Manage any pre-existing windows on the screen
   void manageExisting();
   //! Manage a client window
@@ -137,6 +154,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);
 };
 
 }