X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 1d004de25f..a0e20540e4 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,219 +7,274 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif - -#include "wx/gdicmn.h" +#include "wx/colour.h" #include -#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class wxColourRefData: public wxObjectRefData +class wxColourRefData : public wxGDIRefData { - public: +public: +#ifdef __WXGTK3__ + wxColourRefData(const GdkRGBA& gdkRGBA) + : m_gdkRGBA(gdkRGBA) + { + m_gdkColor.red = guint16(gdkRGBA.red * 65535); + m_gdkColor.green = guint16(gdkRGBA.green * 65535); + m_gdkColor.blue = guint16(gdkRGBA.blue * 65535); + m_alpha = wxByte(gdkRGBA.alpha * 255 + 0.5); + } + wxColourRefData(const GdkColor& gdkColor) + : m_gdkColor(gdkColor) + { + m_gdkRGBA.red = gdkColor.red / 65535.0; + m_gdkRGBA.green = gdkColor.green / 65535.0; + m_gdkRGBA.blue = gdkColor.blue / 65535.0; + m_gdkRGBA.alpha = 1; + m_alpha = 255; + } + wxColourRefData(guchar red, guchar green, guchar blue, guchar alpha) + { + m_gdkRGBA.red = red / 255.0; + m_gdkRGBA.green = green / 255.0; + m_gdkRGBA.blue = blue / 255.0; + m_gdkRGBA.alpha = alpha / 255.0; + m_gdkColor.red = (guint16(red) << 8) + red; + m_gdkColor.green = (guint16(green) << 8) + green; + m_gdkColor.blue = (guint16(blue) << 8) + blue; + m_alpha = alpha; + } + GdkRGBA m_gdkRGBA; + GdkColor m_gdkColor; +#else + wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff) + { + 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; +#endif + wxByte m_alpha; - friend class wxColour; + wxDECLARE_NO_COPY_CLASS(wxColourRefData); }; -wxColourRefData::wxColourRefData() +#ifndef __WXGTK3__ +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; + } + } } +#endif //----------------------------------------------------------------------------- -#define M_COLDATA ((wxColourRefData *)m_refData) - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - -IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) +#define M_COLDATA static_cast(m_refData) -wxColour::wxColour() -{ -} +// GDK's values are in 0..65535 range, ours are in 0..255 +#define SHIFT 8 -wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) +#ifdef __WXGTK3__ +wxColour::wxColour(const GdkRGBA& gdkRGBA) { - 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(gdkRGBA); } -void wxColour::InitFromName( const wxString &colourName ) +wxColour::wxColour(const GdkColor& gdkColor) { - 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") ); - - delete m_refData; - m_refData = (wxObjectRefData *) NULL; - } - } + m_refData = new wxColourRefData(gdkColor); } - -wxColour::wxColour( const wxColour& col ) +#else +wxColour::wxColour(const GdkColor& gdkColor) { - Ref( col ); + m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue); } +#endif 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; -} - -bool wxColour::operator != ( const wxColour& col) const -{ - return !(*this == col); + if (m_refData == col.m_refData) + return true; + + if (!m_refData || !col.m_refData) + return false; + + wxColourRefData* refData = M_COLDATA; + wxColourRefData* that_refData = static_cast(col.m_refData); +#ifdef __WXGTK3__ + return refData->m_gdkColor.red == that_refData->m_gdkColor.red && + refData->m_gdkColor.green == that_refData->m_gdkColor.green && + refData->m_gdkColor.blue == that_refData->m_gdkColor.blue && +#else + return refData->m_red == that_refData->m_red && + refData->m_green == that_refData->m_green && + refData->m_blue == that_refData->m_blue && +#endif + 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; + +#ifdef __WXGTK3__ + m_refData = new wxColourRefData(red, green, blue, alpha); +#else + m_refData = new wxColourRefData( + (guint16(red) << SHIFT) + red, + (guint16(green) << SHIFT) + green, + (guint16(blue) << SHIFT) + blue, + alpha); +#endif } unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); +#ifdef __WXGTK3__ + return wxByte(M_COLDATA->m_gdkColor.red >> 8); +#else + return wxByte(M_COLDATA->m_red >> SHIFT); +#endif } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); +#ifdef __WXGTK3__ + return wxByte(M_COLDATA->m_gdkColor.green >> 8); +#else + return wxByte(M_COLDATA->m_green >> SHIFT); +#endif } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); +#ifdef __WXGTK3__ + return wxByte(M_COLDATA->m_gdkColor.blue >> 8); +#else + return wxByte(M_COLDATA->m_blue >> SHIFT); +#endif } -bool wxColour::Ok() const +unsigned char wxColour::Alpha() const { - return (m_refData != NULL); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); + + return M_COLDATA->m_alpha; } +#ifndef __WXGTK3__ 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 ); - } + if (!IsOk()) return; - M_COLDATA->m_colormap = cmap; + M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } +#endif -GdkColor *wxColour::GetColor() const +const GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); +#ifdef __WXGTK3__ + return &M_COLDATA->m_gdkColor; +#else return &M_COLDATA->m_color; +#endif +} + +#ifdef __WXGTK3__ +wxColour::operator const GdkRGBA*() const +{ + const GdkRGBA* c = NULL; + if (IsOk()) + c = &M_COLDATA->m_gdkRGBA; + return c; } +#endif +bool wxColour::FromString(const wxString& str) +{ +#ifdef __WXGTK3__ + GdkRGBA gdkRGBA; + if (gdk_rgba_parse(&gdkRGBA, wxGTK_CONV_SYS(str))) + { + *this = wxColour(gdkRGBA); + return true; + } +#else + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) ) + { + *this = wxColour(colGDK); + return true; + } +#endif + return wxColourBase::FromString(str); +}