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

diff --git a/src/screen.hh b/src/screen.hh
index d4d42a7c..8d7bc6b0 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -29,7 +29,7 @@ class OBClient;
 class OBScreen {
 public:
   //! Holds a list of OBClient objects
-  typedef std::vector<OBClient*> ClientList;
+  typedef std::list<OBClient*> ClientList;
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;
 
@@ -74,8 +74,6 @@ private:
   StrutList _struts;
 
 
-  //! Manage any pre-existing windows on the screen
-  void manageExisting();
   //! Calculate the OBScreen::_area member
   void calcArea();
   //! Set the client list on the root window
@@ -97,16 +95,25 @@ private:
   
 public:
   //! Constructs a new OBScreen object
-  OBScreen(int screen);
+  OBScreen(int screen, const otk::Configuration &config);
   //! Destroys the OBScreen object
   virtual ~OBScreen();
 
+  //! 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; }
+
 
   //! Adds a window's strut to the screen's list of reserved spaces
   void addStrut(otk::Strut *strut);
@@ -116,7 +123,19 @@ public:
   //! Loads a new style on the screen
   void loadStyle(const otk::Configuration &config);
 
-  inline const otk::Style *style() const { return &_style; }
+  //! 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);
 };
 
 }