X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendertexture.hh;h=54fbd9c26d3ed480ed9b67519cc3b9077b0f4671;hb=0ebf6a17547f75c1fa961acbf3fdd59c0e494d22;hp=3d324e30fc7a65e204b1d13c3d188f14742395a2;hpb=25f0151154c90b1c72f049e200d942fb2c18ddc5;p=chaz%2Fopenbox

diff --git a/otk/rendertexture.hh b/otk/rendertexture.hh
index 3d324e30..54fbd9c2 100644
--- a/otk/rendertexture.hh
+++ b/otk/rendertexture.hh
@@ -31,6 +31,8 @@ public:
   };
 
 private:
+  int _screen;
+  
   //! If true, the texture is not rendered at all, so all options are ignored
   bool _parent_relative;
   //! The relief type of the texture
@@ -48,6 +50,9 @@ private:
   //! The base color for the texture, the only color when the texture is solid.
   //! This must always be defined
   const RenderColor *_color;
+  //! The secondary color for a gradient texture.
+  //! This is only defined for gradients
+  const RenderColor *_secondary_color;
   //! The shadow color for the bevel. This must be defined if
   //! RenderTexture::_relief is not RenderTexture::ReliefType::Flat
   const RenderColor *_bevel_dark_color;
@@ -62,29 +67,64 @@ private:
   const RenderColor *_interlace_color;
 
 public:
-  RenderTexture(bool parent_relative, ReliefType relief, BevelType bevel,
+  RenderTexture(int screen,
+                bool parent_relative, ReliefType relief, BevelType bevel,
                 bool border, GradientType gradient, bool interlaced,
-                const RenderColor *color, const RenderColor *bevel_dark_color,
-                const RenderColor *bevel_light_color,
-                const RenderColor *border_color,
-                const RenderColor *interlace_color)
-    : _parent_relative(parent_relative),
+                const RGB &color,
+                const RGB &secondary_color,
+                const RGB &border_color,
+                const RGB &interlace_color)
+    : _screen(screen),
+      _parent_relative(parent_relative),
       _relief(relief),
       _bevel(bevel),
       _border(border),
       _gradient(gradient),
       _interlaced(interlaced),
-      _color(color),
-      _bevel_dark_color(bevel_dark_color),
-      _bevel_light_color(bevel_light_color),
-      _border_color(border_color),
-      _interlace_color(interlace_color)
-    {
-      assert(_relief == Flat || (_bevel_dark_color && _bevel_light_color));
-      assert(!_border || _border_color);
-      assert(!_interlaced || _interlace_color);
-      assert(_color);
+      _color(new RenderColor(screen, color)),
+      _secondary_color(new RenderColor(screen, secondary_color)),
+      _bevel_dark_color(0),
+      _bevel_light_color(0),
+      _border_color(new RenderColor(screen, border_color)),
+      _interlace_color(new RenderColor(screen, interlace_color))
+  {
+    if (_relief != Flat) {
+      unsigned char r, g, b;
+
+      // calculate the light bevel color
+      r = _color->red() + _color->red() / 2;
+      g = _color->green() + _color->green() / 2;
+      b = _color->blue() + _color->blue() / 2;
+      // watch for wraparound
+      if (r < _color->red()) r = 0xff;
+      if (g < _color->green()) g = 0xff;
+      if (b < _color->blue()) b = 0xff;
+      _bevel_dark_color = new RenderColor(screen, r, g, b);
+      
+      // calculate the dark bevel color
+      r = _color->red() / 4 + _color->red() / 2;
+      g = _color->green() / 4 + _color->green() / 2;
+      b = _color->blue() / 4 + _color->blue() / 2;
+      _bevel_light_color = new RenderColor(screen, r, g, b);
     }
+    
+    assert(_relief == Flat || (_bevel_dark_color && _bevel_light_color));
+    //assert(!_border || _border_color);
+    //assert(!_interlaced || _interlace_color);
+    assert(_color);
+    assert(_secondary_color);
+    assert(_border_color);
+    assert(_interlace_color);
+  }
+  
+  virtual ~RenderTexture() {
+    delete _color;
+    delete _secondary_color;
+    if (_bevel_dark_color) delete _bevel_dark_color;
+    if (_bevel_dark_color) delete _bevel_light_color;
+    delete _border_color;
+    delete _interlace_color;
+  }
 
   //! If true, the texture is not rendered at all, so all options are ignored
   inline bool parentRelative() const { return _parent_relative; }
@@ -103,6 +143,10 @@ public:
   //! The base color for the texture, the only color when the texture is solid.
   //! This must always be defined
   inline const RenderColor& color() const { return *_color; }
+  //! The secondary color for gradient textures.
+  //! This is only defined for gradients
+  inline const RenderColor& secondary_color() const
+    { return *_secondary_color; }
   //! The shadow color for the bevel. This must be defined if
   //! RenderTexture::_relief is not RenderTexture::ReliefType::Flat
   inline const RenderColor& bevelDarkColor() const