more user friendly net_showing_desktop support

[chaz/openbox] / otk / surface.hh

diff --git a/otk/surface.hh b/otk/surface.hh
index d325b3937a59da6c3f93217a9e1e1da53d6cd0c0..7a202491f188392b5e0f5d7e354bf2ea6f6febb2 100644 (file)
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -2,8 +2,9 @@
 #ifndef __surface_hh
 #define __surface_hh
 
-#include "point.hh"
+#include "size.hh"
 #include "truerendercontrol.hh"
+#include "pseudorendercontrol.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -14,10 +15,11 @@ extern "C" {
 namespace otk {
 
 class ScreenInfo;
+class RenderColor;
 
 class Surface {
   int _screen;
-  Point _size;
+  Size _size;
   Pixmap _pixmap;
   XftDraw *_xftdraw;
 
@@ -26,17 +28,15 @@ protected:
   void destroyObjects();
 
   void setPixmap(XImage *image);
-  void setPixmap(const Color &color);
+  void setPixmap(const RenderColor &color);
   
 public:
-  Surface(int screen, const Point &size);
+  Surface(int screen, const Size &size);
   virtual ~Surface();
 
   inline int screen(void) const { return _screen; }
 
-  virtual const Point& size() const { return _size; }
-  virtual int width() const { return _size.x(); }
-  virtual int height() const { return _size.y(); }
+  virtual const Size& size() const { return _size; }
 
   virtual Pixmap pixmap() const { return _pixmap; }
 
@@ -44,6 +44,7 @@ public:
   // to it. Noone else needs them tho, so they are private.
   friend class RenderControl;
   friend class TrueRenderControl;
+  friend class PseudoRenderControl;
 };
 
 }