X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.hh;h=37f22d88a067eb59c97c83b8823e16358bcc1a25;hb=624a06fdffadfadbf6ac14068bbd329cc0a5834f;hp=d047d0c219e69634182960857cc410adae082574;hpb=0da967a8313bad4a9dbcca9b5c760bda32b7981f;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index d047d0c2..37f22d88 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -10,6 +10,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "rootwindow.hh"
 #include "otk/image.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
@@ -21,6 +22,7 @@ extern "C" {
 namespace ob {
 
 class OBClient;
+class OBRootWindow;
 
 //! Manages a single screen
 /*!
@@ -41,6 +43,9 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! All managed clients on the screen
+  ClientList clients;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -57,18 +62,21 @@ 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;
+  
 
   //! Calculate the OBScreen::_area member
   void calcArea();
@@ -90,10 +98,12 @@ private:
   void setWorkArea();
   
 public:
+#ifndef SWIG
   //! Constructs a new OBScreen object
   OBScreen(int screen, const otk::Configuration &config);
   //! Destroys the OBScreen object
   virtual ~OBScreen();
+#endif
 
   //! Returns if the screen was successfully managed
   /*!
@@ -107,7 +117,8 @@ 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);