X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.hh;h=14e81111a427e6fe6fe3e3fe8597a13279da7b83;hb=9823b821f5623ef2ad182f914e07a97a93f3952e;hp=91295f32e86d0a3913565ace0fd3e78ba3632396;hpb=e503323dcf36c7b4c173ddc0cd302b8642361f48;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 91295f32..14e81111 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;
 
@@ -42,6 +43,9 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! All managed clients on the screen
+  ClientList clients;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -58,21 +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;
 
-  //! The dimentions of the screen
-  otk::Point _size;
-
-  //! 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();
@@ -94,29 +98,33 @@ private:
   void setWorkArea();
   
 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
 
+  //! 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; }
-
+  //!  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