Use the same lookup-tables for solid and gradient textures

1 files changed, 21 insertions, 13 deletions

diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc
index 408ff5b..da45bc4 100644
--- a/src/FbTk/Texture.cc
+++ b/src/FbTk/Texture.cc
@@ -32,6 +32,20 @@
   #include <string.h>
 #endif
 
+#include "ColorLUT.hh"
+
+namespace {
+
+unsigned short inline brighten(unsigned short c) {
+    return 0x101 * FbTk::ColorLUT::PRE_MULTIPLY_1_5[c];
+}
+
+unsigned short inline darken(unsigned short c) {
+    return 0x101 * FbTk::ColorLUT::PRE_MULTIPLY_0_75[c];
+}
+
+}
+
 namespace FbTk {
 
 void Texture::setFromString(const char * const texture_str) {
@@ -100,27 +114,21 @@ void Texture::setFromString(const char * const texture_str) {
 
 void Texture::calcHiLoColors(int screen_num) {
     Display *disp = FbTk::App::instance()->display();
-    XColor xcol;
     Colormap colm = DefaultColormap(disp, screen_num);
+    XColor xcol;
 
-    xcol.red = (unsigned int) (m_color.red() + (m_color.red() >> 1));
-    if (xcol.red >= 0xff) xcol.red = 0xffff;
-    else xcol.red *= 0x101;
-    xcol.green = (unsigned int) (m_color.green() + (m_color.green() >> 1));
-    if (xcol.green >= 0xff) xcol.green = 0xffff;
-    else xcol.green *= 0x101;
-    xcol.blue = (unsigned int) (m_color.blue() + (m_color.blue() >> 1));
-    if (xcol.blue >= 0xff) xcol.blue = 0xffff;
-    else xcol.blue *= 0x101;
+    xcol.red = ::brighten(m_color.red());
+    xcol.green = ::brighten(m_color.green());
+    xcol.blue = ::brighten(m_color.blue());
 
     if (! XAllocColor(disp, colm, &xcol))
         xcol.pixel = 0;
 
     m_hicolor.setPixel(xcol.pixel);
 
-    xcol.red = (unsigned int) ((m_color.red() >> 2) + (m_color.red() >> 1)) * 0x101;
-    xcol.green = (unsigned int) ((m_color.green() >> 2) + (m_color.green() >> 1)) * 0x101;
-    xcol.blue = (unsigned int) ((m_color.blue() >> 2) + (m_color.blue() >> 1)) * 0x101;
+    xcol.red = ::darken(m_color.red());
+    xcol.green = ::darken(m_color.green());
+    xcol.blue = ::darken(m_color.blue());
 
     if (! XAllocColor(disp, colm, &xcol))
         xcol.pixel = 0;