provide RenderControls to all otk from the display class. initialize them all there. try use bitshifts instead of color tables in the TrueRenderControl class for finding correct rgbs. Move the image/pixmap/xftdraw into the surface class, and it maintains them, recreating them when it resizes.

1 files changed, 9 insertions, 8 deletions

diff --git a/otk/truerendercontrol.hh b/otk/truerendercontrol.hh
index dfa0aa34..bd6d80af 100644
--- a/otk/truerendercontrol.hh
+++ b/otk/truerendercontrol.hh
@@ -4,24 +4,25 @@
 
 #include "rendercontrol.hh"
 
+#include <vector>
+
 namespace otk {
 
 class TrueRenderControl : public RenderControl {
 private:
-  // the offset of each color in a color mask
-  int _red_offset;
-  int _green_offset;
-  int _blue_offset;
-
-  // the number of bits to shift a color value (from 0-255) to fit it into the
-  // the color mask
+  // the number of bits to shift a color value (from 0-255) to the right, to
+  // fit it into the the color mask (do this before the offset)
   int _red_shift;
   int _green_shift;
   int _blue_shift;
 
+  // the offset of each color in a color mask
+  int _red_offset;
+  int _green_offset;
+  int _blue_offset;
 
 public:
-  TrueRenderControl(const ScreenInfo *screen);
+  TrueRenderControl(int screen);
   virtual ~TrueRenderControl();
 
   virtual void drawBackground(Surface *sf, const RenderTexture &texture) const;