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

fixed copy

Browse source
This commit is contained in:
fluxgen 2002-09-14 13:49:51 +00:00
parent 60bc660aa5
commit 62086e6f68
1 changed files with 68 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/Color.cc
View file

@ -19,10 +19,15 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Color.cc,v 1.1 2002/09/14 12:47:50 fluxgen Exp $ // $Id: Color.cc,v 1.2 2002/09/14 13:49:51 fluxgen Exp $
#include "Color.hh" #include "Color.hh"
#include "BaseDisplay.hh"
#include <iostream>
using namespace std;
namespace { namespace {
unsigned char maxValue(unsigned short colval) { unsigned char maxValue(unsigned short colval) {
if (colval == 65535) if (colval == 65535)
@ -35,30 +40,20 @@ unsigned char maxValue(unsigned short colval) {
namespace FbTk { namespace FbTk {
Color::Color(): Color::Color():
m_allocated(false) { m_allocated(false),
m_screen(0) {
} }
Color::Color(const Color &col_copy) {
copy(col_copy);
}
Color::Color(unsigned char red, unsigned char green, unsigned char blue, int screen): Color::Color(unsigned char red, unsigned char green, unsigned char blue, int screen):
m_red(red), m_green(green), m_blue(blue), m_red(red), m_green(green), m_blue(blue),
m_pixel(0), m_allocated(false) { m_pixel(0), m_allocated(false),
m_screen(screen) {
Display *disp = BaseDisplay::getXDisplay(); allocate(red, green, blue, screen);
XColor color;
// fill xcolor structure
color.red = red;
color.blue = blue;
color.green = green;
if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
cerr<<"FbTk::Color: Allocation error."<<endl;
} else {
setRGB(maxValue(color.red),
maxValue(color.green),
maxValue(color.blue));
setPixel(color.pixel);
setAllocated(true);
}
} }
Color::Color(const char *color_string, int screen): Color::Color(const char *color_string, int screen):
@ -66,6 +61,10 @@ m_allocated(false) {
setFromString(color_string, screen); setFromString(color_string, screen);
} }
Color::~Color() {
free();
}
bool Color::setFromString(const char *color_string, int screen) { bool Color::setFromString(const char *color_string, int screen) {
if (color_string == 0) { if (color_string == 0) {
@ -90,18 +89,65 @@ bool Color::setFromString(const char *color_string, int screen) {
maxValue(color.green), maxValue(color.green),
maxValue(color.blue)); maxValue(color.blue));
setAllocated(true); setAllocated(true);
m_screen = screen;
return true; return true;
} }
Color &Color::Color::operator = (const Color &col_copy) {
copy(col_copy);
return *this;
}
void Color::free() { void Color::free() {
if (isAllocated()) { if (isAllocated()) {
unsigned long pixel = col.pixel(); unsigned long pixel = m_pixel;
XFreeColors(disp, colm, &pixel, 1, 0); Display *disp = BaseDisplay::getXDisplay();
XFreeColors(disp, DefaultColormap(disp, m_screen), &pixel, 1, 0);
setPixel(0); setPixel(0);
setRGB(0, 0, 0); setRGB(0, 0, 0);
setAllocated(false); setAllocated(false);
} }
} }
void Color::copy(const Color &col_copy) {
if (!col_copy.isAllocated()) {
free();
return;
}
free();
allocate(col_copy.red(),
col_copy.green(),
col_copy.blue(),
col_copy.m_screen);
}
void Color::allocate(unsigned char red, unsigned char green, unsigned char blue, int screen) {
Display *disp = BaseDisplay::getXDisplay();
XColor color;
// fill xcolor structure
color.red = red;
color.blue = blue;
color.green = green;
if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
cerr<<"FbTk::Color: Allocation error."<<endl;
} else {
setRGB(maxValue(color.red),
maxValue(color.green),
maxValue(color.blue));
setPixel(color.pixel);
setAllocated(true);
}
}
void Color::setRGB(unsigned char red, unsigned char green, unsigned char blue) {
m_red = red;
m_green = green;
m_blue = blue;
}
}; };