X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.hh;h=c8e74b19c1b0a59c49dba598269fa44fcffe9f82;hb=2808ab5bad8ff49a1af909c2515288310cc89378;hp=14c0e92c97afb0d165400e4632da4c38725917a9;hpb=9f705c02b9c412c053fc12a2ebdc5cebe83400c8;p=chaz%2Fopenbox

diff --git a/otk/rendercontrol.hh b/otk/rendercontrol.hh
index 14c0e92c..c8e74b19 100644
--- a/otk/rendercontrol.hh
+++ b/otk/rendercontrol.hh
@@ -7,25 +7,29 @@ extern "C" {
 #include <X11/Xutil.h>
 }
 
+#include "surface.hh"
+
 namespace otk {
 
 class ScreenInfo;
-class Surface;
+class RenderTexture;
+class Font;
+class RenderColor;
+class ustring;
+class PixmapMask;
 
 class RenderControl {
 protected:
-  const ScreenInfo *_screen;
-
-  int _red_bits;
-  int _green_bits;
-  int _blue_bits;
+  int _screen;
 
+  /*
   // color tables, meaning, 256 (possibly) different shades of each color,
   // based on the number of bits there are available for each color in the
   // visual
   unsigned char _red_color_table[256];
   unsigned char _green_color_table[256];
   unsigned char _blue_color_table[256];
+  */
 
 /*
   Bool _dither;
@@ -59,14 +63,33 @@ protected:
   int _ncolors;
 */
 
-  RenderControl(const ScreenInfo *screen);
+  RenderControl(int screen);
 
+  virtual void drawSolidBackground(Surface& sf,
+                                   const RenderTexture& texture) const;
+  
 public:
   virtual ~RenderControl();
 
   static RenderControl *getRenderControl(int screen);
 
-  virtual void render(Surface *sf) = 0;
+  virtual void drawRoot(const RenderColor &color) const;
+  
+  //! Draws a background onto a Surface, as specified by a RenderTexture
+  /*!
+    This function will overwrite the entire surface.
+  */
+  virtual void drawBackground(Surface &sf,
+			      const RenderTexture &texture) const = 0;
+
+  //! Draws a string onto a Surface
+  virtual void drawString(Surface &sf, const Font &font, int x, int y,
+			  const RenderColor &color,
+                          const ustring &string) const;
+
+  //! Draws a PixmapMask with a specified color onto a Surface
+  virtual void drawMask(Surface &sf, const RenderColor &color,
+                        const PixmapMask &mask) const;
 };
 
 }