X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..593354ca47abaae8a434f99642acc57f7834f77b:/src/gtk/colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index a4ca937116..b2bb1b993a 100644
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/gtk/colour.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,206 +7,159 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
+#include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#include "wx/gtk/private.h"
 
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData
 {
-  public:
+public:
+    wxColourRefData(guint16 red, guint16 green, guint16 blue, guint16 alpha)
+    {
+        m_color.red =
+        m_red = red;
+        m_color.green =
+        m_green = green;
+        m_color.blue =
+        m_blue = blue;
+        m_alpha = alpha;
+        m_color.pixel = 0;
+        m_colormap = NULL;
+    }
+
+    virtual ~wxColourRefData()
+    {
+        FreeColour();
+    }
 
-    wxColourRefData();
-    ~wxColourRefData();
     void FreeColour();
+    void AllocColour( GdkColormap* cmap );
 
     GdkColor     m_color;
     GdkColormap *m_colormap;
-    bool         m_hasPixel;
+    // gdk_colormap_alloc_color may change the RGB values in m_color, so we need separate copies
+    guint16 m_red;
+    guint16 m_green;
+    guint16 m_blue;
+    guint16 m_alpha;
 
-    friend wxColour;
+    DECLARE_NO_COPY_CLASS(wxColourRefData)
 };
 
-wxColourRefData::wxColourRefData()
+void wxColourRefData::FreeColour()
 {
-    m_color.red = 0;
-    m_color.green = 0;
-    m_color.blue = 0;
-    m_color.pixel = 0;
-    m_colormap = (GdkColormap *) NULL;
-    m_hasPixel = FALSE;
+    if (m_colormap)
+    {
+        gdk_colormap_free_colors(m_colormap, &m_color, 1);
+        m_colormap = NULL;
+        m_color.pixel = 0;
+    }
 }
 
-wxColourRefData::~wxColourRefData()
+void wxColourRefData::AllocColour( GdkColormap *cmap )
 {
-    FreeColour();
-}
+    if (m_colormap != cmap)
+    {
+        FreeColour();
 
-void wxColourRefData::FreeColour()
-{
-//  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
+        m_color.red = m_red;
+        m_color.green = m_green;
+        m_color.blue = m_blue;
+        if (gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE))
+        {
+            m_colormap = cmap;
+        }
+    }
 }
 
 //-----------------------------------------------------------------------------
 
-#define M_COLDATA ((wxColourRefData *)m_refData)
+#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData)
 
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
+// GDK's values are in 0..65535 range, ours are in 0..255
+#define SHIFT  8
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
-wxColour::wxColour()
-{
-}
-
-wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
-{
-    m_refData = new wxColourRefData();
-    M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
-    M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
-    M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
-    M_COLDATA->m_color.pixel = 0;
-}
-
-void wxColour::InitFromName( const wxString &colourName )
-{
-    wxNode *node = (wxNode *) NULL;
-    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
-    {
-        wxColour *col = (wxColour*)node->Data();
-        UnRef();
-        if (col) Ref( *col );
-    }
-    else
-    {
-        m_refData = new wxColourRefData();
-        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
-        {
-            wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-	    wxPrintf( wxT("Colourname %s.\n"), WXSTRINGCAST colourName );
-      
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
-    }
-}
-
-wxColour::wxColour( const wxColour& col )
+wxColour::wxColour(const GdkColor& gdkColor)
 {
-    Ref( col );
+    m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue, 0xFFFF /*opaque alpha in 16 bit*/);
 }
 
 wxColour::~wxColour()
 {
 }
 
-wxColour& wxColour::operator = ( const wxColour& col )
-{
-    if (*this == col) return (*this);
-    Ref( col );
-    return *this;
-}
-
 bool wxColour::operator == ( const wxColour& col ) const
 {
-    if (m_refData == col.m_refData) return TRUE;
-    
-    if (!m_refData) return FALSE;
-    if (!col.m_refData) return FALSE;
-    
-    GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
-    GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
-    if (own->red != other->red) return FALSE;
-    if (own->blue != other->blue) return FALSE;
-    if (own->green != other->green) return FALSE;
-    
-    return TRUE;
-}
+    if (m_refData == col.m_refData)
+        return true;
 
-bool wxColour::operator != ( const wxColour& col) const
-{
-    return m_refData != col.m_refData;
+    if (!m_refData || !col.m_refData)
+        return false;
+
+    wxColourRefData* refData = M_COLDATA;
+    wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, col.m_refData);
+    return refData->m_red == that_refData->m_red &&
+           refData->m_green == that_refData->m_green &&
+           refData->m_blue == that_refData->m_blue &&
+           refData->m_alpha == that_refData->m_alpha;
 }
 
-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+                        unsigned char alpha)
 {
     UnRef();
-    m_refData = new wxColourRefData();
-    M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
-    M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
-    M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
-    M_COLDATA->m_color.pixel = 0;
+
+    m_refData = new wxColourRefData(
+        (guint16(red) << SHIFT) + red,
+        (guint16(green) << SHIFT) + green,
+        (guint16(blue) << SHIFT) + blue,
+        (guint16(alpha) << SHIFT) + alpha);
 }
 
 unsigned char wxColour::Red() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
-    return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+    return wxByte(M_COLDATA->m_red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
-    return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+    return wxByte(M_COLDATA->m_green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
-    return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+    return wxByte(M_COLDATA->m_blue >> SHIFT);
 }
 
-bool wxColour::Ok() const
+unsigned char wxColour::Alpha() const
 {
-    return (m_refData != NULL);
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return wxByte(M_COLDATA->m_alpha >> SHIFT);
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!Ok()) return;
 
-    if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-    
-    M_COLDATA->FreeColour();
-
-    GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
-    if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-        (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
-    {
-        GdkColor *colors = cmap->colors;
-        int max = 3 * (65536);
-        int index = -1;
-
-        for (int i = 0; i < cmap->size; i++)
-        {
-            int rdiff = (M_COLDATA->m_color.red - colors[i].red);
-            int gdiff = (M_COLDATA->m_color.green - colors[i].green);
-            int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
-            int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-            if (sum < max) { index = i; max = sum; }
-        }
-
-        M_COLDATA->m_hasPixel = TRUE;
-        M_COLDATA->m_color.pixel = index;
-    }
-    else
-    { 
-        M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-    }
-
-    M_COLDATA->m_colormap = cmap;
+    M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
@@ -216,11 +169,21 @@ int wxColour::GetPixel() const
     return M_COLDATA->m_color.pixel;
 }
 
-GdkColor *wxColour::GetColor() const
+const GdkColor *wxColour::GetColor() const
 {
-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
 
     return &M_COLDATA->m_color;
 }
 
+bool wxColour::FromString(const wxString& str)
+{
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+    {
+        *this = wxColour(colGDK);
+        return true;
+    }
 
+    return wxColourBase::FromString(str);
+}