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

diff --git a/src/screen.hh b/src/screen.hh
index 8d7bc6b0..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
 /*!
@@ -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;
 
@@ -107,8 +107,6 @@ public:
   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