X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/colour.cpp?ds=inline diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index b7c2dc1176..51fde80c11 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/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,8 @@ #include "wx/gdicmn.h" -#ifdef wxUSE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif +#include "gdk/gdk.h" +#include "gdk/gdkprivate.h" //----------------------------------------------------------------------------- // wxColour @@ -26,31 +24,31 @@ class wxColourRefData: public wxObjectRefData { public: - + wxColourRefData(); ~wxColourRefData(); void FreeColour(); - + GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; - + friend 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; + 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(); + FreeColour(); } void wxColourRefData::FreeColour() @@ -70,151 +68,159 @@ wxColour::wxColour() { } -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; + 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)) ) + { + wxColour *col = (wxColour*)node->Data(); + UnRef(); + if (col) Ref( *col ); + } + else { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - delete m_refData; - m_refData = (wxObjectRefData *) NULL; + m_refData = new wxColourRefData(); + if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) + { + wxFAIL_MSG( _T("wxColour: couldn't find colour") ); + wxPrintf( _T("Colourname %s.\n"), WXSTRINGCAST colourName ); + + delete m_refData; + m_refData = (wxObjectRefData *) NULL; + } } - } } wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -} - -wxColour::wxColour( const wxColour* col ) -{ - if (col) Ref( *col ); +{ + Ref( col ); } wxColour::~wxColour() { } -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 ) -{ - return m_refData == col.m_refData; +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; + + 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; +bool wxColour::operator != ( const wxColour& col) const +{ + return m_refData != col.m_refData; } -void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue ) +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; + 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::Red() const { - if (!Ok()) - { - wxFAIL_MSG( "invalid colour" ); - return 0; - } - - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); + wxCHECK_MSG( Ok(), 0, _T("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, _T("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, _T("invalid colour") ); + + return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } bool wxColour::Ok() const { - return (m_refData != NULL); + 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 wxUSE_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 ); + if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; + + M_COLDATA->FreeColour(); -#else + 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_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color ); - -#endif - - M_COLDATA->m_colormap = cmap; + M_COLDATA->m_colormap = cmap; } int wxColour::GetPixel() const { - if (!Ok()) return 0; - - return M_COLDATA->m_color.pixel; + wxCHECK_MSG( Ok(), 0, _T("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, _T("invalid colour") ); + + return &M_COLDATA->m_color; }