Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / gtk / colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 0f9cb80716764e44273339fe9d433382048e8bad..5f99b1897be31a37c2c1daf7de9bc88bf5508c15 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -1,242 +1,279 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/gtk/colour.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// 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/gdicmn.h"
+#include "wx/colour.h"

 
 

-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include <gdk/gdk.h>
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 

-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData

 {
 {

-  public:
-  
-    wxColourRefData();
-    ~wxColourRefData();
+public:
+#ifdef __WXGTK3__
+    wxColourRefData(const GdkRGBA& gdkRGBA)
+        : m_gdkRGBA(gdkRGBA)
+    {
+        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 GdkColor& gdkColor)
+        : m_gdkColor(gdkColor)
+    {
+        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(guchar red, guchar green, guchar blue, guchar alpha)
+    {
+        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;
+    }
+
+    virtual ~wxColourRefData()
+    {
+        FreeColour();
+    }
+

     void FreeColour();
     void FreeColour();

-  
+    void AllocColour( GdkColormap* cmap );
+

     GdkColor     m_color;
     GdkColormap *m_colormap;
     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;
+#endif
+    wxByte 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;
-}
+    wxDECLARE_NO_COPY_CLASS(wxColourRefData);
+};

 
 

-wxColourRefData::~wxColourRefData()
+#ifndef __WXGTK3__
+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;
+        }
+    }

 }
 }

+#endif

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

-#define M_COLDATA ((wxColourRefData *)m_refData)
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
+#define M_COLDATA static_cast<wxColourRefData*>(m_refData)

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
+// GDK's values are in 0..65535 range, ours are in 0..255
+#define SHIFT  8

 
 

-wxColour::wxColour()
+#ifdef __WXGTK3__
+wxColour::wxColour(const GdkRGBA& gdkRGBA)

 {
 {

+    m_refData = new wxColourRefData(gdkRGBA);

 }
 
 }
 

-wxColour::wxColour( char red, char green, char blue )
+wxColour::wxColour(const GdkColor& gdkColor)

 {
 {

-  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(gdkColor);

 }
 }

-  
-void wxColour::InitFromName( const wxString &colourName )
+#else
+wxColour::wxColour(const GdkColor& gdkColor)

 {
 {

-  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);

 }
 }

+#endif

 
 wxColour::~wxColour()
 {
 }
 
 
 wxColour::~wxColour()
 {
 }
 

-wxColour& wxColour::operator = ( const wxColour& col ) 
-{ 
-  if (*this == col) return (*this); 
-  Ref( col ); 
-  return *this; 
-}
-
-wxColour& wxColour::operator = ( const wxString& colourName ) 
-{ 
-  UnRef();
-  wxNode *node = (wxNode *) 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 ))
-    {
-      wxFAIL_MSG( "wxColour: couldn't find colour" );
-      delete m_refData;
-      m_refData = (wxObjectRefData *) NULL;
-    }
-  }
-  return *this; 
-}
-
-bool wxColour::operator == ( const wxColour& col ) 
-{ 
-  return m_refData == col.m_refData; 
-}
-
-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;
+
+    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;

 }
 
 }
 

-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();
+
+#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

 }
 
 unsigned char wxColour::Red() const
 {
 }
 
 unsigned char wxColour::Red() const
 {

-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
+
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.red >> 8);
+#else
+    return wxByte(M_COLDATA->m_red >> SHIFT);
+#endif

 }
 
 unsigned char wxColour::Green() const
 {
 }
 
 unsigned char wxColour::Green() const
 {

-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
+
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.green >> 8);
+#else
+    return wxByte(M_COLDATA->m_green >> SHIFT);
+#endif

 }
 
 unsigned char wxColour::Blue() const
 {
 }
 
 unsigned char wxColour::Blue() const
 {

-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
+
+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.blue >> 8);
+#else
+    return wxByte(M_COLDATA->m_blue >> SHIFT);
+#endif

 }
 
 }
 

-bool wxColour::Ok() const
+unsigned char wxColour::Alpha() const

 {
 {

-  return (m_refData != NULL);
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
+
+    return M_COLDATA->m_alpha;

 }
 
 }
 

+#ifndef __WXGTK3__

 void wxColour::CalcPixel( GdkColormap *cmap )
 {
 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 (!IsOk()) 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 );
+    M_COLDATA->AllocColour( cmap );
+}

 
 

-#else
+int wxColour::GetPixel() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
 

-  M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-  
-#endif
-  
-  M_COLDATA->m_colormap = cmap;
+    return M_COLDATA->m_color.pixel;

 }
 }

+#endif

 
 

-int wxColour::GetPixel() const
+const GdkColor *wxColour::GetColor() const

 {
 {

-  if (!Ok()) return 0;
-  
-  return M_COLDATA->m_color.pixel;
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );
+
+#ifdef __WXGTK3__
+    return &M_COLDATA->m_gdkColor;
+#else
+    return &M_COLDATA->m_color;
+#endif

 }
 
 }
 

-GdkColor *wxColour::GetColor() const
+#ifdef __WXGTK3__
+wxColour::operator const GdkRGBA*() const

 {
 {

-  if (!Ok()) return (GdkColor *) NULL;
-  
-  return &M_COLDATA->m_color;
+    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);
+}