X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6af8d80dcdd9d7ef9cca3aaaaf8fe4db343d7ae..c3eeb758b7790948751f547fd5ef803a75b803a4:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 90bd8e158a..98946e1649 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -2,22 +2,26 @@ // 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/gdicmn.h" +#include "wx/colour.h" +#include "wx/gtk/private.h" -#ifdef USE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif +#include +#include +#include //----------------------------------------------------------------------------- // wxColour @@ -25,38 +29,118 @@ class wxColourRefData: public wxObjectRefData { - public: - - wxColourRefData(void); - ~wxColourRefData(void); - void FreeColour(void); - +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(void) +gushort wxColourRefData::colMapAllocCounter[ 256 ] = { - m_color.red = 0; - m_color.green = 0; - m_color.blue = 0; - m_color.pixel = 0; - m_colormap = NULL; - m_hasPixel = FALSE; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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) +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) +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; +} //----------------------------------------------------------------------------- @@ -66,162 +150,138 @@ void wxColourRefData::FreeColour(void) IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) -wxColour::wxColour(void) -{ -}; - -wxColour::wxColour( char red, char green, char blue ) +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; -}; - -wxColour::wxColour( const wxString &colourName ) -{ - 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; +} + +/* static */ +wxColour wxColour::CreateByName(const wxString& name) +{ + wxColour col; + + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) ) { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - delete m_refData; - m_refData = NULL; - }; - }; -}; + wxColourRefData *refData = new wxColourRefData; + refData->m_color = colGDK; + col.m_refData = refData; + } -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -}; + return col; +} -wxColour::wxColour( const wxColour* col ) -{ - if (col) Ref( *col ); -}; -wxColour::~wxColour(void) +void wxColour::InitFromName( const wxString &colourName ) { -}; + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) + { + col = wxTheColourDatabase->Find(colourName); + } -wxColour& wxColour::operator = ( const wxColour& col ) -{ - if (*this == col) return (*this); - Ref( col ); - return *this; -}; + if ( !col.Ok() ) + { + col = CreateByName(colourName); + } -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 )) + if ( col.Ok() ) { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - delete m_refData; - m_refData = NULL; - }; - }; - return *this; -}; + *this = col; + } + else + { + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + } +} -bool wxColour::operator == ( const wxColour& col ) -{ - return m_refData == col.m_refData; -}; +wxColour::~wxColour() +{ +} -bool wxColour::operator != ( const wxColour& col) -{ - return m_refData != col.m_refData; -}; +bool wxColour::operator == ( const wxColour& col ) const +{ + if (m_refData == col.m_refData) + return true; + + if (!m_refData || !col.m_refData) + return false; -void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue ) + 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; +} + +wxObjectRefData *wxColour::CreateRefData() 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 new wxColourRefData; +} -unsigned char wxColour::Red(void) const +wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const { - if (!Ok()) return 0; - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); -}; + return new wxColourRefData(*(wxColourRefData *)data); +} -unsigned char wxColour::Green(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.green >> SHIFT); -}; + AllocExclusive(); -unsigned char wxColour::Blue(void) const + 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 { - if (!Ok()) return 0; - return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); -}; + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + + return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); +} -bool wxColour::Ok(void) const +unsigned char wxColour::Green() const { - return (m_refData); -}; + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); -void wxColour::CalcPixel( GdkColormap *cmap ) + return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); +} + +unsigned char wxColour::Blue() const { - if (!Ok()) return; - - if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; - M_COLDATA->FreeColour(); - -#ifdef USE_GDK_IMLIB + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); - 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 ); + return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); +} -#else +void wxColour::CalcPixel( GdkColormap *cmap ) +{ + if (!Ok()) return; - M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color ); - -#endif - - M_COLDATA->m_colormap = cmap; -}; + M_COLDATA->AllocColour( cmap ); +} -int wxColour::GetPixel(void) +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(void) +GdkColor *wxColour::GetColor() const { - if (!Ok()) return NULL; - - return &M_COLDATA->m_color; -}; + wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); + + return &M_COLDATA->m_color; +}