X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index b7c2dc1176..b08a6b4ab4 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -1,23 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/gtk/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 ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif +#include "wx/colour.h" -#include "wx/gdicmn.h" +#include "wx/gtk/private.h" -#ifdef wxUSE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif +#include //----------------------------------------------------------------------------- // wxColour @@ -25,196 +22,168 @@ class wxColourRefData: public wxObjectRefData { - public: - - wxColourRefData(); - ~wxColourRefData(); +public: + wxColourRefData(guint16 red, guint16 green, guint16 blue, guint16 alpha) + { + m_color.red = + m_red = red; + m_color.green = + m_green = green; + m_color.blue = + m_blue = blue; + m_alpha = alpha; + m_color.pixel = 0; + m_colormap = NULL; + } + + virtual ~wxColourRefData() + { + FreeColour(); + } + void FreeColour(); - + void AllocColour( GdkColormap* cmap ); + GdkColor m_color; GdkColormap *m_colormap; - bool m_hasPixel; - - friend wxColour; -}; + // gdk_colormap_alloc_color may change the RGB values in m_color, so we need separate copies + guint16 m_red; + guint16 m_green; + guint16 m_blue; + guint16 m_alpha; -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; -} + DECLARE_NO_COPY_CLASS(wxColourRefData) +}; -wxColourRefData::~wxColourRefData() +void wxColourRefData::FreeColour() { - FreeColour(); + if (m_colormap) + { + gdk_colormap_free_colors(m_colormap, &m_color, 1); + m_colormap = NULL; + m_color.pixel = 0; + } } -void wxColourRefData::FreeColour() +void wxColourRefData::AllocColour( GdkColormap *cmap ) { -// if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 ); + if (m_colormap != cmap) + { + FreeColour(); + + m_color.red = m_red; + m_color.green = m_green; + m_color.blue = m_blue; + if (gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE)) + { + m_colormap = cmap; + } + } } //----------------------------------------------------------------------------- -#define M_COLDATA ((wxColourRefData *)m_refData) +#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData) -#define SHIFT (8*(sizeof(short int)-sizeof(char))) +// GDK's values are in 0..65535 range, ours are in 0..255 +#define SHIFT 8 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) -wxColour::wxColour() +wxColour::wxColour(const GdkColor& gdkColor) { -} - -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; -} - -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 )) - { - wxFAIL_MSG( "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 ); + m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue, 0xFFFF /*opaque alpha in 16 bit*/); } 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; -bool wxColour::operator == ( const wxColour& col ) -{ - return m_refData == col.m_refData; -} + if (!m_refData || !col.m_refData) + return false; -bool wxColour::operator != ( const wxColour& col) -{ - return m_refData != col.m_refData; + wxColourRefData* refData = M_COLDATA; + wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, col.m_refData); + return refData->m_red == that_refData->m_red && + refData->m_green == that_refData->m_green && + refData->m_blue == that_refData->m_blue && + refData->m_alpha == that_refData->m_alpha; } -void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue ) +void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue, + unsigned char alpha) { - 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( + (guint16(red) << SHIFT) + red, + (guint16(green) << SHIFT) + green, + (guint16(blue) << SHIFT) + blue, + (guint16(alpha) << SHIFT) + alpha); } 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 wxByte(M_COLDATA->m_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 wxByte(M_COLDATA->m_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") ); + + return wxByte(M_COLDATA->m_blue >> SHIFT); } -bool wxColour::Ok() const +unsigned char wxColour::Alpha() const { - return (m_refData != NULL); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + + return wxByte(M_COLDATA->m_alpha >> SHIFT); } 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 - - 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 ); - -#else - - M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color ); - -#endif - - 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 +const GdkColor *wxColour::GetColor() const { - if (!Ok()) return (GdkColor *) NULL; - - return &M_COLDATA->m_color; + wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); + + return &M_COLDATA->m_color; } +bool wxColour::FromString(const wxString& str) +{ + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) ) + { + *this = wxColour(colGDK); + return true; + } + return wxColourBase::FromString(str); +}