X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/887dd52f06a985ec0455e91f4b3d2b091a1b1c7b..73302af6dddd667af4ebec69c800bc9de106f28e:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index f989be7f44..a9c177d209 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif @@ -33,9 +33,16 @@ public: m_color.blue = 0; m_color.pixel = 0; m_colormap = (WXColormap *) NULL; - m_hasPixel = FALSE; + 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(); @@ -50,7 +57,7 @@ public: m_color.blue == data.m_color.blue && m_color.pixel == data.m_color.pixel); } - + void FreeColour(); void AllocColour( WXColormap cmap ); @@ -64,8 +71,8 @@ public: static unsigned short colMapAllocCounter[ 256 ]; }; -unsigned short wxColourRefData::colMapAllocCounter[ 256 ] = -{ +unsigned short 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, @@ -83,20 +90,20 @@ unsigned short wxColourRefData::colMapAllocCounter[ 256 ] = void wxColourRefData::FreeColour() { -#if 0 - if (m_colormap) + if (!m_colormap) + return; +#if !wxUSE_NANOX + if ( wxTheApp && + (wxTheApp->m_visualInfo->m_visualType == GrayScale || + wxTheApp->m_visualInfo->m_visualType == PseudoColor) ) { - Colormap cm = (Colormap)m_colormap; + int idx = m_color.pixel; + colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; - GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap; - if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || - (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) + if (colMapAllocCounter[ idx ] == 0) { - int idx = m_color.pixel; - colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; - - if (colMapAllocCounter[ idx ] == 0) - gdk_colormap_free_colors( m_colormap, &m_color, 1 ); + unsigned long pixel = m_color.pixel; + XFreeColors( wxGlobalDisplay(), (Colormap) m_colormap, &pixel, 1, 0 ); } } #endif @@ -109,12 +116,11 @@ void wxColourRefData::AllocColour( WXColormap cmap ) FreeColour(); -#if 0 - GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; - if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || - (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) +#if !wxUSE_NANOX + if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) || + (wxTheApp->m_visualInfo->m_visualType == PseudoColor)) { - m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE ); + m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color ); int idx = m_color.pixel; colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1; } @@ -123,6 +129,7 @@ void wxColourRefData::AllocColour( WXColormap cmap ) { m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color ); } + m_colormap = cmap; } @@ -137,41 +144,58 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) { m_refData = new wxColourRefData(); +#if wxUSE_NANOX + M_COLDATA->m_color.red = ((unsigned short)red) ; + M_COLDATA->m_color.green = ((unsigned short)green) ; + M_COLDATA->m_color.blue = ((unsigned short)blue) ; +#else 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; +#endif M_COLDATA->m_color.pixel = 0; } -void wxColour::InitFromName( const wxString &colourName ) +/* static */ +wxColour wxColour::CreateByName(const wxString& name) { - wxNode *node = (wxNode *) NULL; - if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) + wxColour col; + + Display *dpy = wxGlobalDisplay(); + WXColormap colormap = wxTheApp->GetMainColormap( dpy ); + XColor xcol; + if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) ) { - wxColour *col = (wxColour*)node->Data(); - UnRef(); - if (col) Ref( *col ); + wxColourRefData *refData = new wxColourRefData; + refData->m_colormap = colormap; + refData->m_color = xcol; + col.m_refData = refData; } - else + + return col; +} + +void wxColour::InitFromName( const wxString &colourName ) +{ + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) { - m_refData = new wxColourRefData(); - - M_COLDATA->m_colormap = wxTheApp->GetMainColormap( wxGlobalDisplay() ); - - if (!XParseColor( wxGlobalDisplay(), (Colormap) M_COLDATA->m_colormap, 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() + col = wxTheColourDatabase->Find(colourName); + } - //wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + if ( !col.Ok() ) + { + col = CreateByName(colourName); + } - delete m_refData; - m_refData = (wxObjectRefData *) NULL; - } + if ( col.Ok() ) + { + *this = col; + } + else + { + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); } } @@ -181,17 +205,17 @@ wxColour::~wxColour() bool wxColour::operator == ( const wxColour& col ) const { - if (m_refData == col.m_refData) return TRUE; + if (m_refData == col.m_refData) return true; - if (!m_refData || !col.m_refData) return FALSE; + if (!m_refData || !col.m_refData) return false; XColor *own = &(((wxColourRefData*)m_refData)->m_color); XColor *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; + return (own->red == other->red) + && (own->green == other->green) + && (own->blue == other->blue) ; + } wxObjectRefData *wxColour::CreateRefData() const @@ -207,11 +231,16 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { AllocExclusive(); - - m_refData = new wxColourRefData(); + +#if wxUSE_NANOX + M_COLDATA->m_color.red = ((unsigned short)red) ; + M_COLDATA->m_color.green = ((unsigned short)green) ; + M_COLDATA->m_color.blue = ((unsigned short)blue) ; +#else 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; +#endif M_COLDATA->m_color.pixel = 0; } @@ -219,21 +248,33 @@ unsigned char wxColour::Red() const { wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); +#if wxUSE_NANOX + return (unsigned char) M_COLDATA->m_color.red ; +#else return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); +#endif } unsigned char wxColour::Green() const { wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); +#if wxUSE_NANOX + return (unsigned char) M_COLDATA->m_color.green ; +#else return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); +#endif } unsigned char wxColour::Blue() const { wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); +#if wxUSE_NANOX + return (unsigned char) M_COLDATA->m_color.blue ; +#else return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); +#endif } void wxColour::CalcPixel( WXColormap cmap )