python interface is working!

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index d047d0c219e69634182960857cc410adae082574..7e95d40f01bed2f36d2a67a6131ab447a8d6c5cd 100644 (file)
--- 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,12 +62,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;
 
-  //! All managed clients on the screen
-  ClientList _clients;
-
   //! Area usable for placement etc (total - struts)
   otk::Rect _area;
 
@@ -90,10 +94,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
   /*!
@@ -108,7 +114,6 @@ public:
   //! Returns the style in use on the screen
   inline const otk::Style *style() const { return &_style; }
 
-
   //! 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