X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47c93b637e9016ffcd3010b4d785d26f5b746b98..3352cfffbcaa61094ddadc2811c8186ae31c2960:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index a54ca5fdac..c57698a100 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -13,6 +13,8 @@ #endif #include "wx/gdicmn.h" +#include "wx/colour.h" +#include "wx/gtk/private.h" #include #include @@ -25,33 +27,68 @@ class wxColourRefData: public wxObjectRefData { public: - wxColourRefData(); - ~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; + } + + 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 ); -public: GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; 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() { @@ -66,13 +103,42 @@ void wxColourRefData::FreeColour() (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) #endif { - // What happens if the colour has not been allocated - // anew but has been found? RR. + 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::AllocColour( GdkColormap *cmap ) +{ + 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; +} + //----------------------------------------------------------------------------- #define M_COLDATA ((wxColourRefData *)m_refData) @@ -81,10 +147,6 @@ 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(); @@ -99,68 +161,71 @@ void wxColour::InitFromName( const wxString &colourName ) wxNode *node = (wxNode *) NULL; if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) { - wxColour *col = (wxColour*)node->Data(); + wxColour *col = (wxColour*)node->GetData(); UnRef(); if (col) Ref( *col ); } else { m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) + + if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color )) { - wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); - + // 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() { } -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; - + + 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) const +wxObjectRefData *wxColour::CreateRefData() const +{ + return new wxColourRefData; +} + +wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const { - return !(*this == col); + return new wxColourRefData(*(wxColourRefData *)data); } void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { - 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 = (GdkColormap*) NULL; + M_COLDATA->m_hasPixel = FALSE; } unsigned char wxColour::Red() const @@ -184,36 +249,11 @@ unsigned char wxColour::Blue() const 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 ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; - - M_COLDATA->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_COLDATA->m_hasPixel = gdk_colormap_alloc_color( cmap, &M_COLDATA->m_color, FALSE, TRUE ); - } - 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