sync with bb-cvs.

[chaz/openbox] / src / Texture.cc

diff --git a/src/Texture.cc b/src/Texture.cc
index 716522f6b159397cd69c0c173d8b97fb7f85b60b..87825267f2c269e0abcc602a2a150ac344c73dcc 100644 (file)
--- a/src/Texture.cc
+++ b/src/Texture.cc
@@ -32,6 +32,8 @@ extern "C" {
 #endif
 }
 
+#include <assert.h>
+
 #include "Texture.hh"
 #include "BaseDisplay.hh"
 #include "Image.hh"
@@ -114,8 +116,6 @@ void BTexture::setDescription(const string &d) {
         addTexture(BTexture::PipeCross);
       else if (descr.find("elliptic") != string::npos)
         addTexture(BTexture::Elliptic);
-      else if (descr.find("diagonal") != string::npos)
-        addTexture(BTexture::Diagonal);
       else if (descr.find("horizontal") != string::npos)
         addTexture(BTexture::Horizontal);
       else if (descr.find("vertical") != string::npos)
@@ -126,16 +126,16 @@ void BTexture::setDescription(const string &d) {
       addTexture(BTexture::Solid);
     }
 
-    if (descr.find("raised") != string::npos)
-      addTexture(BTexture::Raised);
-    else if (descr.find("sunken") != string::npos)
+    if (descr.find("sunken") != string::npos)
       addTexture(BTexture::Sunken);
+    else if (descr.find("flatborder") != string::npos)
+      addTexture(BTexture::FlatBorder);
     else if (descr.find("flat") != string::npos)
       addTexture(BTexture::Flat);
     else
       addTexture(BTexture::Raised);
 
-    if (! (texture() & BTexture::Flat)) {
+    if (! (texture() & (BTexture::Flat | BTexture::FlatBorder))) {
       if (descr.find("bevel2") != string::npos)
         addTexture(BTexture::Bevel2);
       else