nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added static validColorString function, returns true if the color string is in valid color format

Browse source
This commit is contained in:
fluxgen 2006-02-12 08:05:34 +00:00
parent e85b2f3f5b
commit ab26593cdd
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/FbTk/Color.cc
View file

@ -31,11 +31,9 @@
using namespace std;
namespace {
unsigned char maxValue(unsigned short colval) {
if (colval == 65535)
return 0xFF;
return static_cast<unsigned char>(colval/0xFF);
inline unsigned char maxValue(unsigned short colval) {
return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF);
}
};
@ -106,6 +104,17 @@ bool Color::setFromString(const char *color_string, int screen) {
return true;
}
bool Color::validColorString(const char *color_string, int screen) {
XColor color;
Display *disp = App::instance()->display();
Colormap colm = DefaultColormap(disp, screen);
// trim white space
string color_string_tmp = color_string;
StringUtil::removeFirstWhitespace(color_string_tmp);
StringUtil::removeTrailingWhitespace(color_string_tmp);
return XParseColor(disp, colm, color_string_tmp.c_str(), &color) != 0;
}
Color &Color::operator = (const Color &col_copy) {
// check for aliasing

5
src/FbTk/Color.hh
View file

@ -54,7 +54,10 @@ public:
inline unsigned short green() const { return m_green; }
inline unsigned short blue() const { return m_blue; }
inline unsigned long pixel() const { return m_pixel; }
/// @return true if the color name in color_string is resolved, else false
static bool validColorString(const char *color_string, int screen);
private:
void free();
void copy(const Color &col);