Some bitmap bugfixes

[chaz/openbox] / src / Texture.hh

diff --git a/src/Texture.hh b/src/Texture.hh
index 1eed2c4280781fbb6d8e8a15302671e974b5a5a2..24be5df145e73716335ca32548afa272d4db133f 100644 (file)
--- a/src/Texture.hh
+++ b/src/Texture.hh
@@ -52,12 +52,14 @@ public:
     // bevel types
     Bevel1              = (1l<<13),
     Bevel2              = (1l<<14),
+    // flat border
+    Border              = (1l<<15),
     // inverted image
-    Invert              = (1l<<15),
+    Invert              = (1l<<16),
     // parent relative image
-    Parent_Relative     = (1l<<16),
+    Parent_Relative     = (1l<<17),
     // fake interlaced image
-    Interlaced          = (1l<<17)
+    Interlaced          = (1l<<18)
   };
 
   BTexture(const BaseDisplay * const _display = 0,
@@ -68,11 +70,13 @@ public:
 
   void setColor(const BColor &_color);
   void setColorTo(const BColor &_colorTo) { ct = _colorTo; }
+  void setBorderColor(const BColor &_borderColor) { bc = _borderColor; }
 
   const BColor &color(void) const { return c; }
   const BColor &colorTo(void) const { return ct; }
   const BColor &lightColor(void) const { return lc; }
   const BColor &shadowColor(void) const { return sc; }
+  const BColor &borderColor(void) const { return bc; }
 
   unsigned long texture(void) const { return t; }
   void setTexture(const unsigned long _texture) { t  = _texture; }
@@ -97,7 +101,7 @@ public:
                 const Pixmap old = 0);
 
 private:
-  BColor c, ct, lc, sc;
+  BColor c, ct, lc, sc, bc;
   std::string descr;
   unsigned long t;
   const BaseDisplay *dpy;