store the pixel32 data in the surface so it can be reused

[chaz/openbox] / otk / rendercontrol.hh

diff --git a/otk/rendercontrol.hh b/otk/rendercontrol.hh
index a512060f2dbbeecd370f6e668f6fbd008533b25d..7d629b6ce34ec8d527016cc24a44ef2d52aaed8d 100644 (file)
--- a/otk/rendercontrol.hh
+++ b/otk/rendercontrol.hh
@@ -7,13 +7,14 @@ extern "C" {
 #include <X11/Xutil.h>
 }
 
+#include "surface.hh"
+
 namespace otk {
 
 class ScreenInfo;
-class Surface;
 class RenderTexture;
 class Font;
-class Color;
+class RenderColor;
 class ustring;
 
 class RenderControl {
@@ -63,17 +64,23 @@ protected:
 
   RenderControl(int screen);
 
+  virtual void drawSolidBackground(Surface& sf,
+                                   const RenderTexture& texture) const;
+  
 public:
   virtual ~RenderControl();
 
   static RenderControl *getRenderControl(int screen);
 
+  virtual void drawRoot(const RenderColor &color) const;
+  
   //! Draws a string onto a Surface
-  virtual void drawString(Surface *sf, const Font &font, int x, int y,
-                         const Color &color, const ustring &string) const;
+  virtual void drawString(Surface &sf, const Font &font, int x, int y,
+                         const RenderColor &color,
+                          const ustring &string) const;
 
   //! Draws a background onto a Surface, as specified by a RenderTexture
-  virtual void drawBackground(Surface *sf,
+  virtual void drawBackground(Surface &sf,
                              const RenderTexture &texture) const = 0;
 };