X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..277f2e527e33de039146ab94358ffec9c98f6112:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 09479c1230..84c790a329 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,7 +14,9 @@ #include "wx/gdicmn.h" -#include "gdk/gdkprivate.h" +#include +#include +#include //----------------------------------------------------------------------------- // wxColour @@ -22,37 +24,117 @@ class wxColourRefData: public wxObjectRefData { - public: - - wxColourRefData(); - ~wxColourRefData(); +public: + wxColourRefData() + { + m_color.red = 0; + m_color.green = 0; + m_color.blue = 0; + m_color.pixel = 0; + m_colormap = (GdkColormap *) NULL; + m_hasPixel = FALSE; + } + + wxColourRefData(const wxColourRefData& data) + : wxObjectRefData() + { + m_color = data.m_color; + m_colormap = data.m_colormap; + m_hasPixel = data.m_hasPixel; + } + + ~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); + } + void FreeColour(); - + void AllocColour( GdkColormap* cmap ); + GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; - - friend wxColour; + + friend class wxColour; + + // reference counter for systems with <= 8-Bit display + static gushort colMapAllocCounter[ 256 ]; }; -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; -} +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 +}; -wxColourRefData::~wxColourRefData() +void wxColourRefData::FreeColour() { - FreeColour(); + if (m_colormap) + { +#ifdef __WXGTK20__ + if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) +#else + GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap; + if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) +#endif + { + int idx = m_color.pixel; + colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; + + if (colMapAllocCounter[ idx ] == 0) + gdk_colormap_free_colors( m_colormap, &m_color, 1 ); + } + } } -void wxColourRefData::FreeColour() +void wxColourRefData::AllocColour( GdkColormap *cmap ) { -// if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 ); + if (m_hasPixel && (m_colormap == cmap)) + return; + + FreeColour(); + +#ifdef __WXGTK20__ + if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) || + (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) +#else + GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; + if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) +#endif + { + m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE ); + int idx = m_color.pixel; + colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1; + } + else + { + m_hasPixel = gdk_color_alloc( cmap, &m_color ); + } + m_colormap = cmap; } //----------------------------------------------------------------------------- @@ -63,166 +145,125 @@ void wxColourRefData::FreeColour() 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; + 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, &M_COLDATA->m_color )) + wxNode *node = (wxNode *) NULL; + if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - delete m_refData; - m_refData = (wxObjectRefData *) NULL; + 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 )) + { + // VZ: asserts are good in general but this one is triggered by + // calling wxColourDatabase::FindColour() with an + // unrecognized colour name and this can't be avoided from the + // user code, so don't give it here + // + // a better solution would be to changed code in FindColour() + + //wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + + delete m_refData; + m_refData = (wxObjectRefData *) NULL; + } } - } -} - -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -} - -wxColour::wxColour( const wxColour* col ) -{ - if (col) Ref( *col ); } 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 || !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 ) -{ - return m_refData == col.m_refData; +wxObjectRefData *wxColour::CreateRefData() const +{ + return new wxColourRefData; } -bool wxColour::operator != ( const wxColour& col) -{ - return m_refData != col.m_refData; +wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const +{ + return new wxColourRefData(*(wxColourRefData *)data); } void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { - 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; + AllocExclusive(); + + 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; } unsigned char wxColour::Red() const { - if (!Ok()) - { - wxFAIL_MSG( "invalid colour" ); - return 0; - } - - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + + return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green() const { - if (!Ok()) - { - wxFAIL_MSG( "invalid colour" ); - return 0; - } - - return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + + return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue() const { - if (!Ok()) - { - wxFAIL_MSG( "invalid colour" ); - return 0; - } - - return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); -} + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); -bool wxColour::Ok() const -{ - return (m_refData != NULL); + return (unsigned char)(M_COLDATA->m_color.blue >> 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; + if (!Ok()) return; + + M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - if (!Ok()) return 0; - - return M_COLDATA->m_color.pixel; + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + + return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - if (!Ok()) return (GdkColor *) NULL; - - return &M_COLDATA->m_color; + wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); + + return &M_COLDATA->m_color; }