X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.hh;h=1d9ab7e7501dd3c1eb23978db21e246ae3797e06;hb=b45a68cc30121ad2c5cd3b795a6b5e8572425316;hp=c619597fcd250b0141a80c6f9683d37af6221043;hpb=02066c5d0b09ae49aa1f9b7193fb16f1ac7f6a37;p=chaz%2Fopenbox

diff --git a/otk/rendercontrol.hh b/otk/rendercontrol.hh
index c619597f..1d9ab7e7 100644
--- a/otk/rendercontrol.hh
+++ b/otk/rendercontrol.hh
@@ -12,21 +12,22 @@ namespace otk {
 class ScreenInfo;
 class Surface;
 class RenderTexture;
+class Font;
+class RenderColor;
+class ustring;
 
 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;
@@ -60,15 +61,24 @@ 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 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 background onto a Surface, as specified by a RenderTexture
+  virtual void drawBackground(Surface& sf,
+			      const RenderTexture& texture) const = 0;
 };
 
 }