X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.hh;h=781c32d47a991b4cf50472a53a4d79655c02eec8;hb=6a88803b8c42f44a6f09facc20fcb6fe7901a2f3;hp=c619597fcd250b0141a80c6f9683d37af6221043;hpb=02066c5d0b09ae49aa1f9b7193fb16f1ac7f6a37;p=chaz%2Fopenbox

diff --git a/otk/rendercontrol.hh b/otk/rendercontrol.hh
index c619597f..781c32d4 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,14 +61,25 @@ 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,
+  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 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;
 };