/////////////////////////////////////////////////////////////////////////////
-// Name: colour.cpp
+// Name: src/gtk/colour.cpp
// Purpose:
// Author: Robert Roebling
-// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#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"
#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// wxColour
//-----------------------------------------------------------------------------
-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData
{
public:
- wxColourRefData()
+#ifdef __WXGTK3__
+ wxColourRefData(const GdkRGBA& gdkRGBA)
+ : m_gdkRGBA(gdkRGBA)
{
- m_color.red = 0;
- m_color.green = 0;
- m_color.blue = 0;
- m_color.pixel = 0;
- m_colormap = (GdkColormap *) NULL;
- m_hasPixel = false;
+ m_gdkColor.red = guint16(gdkRGBA.red * 65535);
+ m_gdkColor.green = guint16(gdkRGBA.green * 65535);
+ m_gdkColor.blue = guint16(gdkRGBA.blue * 65535);
+ m_alpha = wxByte(gdkRGBA.alpha * 255 + 0.5);
}
-
- wxColourRefData(const wxColourRefData& data)
- : wxObjectRefData()
+ wxColourRefData(const GdkColor& gdkColor)
+ : m_gdkColor(gdkColor)
{
- m_color = data.m_color;
- m_colormap = data.m_colormap;
- m_hasPixel = data.m_hasPixel;
+ m_gdkRGBA.red = gdkColor.red / 65535.0;
+ m_gdkRGBA.green = gdkColor.green / 65535.0;
+ m_gdkRGBA.blue = gdkColor.blue / 65535.0;
+ m_gdkRGBA.alpha = 1;
+ m_alpha = 255;
}
-
- ~wxColourRefData()
+ wxColourRefData(guchar red, guchar green, guchar blue, guchar alpha)
{
- FreeColour();
+ m_gdkRGBA.red = red / 255.0;
+ m_gdkRGBA.green = green / 255.0;
+ m_gdkRGBA.blue = blue / 255.0;
+ m_gdkRGBA.alpha = alpha / 255.0;
+ m_gdkColor.red = (guint16(red) << 8) + red;
+ m_gdkColor.green = (guint16(green) << 8) + green;
+ m_gdkColor.blue = (guint16(blue) << 8) + blue;
+ m_alpha = alpha;
+ }
+ GdkRGBA m_gdkRGBA;
+ GdkColor m_gdkColor;
+#else
+ wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)
+ {
+ 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;
}
- bool operator == (const wxColourRefData& data) const
+ virtual ~wxColourRefData()
{
- 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);
+ FreeColour();
}
void FreeColour();
GdkColor m_color;
GdkColormap *m_colormap;
- bool m_hasPixel;
-
- friend class wxColour;
-
- // reference counter for systems with <= 8-Bit display
- static gushort colMapAllocCounter[ 256 ];
-};
+ // 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;
+#endif
+ wxByte m_alpha;
-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
+ wxDECLARE_NO_COPY_CLASS(wxColourRefData);
};
+#ifndef __WXGTK3__
void wxColourRefData::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 );
- }
+ gdk_colormap_free_colors(m_colormap, &m_color, 1);
+ m_colormap = NULL;
+ m_color.pixel = 0;
}
}
void wxColourRefData::AllocColour( GdkColormap *cmap )
{
- 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
+ if (m_colormap != cmap)
{
- m_hasPixel = gdk_color_alloc( cmap, &m_color );
+ 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;
+ }
}
- m_colormap = cmap;
}
+#endif
//-----------------------------------------------------------------------------
-#define M_COLDATA ((wxColourRefData *)m_refData)
+#define M_COLDATA 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( unsigned char red, unsigned char green, unsigned char blue )
+#ifdef __WXGTK3__
+wxColour::wxColour(const GdkRGBA& gdkRGBA)
{
- 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(gdkRGBA);
}
-/* static */
-wxColour wxColour::CreateByName(const wxString& name)
+wxColour::wxColour(const GdkColor& gdkColor)
{
- wxColour col;
-
- GdkColor colGDK;
- if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )
- {
- wxColourRefData *refData = new wxColourRefData;
- refData->m_color = colGDK;
- col.m_refData = refData;
- }
-
- return col;
+ m_refData = new wxColourRefData(gdkColor);
}
-
-
-void wxColour::InitFromName( const wxString &colourName )
+#else
+wxColour::wxColour(const GdkColor& gdkColor)
{
- // check the cache first
- wxColour col;
- if ( wxTheColourDatabase )
- {
- col = wxTheColourDatabase->Find(colourName);
- }
-
- if ( !col.Ok() )
- {
- col = CreateByName(colourName);
- }
-
- if ( col.Ok() )
- {
- *this = col;
- }
- else
- {
- wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
- }
+ m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
}
+#endif
wxColour::~wxColour()
{
if (!m_refData || !col.m_refData)
return false;
- 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;
+ wxColourRefData* refData = M_COLDATA;
+ wxColourRefData* that_refData = static_cast<wxColourRefData*>(col.m_refData);
+#ifdef __WXGTK3__
+ return refData->m_gdkColor.red == that_refData->m_gdkColor.red &&
+ refData->m_gdkColor.green == that_refData->m_gdkColor.green &&
+ refData->m_gdkColor.blue == that_refData->m_gdkColor.blue &&
+#else
+ return refData->m_red == that_refData->m_red &&
+ refData->m_green == that_refData->m_green &&
+ refData->m_blue == that_refData->m_blue &&
+#endif
+ refData->m_alpha == that_refData->m_alpha;
}
-wxObjectRefData *wxColour::CreateRefData() const
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+ unsigned char alpha)
{
- return new wxColourRefData;
-}
+ UnRef();
-wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
-{
- return new wxColourRefData(*(wxColourRefData *)data);
+#ifdef __WXGTK3__
+ m_refData = new wxColourRefData(red, green, blue, alpha);
+#else
+ m_refData = new wxColourRefData(
+ (guint16(red) << SHIFT) + red,
+ (guint16(green) << SHIFT) + green,
+ (guint16(blue) << SHIFT) + blue,
+ alpha);
+#endif
}
-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
+unsigned char wxColour::Red() const
{
- AllocExclusive();
-
- 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;
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
- M_COLDATA->m_colormap = (GdkColormap*) NULL;
- M_COLDATA->m_hasPixel = false;
+#ifdef __WXGTK3__
+ return wxByte(M_COLDATA->m_gdkColor.red >> 8);
+#else
+ return wxByte(M_COLDATA->m_red >> SHIFT);
+#endif
}
-unsigned char wxColour::Red() const
+unsigned char wxColour::Green() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+#ifdef __WXGTK3__
+ return wxByte(M_COLDATA->m_gdkColor.green >> 8);
+#else
+ return wxByte(M_COLDATA->m_green >> SHIFT);
+#endif
}
-unsigned char wxColour::Green() const
+unsigned char wxColour::Blue() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+#ifdef __WXGTK3__
+ return wxByte(M_COLDATA->m_gdkColor.blue >> 8);
+#else
+ return wxByte(M_COLDATA->m_blue >> SHIFT);
+#endif
}
-unsigned char wxColour::Blue() const
+unsigned char wxColour::Alpha() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+ return M_COLDATA->m_alpha;
}
+#ifndef __WXGTK3__
void wxColour::CalcPixel( GdkColormap *cmap )
{
- if (!Ok()) return;
+ if (!IsOk()) return;
M_COLDATA->AllocColour( cmap );
}
int wxColour::GetPixel() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
return M_COLDATA->m_color.pixel;
}
+#endif
-GdkColor *wxColour::GetColor() const
+const GdkColor *wxColour::GetColor() const
{
- wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );
+#ifdef __WXGTK3__
+ return &M_COLDATA->m_gdkColor;
+#else
return &M_COLDATA->m_color;
+#endif
}
+#ifdef __WXGTK3__
+wxColour::operator const GdkRGBA*() const
+{
+ const GdkRGBA* c = NULL;
+ if (IsOk())
+ c = &M_COLDATA->m_gdkRGBA;
+ return c;
+}
+#endif
+bool wxColour::FromString(const wxString& str)
+{
+#ifdef __WXGTK3__
+ GdkRGBA gdkRGBA;
+ if (gdk_rgba_parse(&gdkRGBA, wxGTK_CONV_SYS(str)))
+ {
+ *this = wxColour(gdkRGBA);
+ return true;
+ }
+#else
+ GdkColor colGDK;
+ if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+ {
+ *this = wxColour(colGDK);
+ return true;
+ }
+#endif
+
+ return wxColourBase::FromString(str);
+}
projects / wxWidgets.git / blobdiff