X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f234c60c4aac2e077b16b8fbb3009ad45a84c73b..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 88a76bba56..2057133fe5 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/gtk1/colour.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,209 +7,232 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "colour.h" +#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" #endif -#include "wx/gdicmn.h" +#include "wx/gtk1/private.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class wxColourRefData: public wxObjectRefData +class wxColourRefData : public wxGDIRefData { - public: +public: + wxColourRefData() + { + m_color.red = 0; + m_color.green = 0; + m_color.blue = 0; + m_color.pixel = 0; + m_colormap = NULL; + m_hasPixel = false; + } + + wxColourRefData(const wxColourRefData& data) + { + m_color = data.m_color; + m_colormap = data.m_colormap; + m_hasPixel = data.m_hasPixel; + } + + virtual ~wxColourRefData() + { + FreeColour(); + } + + bool operator == (const wxColourRefData& data) const + { + return (m_colormap == data.m_colormap && + m_hasPixel == data.m_hasPixel && + m_color.red == data.m_color.red && + m_color.green == data.m_color.green && + m_color.blue == data.m_color.blue && + m_color.pixel == data.m_color.pixel); + } - wxColourRefData(); - ~wxColourRefData(); void FreeColour(); + void AllocColour( GdkColormap* cmap ); GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; - friend wxColour; -}; + friend class wxColour; -wxColourRefData::wxColourRefData() -{ - m_color.red = 0; - m_color.green = 0; - m_color.blue = 0; - m_color.pixel = 0; - m_colormap = (GdkColormap *) NULL; - m_hasPixel = FALSE; -} + // reference counter for systems with <= 8-Bit display + static gushort colMapAllocCounter[ 256 ]; +}; -wxColourRefData::~wxColourRefData() -{ - FreeColour(); -} +gushort wxColourRefData::colMapAllocCounter[ 256 ] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; void wxColourRefData::FreeColour() { -// if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 ); -} - -//----------------------------------------------------------------------------- - -#define M_COLDATA ((wxColourRefData *)m_refData) - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - -IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) + if (m_colormap) + { + GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap; + if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) + { + int idx = m_color.pixel; + colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; -wxColour::wxColour() -{ + if (colMapAllocCounter[ idx ] == 0) + gdk_colormap_free_colors( m_colormap, &m_color, 1 ); + } + } } -wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) +void wxColourRefData::AllocColour( GdkColormap *cmap ) { - 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; -} + if (m_hasPixel && (m_colormap == cmap)) + return; -void wxColour::InitFromName( const wxString &colourName ) -{ - wxNode *node = (wxNode *) NULL; - if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) + FreeColour(); + + GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; + if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) { - wxColour *col = (wxColour*)node->Data(); - UnRef(); - if (col) Ref( *col ); + m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE ); + int idx = m_color.pixel; + colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1; } else { - m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName, &M_COLDATA->m_color )) - { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - printf( "Colourname %s.\n", WXSTRINGCAST colourName ); - - delete m_refData; - m_refData = (wxObjectRefData *) NULL; - } + m_hasPixel = gdk_color_alloc( cmap, &m_color ); } + m_colormap = cmap; } -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -} +//----------------------------------------------------------------------------- + +#define M_COLDATA ((wxColourRefData *)m_refData) + +// GDK's values are in 0..65535 range, our are in 0..255 +#define SHIFT 8 wxColour::~wxColour() { } -wxColour& wxColour::operator = ( const wxColour& col ) +bool wxColour::operator == ( const wxColour& col ) const { - if (*this == col) return (*this); - Ref( col ); - return *this; + if (m_refData == col.m_refData) + return true; + + if (!m_refData || !col.m_refData) + return false; + + GdkColor *own = &(((wxColourRefData*)m_refData)->m_color); + GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color); + return own->red == other->red && + own->blue == other->blue && + own->green == other->green; } -bool wxColour::operator == ( const wxColour& col ) +wxGDIRefData *wxColour::CreateGDIRefData() const { - return m_refData == col.m_refData; + return new wxColourRefData; } -bool wxColour::operator != ( const wxColour& col) +wxGDIRefData *wxColour::CloneGDIRefData(const wxGDIRefData *data) const { - return m_refData != col.m_refData; + return new wxColourRefData(*(wxColourRefData *)data); } -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 WXUNUSED(alpha)) { - UnRef(); - m_refData = new wxColourRefData(); + AllocExclusive(); + 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_COLDATA->m_colormap = NULL; + M_COLDATA->m_hasPixel = false; } unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } -bool wxColour::Ok() const -{ - return (m_refData != NULL); -} - void wxColour::CalcPixel( GdkColormap *cmap ) { - if (!Ok()) return; + if (!IsOk()) 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 { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } +bool wxColour::FromString(const wxString& str) +{ + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV(str), &colGDK ) ) + { + UnRef(); + + m_refData = new wxColourRefData; + M_COLDATA->m_color = colGDK; + return true; + } + return wxColourBase::FromString(str); +}