X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=543e216cb05974e1b1310922d0c040e7d67a9b6e;hb=7efcff07ea463bd9ae1d374119540fb8dc508489;hp=c20e676f941a036e1fbd344bcd87841aaefdc141;hpb=06a80ce2c7a189e26063d5e4e475ca500778aba5;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index c20e676f..543e216c 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,10 +10,10 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#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,6 +22,7 @@ extern "C" {
 namespace ob {
 
 class OBClient;
+class OBRootWindow;
 
 //! Manages a single screen
 /*!
@@ -29,7 +30,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;
 
@@ -58,12 +59,11 @@ private:
   //! The style with which to render on the screen
   otk::Style _style;
 
+  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;
 
@@ -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
@@ -101,10 +99,14 @@ public:
   //! 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
@@ -119,6 +121,8 @@ public:
   //! 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.