1 files changed, 64 insertions, 19 deletions

diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index 2cd4278..ae35a94 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -31,6 +31,10 @@ using std::cerr;
 using std::endl;
 using std::string;
 
+#if HAVE_XRENDER
+#include <X11/Xft/Xft.h>
+#endif
+
 namespace {
 
 inline unsigned char maxValue(unsigned short colval) {
@@ -50,19 +54,31 @@ Color::Color():
 }
 
 Color::Color(const Color &col_copy):
-    m_red(0), m_green(0), m_blue(0),
+    m_red(0), m_green(0), m_blue(0), m_alpha(0),
     m_pixel(0),
     m_allocated(false), m_screen(0) {
     copy(col_copy);
 }
 
 Color::Color(unsigned short red, unsigned short green, unsigned short blue, int screen):
-    m_red(red), m_green(green), m_blue(blue),
+    m_red(red), m_green(green), m_blue(blue), m_alpha(0),
     m_pixel(0), m_allocated(false),
     m_screen(screen) {
-    allocate(red, green, blue, screen);
+
+        printf("Color: New RGB color: %d/%d/%d\n", red, green, blue);
+    allocate(red, green, blue, 0, screen);
 }
 
+Color::Color(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha, int screen):
+    m_red(red), m_green(green), m_blue(blue), m_alpha(alpha),
+    m_pixel(0), m_allocated(false),
+    m_screen(screen) {
+
+        printf("Color: New RGB color: %d/%d/%d/%d\n", red, green, blue, alpha);
+    allocate(red, green, blue, alpha, screen);
+}
+
+
 Color::Color(const char *color_string, int screen):
     m_red(0), m_green(0), m_blue(0),
     m_pixel(0),
@@ -86,29 +102,23 @@ bool Color::setFromString(const char *color_string, int screen) {
     StringUtil::removeTrailingWhitespace(color_string_tmp);
 
     Display *disp = App::instance()->display();
-    Colormap colm = DefaultColormap(disp, screen);
+    Colormap colm = App::instance()->defaultColormap(screen);
 
     XColor color;
 
+        printf("Color: Parsing color string %s\n", color_string_tmp.c_str());
     if (! XParseColor(disp, colm, color_string_tmp.c_str(), &color))
         return false;
-    else if (! XAllocColor(disp, colm, &color))
-        return false;
 
-    setPixel(color.pixel);
-    setRGB(maxValue(color.red),
-           maxValue(color.green),
-           maxValue(color.blue));
-    setAllocated(true);
-    m_screen = screen;
+    allocate(color.red, color.green, color.blue, 0, screen);
 
-    return true;
+    return isAllocated();
 }
 
 bool Color::validColorString(const char *color_string, int screen) {
     XColor color;
     Display *disp = App::instance()->display();
-    Colormap colm = DefaultColormap(disp, screen);
+    Colormap colm = App::instance()->defaultColormap(screen);
     // trim white space
     string color_string_tmp = color_string;
     StringUtil::removeFirstWhitespace(color_string_tmp);
@@ -129,9 +139,14 @@ Color &Color::operator = (const Color &col_copy) {
 
 void Color::free() {
     if (isAllocated()) {
-        unsigned long pixel = m_pixel;
         Display *disp = App::instance()->display();
-        XFreeColors(disp, DefaultColormap(disp, m_screen), &pixel, 1, 0);
+#if HAVE_XRENDER
+                XftColorFree(disp, App::instance()->defaultVisual(m_screen),
+                                App::instance()->defaultColormap(m_screen), &m_xftcolor);
+#else /* No XRENDER */
+        unsigned long pixel = m_pixel;
+        XFreeColors(disp, App::instance()->defaultColormap(m_screen), &pixel, 1, 0);
+#endif
         setPixel(0);
         setRGB(0, 0, 0);
         setAllocated(false);
@@ -149,39 +164,69 @@ void Color::copy(const Color &col_copy) {
     allocate(col_copy.red()*0x101,
              col_copy.green()*0x101,
              col_copy.blue()*0x101,
+                         col_copy.alpha()*0x101,
              col_copy.m_screen);
 
 }
 
-void Color::allocate(unsigned short red, unsigned short green, unsigned short blue, int screen) {
+void Color::allocate(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha, int screen) {
 
     Display *disp = App::instance()->display();
+        Colormap cmap = App::instance()->defaultColormap(screen);
+        int xresult;
+
+#if HAVE_XRENDER
+        Visual *vis = App::instance()->defaultVisual(screen);
+        XRenderColor acolor;
+        acolor.red = red;
+        acolor.green = green;
+        acolor.blue = blue;
+        acolor.alpha = alpha;
+
+        xresult = XftColorAllocValue(disp, vis, cmap, &acolor, &m_xftcolor);
+        printf("Color: XftColorAllocValue(%04x/%04x/%04x/%04x) returned %d\n",
+                        red, green, blue, alpha, xresult);
+#else /* No XRENDER */
     XColor color;
     // fill xcolor structure
     color.red = red;
     color.green = green;
     color.blue = blue;
 
+    xresult = XAllocColor(disp, cmap, &color);
+        printf("Color: XAllocColor(%04x/%04x/%04x) returned %d\n",
+                        red, green, blue, xresult);
+#endif
 
-    if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
+    if (!xresult) {
         _FB_USES_NLS;
         cerr<<"FbTk::Color: "<<_FBTK_CONSOLETEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
     } else {
         free();
+#if HAVE_XRENDER
+        setRGB(maxValue(m_xftcolor.color.red),
+               maxValue(m_xftcolor.color.green),
+               maxValue(m_xftcolor.color.blue),
+                           maxValue(m_xftcolor.color.alpha));
+        setPixel(m_xftcolor.pixel);
+#else /* No XRENDER */
         setRGB(maxValue(color.red),
                maxValue(color.green),
                maxValue(color.blue));
         setPixel(color.pixel);
+#endif
         setAllocated(true);
     }
 
     m_screen = screen;
 }
 
-void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue) {
+void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue,
+                unsigned short alpha) {
     m_red = red;
     m_green = green;
     m_blue = blue;
+        m_alpha = alpha;
 }
 
 };