X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0299c17dc878540bf190c290392db241b425ad..f78024a1f98fac96991a9f87804000512a32a976:/src/gtk1/colour.cpp?ds=sidebyside diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index b0efc2dcc2..9ac38bff4b 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -2,10 +2,9 @@ // Name: colour.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,9 +14,9 @@ #include "wx/gdicmn.h" -#ifdef USE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif +#include +#include +#include //----------------------------------------------------------------------------- // wxColour @@ -25,38 +24,104 @@ class wxColourRefData: public wxObjectRefData { - public: - - wxColourRefData(void); - ~wxColourRefData(void); - void FreeColour(void); - +public: + wxColourRefData(); + ~wxColourRefData(); + + void FreeColour(); + void AllocColour( GdkColormap* cmap ); + +public: 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(void) -{ - m_color.red = 0; - m_color.green = 0; - m_color.blue = 0; - m_color.pixel = 0; - m_colormap = 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::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; +} + +wxColourRefData::~wxColourRefData() +{ + FreeColour(); +} -void wxColourRefData::FreeColour(void) +void wxColourRefData::FreeColour() { -// if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 ); -}; + 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::AllocColour( GdkColormap *cmap ) +{ + if (m_hasPixel && (m_colormap == cmap)) + return; + + FreeColour(); + +#ifdef __WXGTK20__ + if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (m_colormap->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; +} //----------------------------------------------------------------------------- @@ -66,160 +131,140 @@ void wxColourRefData::FreeColour(void) IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) -wxColour::wxColour(void) +wxColour::wxColour() { -}; +} -wxColour::wxColour( char red, char green, 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; -}; - -wxColour::wxColour( const wxString &colourName ) +wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) { - wxNode *node = 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 )) + 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)) ) { - delete m_refData; - m_refData = 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 ); -}; +{ + Ref( col ); +} -wxColour::wxColour( const wxColour* col ) -{ - if (col) Ref( *col ); -}; +wxColour::~wxColour() +{ +} -wxColour::~wxColour(void) +wxColour& wxColour::operator = ( const wxColour& col ) { -}; + if (*this == col) return (*this); + Ref( col ); + return *this; +} -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; -wxColour& wxColour::operator = ( const wxString& colourName ) -{ - UnRef(); - wxNode *node = NULL; - if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) - { - wxColour *col = (wxColour*)node->Data(); - if (col) Ref( *col ); - } - else - { - m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName, &M_COLDATA->m_color )) - { - delete m_refData; - m_refData = NULL; - }; - }; - return *this; -}; + if (!m_refData) return FALSE; + if (!col.m_refData) return FALSE; -bool wxColour::operator == ( const wxColour& col ) -{ - return m_refData == col.m_refData; -}; + 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; -bool wxColour::operator != ( const wxColour& col) -{ - return m_refData != col.m_refData; -}; + return TRUE; +} -void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue ) +bool wxColour::operator != ( const wxColour& col) const { - 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; -}; + return !(*this == col); +} -unsigned char wxColour::Red(void) const +void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { - if (!Ok()) return 0; - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); -}; + 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; +} -unsigned char wxColour::Green(void) const +unsigned char wxColour::Red() const { - if (!Ok()) return 0; - return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); -}; + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); -unsigned char wxColour::Blue(void) const + return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); +} + +unsigned char wxColour::Green() const { - if (!Ok()) return 0; - return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); -}; + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); -bool wxColour::Ok(void) const + return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); +} + +unsigned char wxColour::Blue() const { - return (m_refData); -}; + wxCHECK_MSG( Ok(), 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 ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; - M_COLDATA->FreeColour(); - -#ifdef USE_GDK_IMLIB + if (!Ok()) return; - int r = M_COLDATA->m_color.red >> SHIFT; - int g = M_COLDATA->m_color.green >> SHIFT; - int b = M_COLDATA->m_color.blue >> SHIFT; - M_COLDATA->m_hasPixel = TRUE; - M_COLDATA->m_color.pixel = gdk_imlib_best_color_match( &r, &g, &b ); + M_COLDATA->AllocColour( cmap ); +} -#else +int wxColour::GetPixel() const +{ + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); - M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color ); - -#endif - - M_COLDATA->m_colormap = cmap; -}; + return M_COLDATA->m_color.pixel; +} -int wxColour::GetPixel(void) +GdkColor *wxColour::GetColor() const { - if (!Ok()) return 0; - - return M_COLDATA->m_color.pixel; -}; + wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); -GdkColor *wxColour::GetColor(void) -{ - if (!Ok()) return NULL; - - return &M_COLDATA->m_color; -}; + return &M_COLDATA->m_color; +}