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

diff --git a/src/screen.hh b/src/screen.hh
index a35e4ca0..14e81111 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -43,6 +43,9 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! All managed clients on the screen
+  ClientList clients;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -59,20 +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();
@@ -96,7 +100,7 @@ private:
 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
@@ -113,17 +117,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