X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..8a07956565ddccd1720abf4e510945593128d774:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 0b6b995c25..a50e8a8e26 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/gtk/bitmap.cpp // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,363 +7,890 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "bitmap.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/filefn.h" -#include "wx/image.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" -#include "gdk/gdkx.h" +#ifndef WX_PRECOMP + #include "wx/icon.h" + #include "wx/image.h" + #include "wx/colour.h" +#endif + +#include "wx/rawbmp.h" + +#include "wx/gtk/private/object.h" + +#include + +extern GtkWidget *wxGetRootWindow(); + +static void PixmapToPixbuf(GdkPixmap* pixmap, GdkPixbuf* pixbuf, int w, int h) +{ + gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h); + if (gdk_drawable_get_depth(pixmap) == 1) + { + // invert to match XBM convention + guchar* p = gdk_pixbuf_get_pixels(pixbuf); + const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0); + const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * inc; + for (int y = h; y; y--, p += rowpad) + for (int x = w; x; x--, p += inc) + { + // pixels are either (0,0,0) or (0xff,0xff,0xff) + p[0] = ~p[0]; + p[1] = ~p[1]; + p[2] = ~p[2]; + } + } +} + +static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h) +{ + GdkPixbuf* mask_pixbuf = gdk_pixbuf_get_from_drawable( + NULL, mask, NULL, 0, 0, 0, 0, w, h); + guchar* p = gdk_pixbuf_get_pixels(pixbuf) + 3; + const guchar* mask_data = gdk_pixbuf_get_pixels(mask_pixbuf); + const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * 4; + const int mask_rowpad = gdk_pixbuf_get_rowstride(mask_pixbuf) - w * 3; + for (int y = h; y; y--, p += rowpad, mask_data += mask_rowpad) + { + for (int x = w; x; x--, p += 4, mask_data += 3) + { + *p = 255; + // no need to test all 3 components, + // pixels are either (0,0,0) or (0xff,0xff,0xff) + if (mask_data[0] == 0) + *p = 0; + } + } + g_object_unref(mask_pixbuf); +} //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase) wxMask::wxMask() { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = NULL; +} + +wxMask::wxMask(const wxMask& mask) +{ + if ( !mask.m_bitmap ) + { + m_bitmap = NULL; + return; + } + + // create a copy of an existing mask + gint w, h; + gdk_drawable_get_size(mask.m_bitmap, &w, &h); + m_bitmap = gdk_pixmap_new(mask.m_bitmap, w, h, 1); + + wxGtkObject gc(gdk_gc_new(m_bitmap)); + gdk_draw_drawable(m_bitmap, gc, mask.m_bitmap, 0, 0, 0, 0, -1, -1); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) ) +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { + m_bitmap = NULL; + InitFromColour(bitmap, colour); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) ) +#if wxUSE_PALETTE +wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { + m_bitmap = NULL; + Create( bitmap, paletteIndex ); } +#endif // wxUSE_PALETTE -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) ) +wxMask::wxMask( const wxBitmap& bitmap ) { + m_bitmap = NULL; + InitFromMonoBitmap(bitmap); } wxMask::~wxMask() { - if (m_bitmap) gdk_bitmap_unref( m_bitmap ); + if (m_bitmap) + g_object_unref (m_bitmap); +} + +void wxMask::FreeData() +{ + if (m_bitmap) + { + g_object_unref (m_bitmap); + m_bitmap = NULL; + } +} + +bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) +{ + const int w = bitmap.GetWidth(); + const int h = bitmap.GetHeight(); + + // create mask as XBM format bitmap + + // one bit per pixel, each row starts on a byte boundary + const size_t out_size = size_t((w + 7) / 8) * unsigned(h); + wxByte* out = new wxByte[out_size]; + // set bits are unmasked + memset(out, 0xff, out_size); + unsigned bit_index = 0; + if (bitmap.HasPixbuf()) + { + const wxByte r_mask = colour.Red(); + const wxByte g_mask = colour.Green(); + const wxByte b_mask = colour.Blue(); + GdkPixbuf* pixbuf = bitmap.GetPixbuf(); + const wxByte* in = gdk_pixbuf_get_pixels(pixbuf); + const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0); + const int rowpadding = gdk_pixbuf_get_rowstride(pixbuf) - inc * w; + for (int y = 0; y < h; y++, in += rowpadding) + { + for (int x = 0; x < w; x++, in += inc, bit_index++) + if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask) + out[bit_index >> 3] ^= 1 << (bit_index & 7); + // move index to next byte boundary + bit_index = (bit_index + 7) & ~7u; + } + } + else + { + GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h); + GdkColormap* colormap = gdk_image_get_colormap(image); + guint32 mask_pixel; + if (colormap == NULL) + // mono bitmap, white is pixel value 0 + mask_pixel = guint32(colour.Red() != 255 || colour.Green() != 255 || colour.Blue() != 255); + else + { + wxColor c(colour); + c.CalcPixel(colormap); + mask_pixel = c.GetPixel(); + } + for (int y = 0; y < h; y++) + { + for (int x = 0; x < w; x++, bit_index++) + if (gdk_image_get_pixel(image, x, y) == mask_pixel) + out[bit_index >> 3] ^= 1 << (bit_index & 7); + bit_index = (bit_index + 7) & ~7u; + } + g_object_unref(image); + } + m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h); + delete[] out; + return true; +} + +bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) +{ + if (!bitmap.IsOk()) return false; + + wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); + + m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); + + if (!m_bitmap) return false; + + wxGtkObject gc(gdk_gc_new( m_bitmap )); + gdk_gc_set_function(gc, GDK_COPY_INVERT); + gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight()); + + return true; } -GdkBitmap *wxMask::GetBitmap(void) const +GdkBitmap *wxMask::GetBitmap() const { return m_bitmap; } //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData: public wxGDIRefData { public: - wxBitmapRefData(void); - ~wxBitmapRefData(void); - - GdkPixmap *m_pixmap; - GdkBitmap *m_bitmap; - wxMask *m_mask; - int m_width; - int m_height; - int m_bpp; - wxPalette *m_palette; + wxBitmapRefData(int width, int height, int depth); + virtual ~wxBitmapRefData(); + + virtual bool IsOk() const; + + GdkPixmap *m_pixmap; + GdkPixbuf *m_pixbuf; + wxMask *m_mask; + int m_width; + int m_height; + int m_bpp; + bool m_alphaRequested; + +private: + // We don't provide a copy ctor as copying m_pixmap and m_pixbuf properly + // is expensive and we don't want to do it implicitly (and possibly + // accidentally). wxBitmap::CloneGDIRefData() which does need to do it does + // it explicitly itself. + wxDECLARE_NO_COPY_CLASS(wxBitmapRefData); }; -wxBitmapRefData::wxBitmapRefData() +wxBitmapRefData::wxBitmapRefData(int width, int height, int depth) { - m_pixmap = (GdkPixmap *) NULL; - m_bitmap = (GdkBitmap *) NULL; - m_mask = (wxMask *) NULL; - m_width = 0; - m_height = 0; - m_bpp = 0; - m_palette = (wxPalette *) NULL; + m_pixmap = NULL; + m_pixbuf = NULL; + m_mask = NULL; + m_width = width; + m_height = height; + m_bpp = depth; + if (m_bpp < 0) + m_bpp = gdk_drawable_get_depth(wxGetRootWindow()->window); + m_alphaRequested = depth == 32; } wxBitmapRefData::~wxBitmapRefData() { - if (m_pixmap) gdk_pixmap_unref( m_pixmap ); - if (m_bitmap) gdk_bitmap_unref( m_bitmap ); - if (m_mask) delete m_mask; - if (m_palette) delete m_palette; + if (m_pixmap) + g_object_unref (m_pixmap); + if (m_pixbuf) + g_object_unref (m_pixbuf); + delete m_mask; } +bool wxBitmapRefData::IsOk() const +{ + return m_bpp != 0; +} + +//----------------------------------------------------------------------------- +// wxBitmap //----------------------------------------------------------------------------- -#define M_BMPDATA ((wxBitmapRefData *)m_refData) +#define M_BMPDATA static_cast(m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) -wxBitmap::wxBitmap() +wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type) { - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + LoadFile(filename, type); } -wxBitmap::wxBitmap( int width, int height, int depth ) +wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) { - wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" ) - wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" ) + wxASSERT(depth == 1); + if (width > 0 && height > 0 && depth == 1) + { + SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height)); + } +} - m_refData = new wxBitmapRefData(); +wxBitmap::wxBitmap(const char* const* bits) +{ + wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + GdkBitmap* mask = NULL; + SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast(bits))); + if (!M_BMPDATA) + return; - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; + if (M_BMPDATA->m_pixmap != NULL && mask != NULL) + { + M_BMPDATA->m_mask = new wxMask; + M_BMPDATA->m_mask->m_bitmap = mask; + } +} - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); +wxBitmap::~wxBitmap() +{ } -wxBitmap::wxBitmap( const char **bits ) +bool wxBitmap::Create( int width, int height, int depth ) { - wxCHECK_RET( bits != NULL, "invalid bitmap data" ) + UnRef(); + wxCHECK_MSG(width >= 0 && height >= 0, false, "invalid bitmap size"); + m_refData = new wxBitmapRefData(width, height, depth); + return true; +} - m_refData = new wxBitmapRefData(); +#if wxUSE_IMAGE - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; +bool wxBitmap::CreateFromImage(const wxImage& image, int depth) +{ + UnRef(); - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") ); + wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ); - if (mask) + if (image.GetWidth() <= 0 || image.GetHeight() <= 0) + return false; + + // create pixbuf if image has alpha and requested depth is compatible + if (image.HasAlpha() && (depth == -1 || depth == 32)) + return CreateFromImageAsPixbuf(image); + + // otherwise create pixmap, if alpha is present it will be converted to mask + return CreateFromImageAsPixmap(image, depth); +} + +bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) +{ + const int w = image.GetWidth(); + const int h = image.GetHeight(); + if (depth == 1) { - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; + // create XBM format bitmap + + // one bit per pixel, each row starts on a byte boundary + const size_t out_size = size_t((w + 7) / 8) * unsigned(h); + wxByte* out = new wxByte[out_size]; + // set bits are black + memset(out, 0xff, out_size); + const wxByte* in = image.GetData(); + unsigned bit_index = 0; + for (int y = 0; y < h; y++) + { + for (int x = 0; x < w; x++, in += 3, bit_index++) + if (in[0] == 255 && in[1] == 255 && in[2] == 255) + out[bit_index >> 3] ^= 1 << (bit_index & 7); + // move index to next byte boundary + bit_index = (bit_index + 7) & ~7u; + } + SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h)); + delete[] out; + + if (!M_BMPDATA) // SetPixmap may have failed + return false; + } + else + { + SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth)); + if (!M_BMPDATA) + return false; + + wxGtkObject gc(gdk_gc_new(M_BMPDATA->m_pixmap)); + gdk_draw_rgb_image( + M_BMPDATA->m_pixmap, gc, + 0, 0, w, h, + GDK_RGB_DITHER_NONE, image.GetData(), w * 3); } - gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); + const wxByte* alpha = image.GetAlpha(); + if (alpha != NULL || image.HasMask()) + { + // create mask as XBM format bitmap - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + const size_t out_size = size_t((w + 7) / 8) * unsigned(h); + wxByte* out = new wxByte[out_size]; + memset(out, 0xff, out_size); + unsigned bit_index = 0; + if (alpha != NULL) + { + for (int y = 0; y < h; y++) + { + for (int x = 0; x < w; x++, bit_index++) + if (*alpha++ < wxIMAGE_ALPHA_THRESHOLD) + out[bit_index >> 3] ^= 1 << (bit_index & 7); + bit_index = (bit_index + 7) & ~7u; + } + } + else + { + const wxByte r_mask = image.GetMaskRed(); + const wxByte g_mask = image.GetMaskGreen(); + const wxByte b_mask = image.GetMaskBlue(); + const wxByte* in = image.GetData(); + for (int y = 0; y < h; y++) + { + for (int x = 0; x < w; x++, in += 3, bit_index++) + if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask) + out[bit_index >> 3] ^= 1 << (bit_index & 7); + bit_index = (bit_index + 7) & ~7u; + } + } + wxMask* mask = new wxMask; + mask->m_bitmap = gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h); + SetMask(mask); + delete[] out; + } + return IsOk(); } -wxBitmap::wxBitmap( char **bits ) +bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) { - wxCHECK_RET( bits != NULL, "invalid bitmap data" ) + wxASSERT(image.HasAlpha()); - m_refData = new wxBitmapRefData(); + int width = image.GetWidth(); + int height = image.GetHeight(); - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + Create(width, height, 32); + GdkPixbuf* pixbuf = GetPixbuf(); + if (!pixbuf) + return false; - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + // Copy the data: + const unsigned char* in = image.GetData(); + unsigned char *out = gdk_pixbuf_get_pixels(pixbuf); + unsigned char *alpha = image.GetAlpha(); - wxCHECK_RET( M_BMPDATA->m_pixmap, "couldn't create pixmap" ); + int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width; - if (mask) + for (int y = 0; y < height; y++, out += rowpad) { - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; + for (int x = 0; x < width; x++, alpha++, out += 4, in += 3) + { + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; + out[3] = *alpha; + } } - gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); - - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + return true; } -wxBitmap::wxBitmap( const wxBitmap& bmp ) +wxImage wxBitmap::ConvertToImage() const { - Ref( bmp ); + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); -} + const int w = GetWidth(); + const int h = GetHeight(); + wxImage image(w, h, false); + unsigned char *data = image.GetData(); -wxBitmap::wxBitmap( const wxString &filename, int type ) -{ - LoadFile( filename, type ); + wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") ); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); -} + // prefer pixbuf if available, it will preserve alpha and should be quicker + if (HasPixbuf()) + { + GdkPixbuf *pixbuf = GetPixbuf(); + unsigned char* alpha = NULL; + if (gdk_pixbuf_get_has_alpha(pixbuf)) + { + image.SetAlpha(); + alpha = image.GetAlpha(); + } + const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf); + unsigned char *out = data; + const int inc = 3 + int(alpha != NULL); + const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w; -wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) -{ - m_refData = new wxBitmapRefData(); + for (int y = 0; y < h; y++, in += rowpad) + { + for (int x = 0; x < w; x++, in += inc, out += 3) + { + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; + if (alpha != NULL) + *alpha++ = in[3]; + } + } + } + else + { + GdkPixmap* pixmap = GetPixmap(); + GdkPixmap* pixmap_invert = NULL; + if (GetDepth() == 1) + { + // mono bitmaps are inverted, i.e. 0 is white + pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1); + wxGtkObject gc(gdk_gc_new(pixmap_invert)); + gdk_gc_set_function(gc, GDK_COPY_INVERT); + gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h); + pixmap = pixmap_invert; + } + // create a pixbuf which shares data with the wxImage + GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( + data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL); - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_bitmap = - gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = 1; + gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h); - wxCHECK_RET( M_BMPDATA->m_bitmap, "couldn't create bitmap" ); + g_object_unref(pixbuf); + if (pixmap_invert != NULL) + g_object_unref(pixmap_invert); + } + // convert mask, unless there is already alpha + if (GetMask() && !image.HasAlpha()) + { + // we hard code the mask colour for now but we could also make an + // effort (and waste time) to choose a colour not present in the + // image already to avoid having to fudge the pixels below -- + // whether it's worth to do it is unclear however + const int MASK_RED = 1; + const int MASK_GREEN = 2; + const int MASK_BLUE = 3; + const int MASK_BLUE_REPLACEMENT = 2; + + image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE); + GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h); + + for (int y = 0; y < h; y++) + { + for (int x = 0; x < w; x++, data += 3) + { + if (gdk_image_get_pixel(image_mask, x, y) == 0) + { + data[0] = MASK_RED; + data[1] = MASK_GREEN; + data[2] = MASK_BLUE; + } + else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE) + { + // we have to fudge the colour a bit to prevent + // this pixel from appearing transparent + data[2] = MASK_BLUE_REPLACEMENT; + } + } + } + g_object_unref(image_mask); + } - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + return image; } -wxBitmap::~wxBitmap() +#endif // wxUSE_IMAGE + +int wxBitmap::GetHeight() const { - if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); + + return M_BMPDATA->m_height; } -wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) +int wxBitmap::GetWidth() const { - if (*this == bmp) return (*this); - Ref( bmp ); - return *this; + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); + + return M_BMPDATA->m_width; } -bool wxBitmap::operator == ( const wxBitmap& bmp ) +int wxBitmap::GetDepth() const { - return m_refData == bmp.m_refData; + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); + + return M_BMPDATA->m_bpp; } -bool wxBitmap::operator != ( const wxBitmap& bmp ) +wxMask *wxBitmap::GetMask() const { - return m_refData != bmp.m_refData; + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); + + return M_BMPDATA->m_mask; } -bool wxBitmap::Ok(void) const +void wxBitmap::SetMask( wxMask *mask ) { - return (m_refData != NULL); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); + + AllocExclusive(); + delete M_BMPDATA->m_mask; + M_BMPDATA->m_mask = mask; } -int wxBitmap::GetHeight(void) const +bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); - - return M_BMPDATA->m_height; + *this = icon; + return IsOk(); } -int wxBitmap::GetWidth(void) const +wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); + wxBitmap ret; - return M_BMPDATA->m_width; + wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap")); + + const int w = rect.width; + const int h = rect.height; + const wxBitmapRefData* bmpData = M_BMPDATA; + + wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 && + rect.x + w <= bmpData->m_width && + rect.y + h <= bmpData->m_height, + ret, wxT("invalid bitmap region")); + + wxBitmapRefData * const newRef = new wxBitmapRefData(w, h, bmpData->m_bpp); + ret.m_refData = newRef; + + if (bmpData->m_pixbuf) + { + GdkPixbuf* pixbuf = + gdk_pixbuf_new_subpixbuf(bmpData->m_pixbuf, rect.x, rect.y, w, h); + newRef->m_pixbuf = gdk_pixbuf_copy(pixbuf); + g_object_unref(pixbuf); + } + if (bmpData->m_pixmap) + { + newRef->m_pixmap = gdk_pixmap_new(bmpData->m_pixmap, w, h, -1); + GdkGC* gc = gdk_gc_new(newRef->m_pixmap); + gdk_draw_drawable( + newRef->m_pixmap, gc, bmpData->m_pixmap, rect.x, rect.y, 0, 0, w, h); + g_object_unref(gc); + } + if (bmpData->m_mask && bmpData->m_mask->m_bitmap) + { + GdkPixmap* sub_mask = gdk_pixmap_new(bmpData->m_mask->m_bitmap, w, h, 1); + newRef->m_mask = new wxMask; + newRef->m_mask->m_bitmap = sub_mask; + GdkGC* gc = gdk_gc_new(sub_mask); + gdk_draw_drawable( + sub_mask, gc, bmpData->m_mask->m_bitmap, rect.x, rect.y, 0, 0, w, h); + g_object_unref(gc); + } + + return ret; } -int wxBitmap::GetDepth(void) const +bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - return M_BMPDATA->m_bpp; +#if wxUSE_IMAGE + wxImage image = ConvertToImage(); + if (image.IsOk() && image.SaveFile(name, type)) + return true; +#endif + const char* type_name = NULL; + switch (type) + { + case wxBITMAP_TYPE_BMP: type_name = "bmp"; break; + case wxBITMAP_TYPE_ICO: type_name = "ico"; break; + case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break; + case wxBITMAP_TYPE_PNG: type_name = "png"; break; + default: break; + } + return type_name && + gdk_pixbuf_save(GetPixbuf(), name.fn_str(), type_name, NULL, NULL); } -wxMask *wxBitmap::GetMask(void) const +bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { - wxCHECK_MSG( Ok(), (wxMask *) NULL, "invalid bitmap" ); +#if wxUSE_IMAGE + wxImage image; + if (image.LoadFile(name, type) && image.IsOk()) + *this = wxBitmap(image); + else +#endif + { + wxUnusedVar(type); // The type is detected automatically by GDK. - return M_BMPDATA->m_mask; + UnRef(); + GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(name.fn_str(), NULL); + if (pixbuf) + SetPixbuf(pixbuf); + } + + return IsOk(); } -void wxBitmap::SetMask( wxMask *mask ) +#if wxUSE_PALETTE +wxPalette *wxBitmap::GetPalette() const { - wxCHECK_RET( Ok(), "invalid bitmap" ); - - if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; + return NULL; +} - M_BMPDATA->m_mask = mask; +void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) +{ + // TODO } +#endif // wxUSE_PALETTE -bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) +void wxBitmap::SetHeight( int height ) { - wxCHECK_MSG( Ok(), FALSE, "invalid bitmap" ); + AllocExclusive(); + M_BMPDATA->m_height = height; +} - if (type == wxBITMAP_TYPE_PNG) - { - wxImage image( *this ); - if (image.Ok()) return image.SaveFile( name, type ); - } +void wxBitmap::SetWidth( int width ) +{ + AllocExclusive(); + M_BMPDATA->m_width = width; +} - return FALSE; +void wxBitmap::SetDepth( int depth ) +{ + AllocExclusive(); + M_BMPDATA->m_bpp = depth; } -bool wxBitmap::LoadFile( const wxString &name, int type ) +void wxBitmap::SetPixmap( GdkPixmap *pixmap ) { UnRef(); - if (!wxFileExists(name)) return FALSE; + if (!pixmap) + return; - if (type == wxBITMAP_TYPE_XPM) - { - m_refData = new wxBitmapRefData(); + int w, h; + gdk_drawable_get_size(pixmap, &w, &h); + wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, 0); + m_refData = bmpData; + bmpData->m_pixmap = pixmap; + bmpData->m_bpp = gdk_drawable_get_depth(pixmap); +} - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; +GdkPixmap *wxBitmap::GetPixmap() const +{ + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name ); + wxBitmapRefData* bmpData = M_BMPDATA; + if (bmpData->m_pixmap) + return bmpData->m_pixmap; - if (mask) + if (bmpData->m_pixbuf) + { + GdkPixmap** mask_pixmap = NULL; + if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)) { - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; + // make new mask from alpha + delete bmpData->m_mask; + bmpData->m_mask = new wxMask; + mask_pixmap = &bmpData->m_mask->m_bitmap; } - - gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; - } - else if (type == wxBITMAP_TYPE_PNG) - { - wxImage image; - image.LoadFile( name, type ); - if (image.Ok()) *this = image.ConvertToBitmap(); + gdk_pixbuf_render_pixmap_and_mask( + bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128); } - else if (type == wxBITMAP_TYPE_BMP) + else { - wxImage image; - image.LoadFile( name, type ); - if (image.Ok()) *this = image.ConvertToBitmap(); + bmpData->m_pixmap = gdk_pixmap_new(wxGetRootWindow()->window, + bmpData->m_width, bmpData->m_height, bmpData->m_bpp == 1 ? 1 : -1); } - else - return FALSE; - - return TRUE; + return bmpData->m_pixmap; } -wxPalette *wxBitmap::GetPalette(void) const +bool wxBitmap::HasPixmap() const { - if (!Ok()) return (wxPalette *) NULL; + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - return M_BMPDATA->m_palette; + return M_BMPDATA->m_pixmap != NULL; } -void wxBitmap::SetHeight( int height ) +GdkPixbuf *wxBitmap::GetPixbuf() const { - if (!m_refData) m_refData = new wxBitmapRefData(); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - M_BMPDATA->m_height = height; + wxBitmapRefData* bmpData = M_BMPDATA; + if (bmpData->m_pixbuf) + return bmpData->m_pixbuf; + + const int w = bmpData->m_width; + const int h = bmpData->m_height; + GdkPixmap* mask = NULL; + if (bmpData->m_mask) + mask = bmpData->m_mask->m_bitmap; + const bool useAlpha = bmpData->m_alphaRequested || mask; + bmpData->m_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, useAlpha, 8, w, h); + if (bmpData->m_pixmap) + PixmapToPixbuf(bmpData->m_pixmap, bmpData->m_pixbuf, w, h); + if (mask) + MaskToAlpha(mask, bmpData->m_pixbuf, w, h); + return bmpData->m_pixbuf; } -void wxBitmap::SetWidth( int width ) +bool wxBitmap::HasPixbuf() const { - if (!m_refData) m_refData = new wxBitmapRefData(); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - M_BMPDATA->m_width = width; + return M_BMPDATA->m_pixbuf != NULL; } -void wxBitmap::SetDepth( int depth ) +void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf) { - if (!m_refData) m_refData = new wxBitmapRefData(); + UnRef(); - M_BMPDATA->m_bpp = depth; + if (!pixbuf) + return; + + int depth = -1; + if (gdk_pixbuf_get_has_alpha(pixbuf)) + depth = 32; + m_refData = new wxBitmapRefData( + gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), depth); + + M_BMPDATA->m_pixbuf = pixbuf; } -void wxBitmap::SetPixmap( GdkPixmap *pixmap ) +void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) { - if (!m_refData) m_refData = new wxBitmapRefData(); - - M_BMPDATA->m_pixmap = pixmap; + if (keep == Pixmap && HasPixbuf()) + { + g_object_unref (M_BMPDATA->m_pixbuf); + M_BMPDATA->m_pixbuf = NULL; + } + if (keep == Pixbuf && HasPixmap()) + { + g_object_unref (M_BMPDATA->m_pixmap); + M_BMPDATA->m_pixmap = NULL; + } } -GdkPixmap *wxBitmap::GetPixmap(void) const +#ifdef wxHAS_RAW_BITMAP +void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { - wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, "invalid bitmap" ); + void* bits = NULL; + GdkPixbuf *pixbuf = GetPixbuf(); + const bool hasAlpha = HasAlpha(); - return M_BMPDATA->m_pixmap; + // allow access if bpp is valid and matches existence of alpha + if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) ) + { + data.m_height = gdk_pixbuf_get_height( pixbuf ); + data.m_width = gdk_pixbuf_get_width( pixbuf ); + data.m_stride = gdk_pixbuf_get_rowstride( pixbuf ); + bits = gdk_pixbuf_get_pixels(pixbuf); + } + return bits; } -GdkBitmap *wxBitmap::GetBitmap(void) const +void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) { - wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, "invalid bitmap" ); +} +#endif // wxHAS_RAW_BITMAP - return M_BMPDATA->m_bitmap; +bool wxBitmap::HasAlpha() const +{ + const wxBitmapRefData* bmpData = M_BMPDATA; + return bmpData && (bmpData->m_alphaRequested || + (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))); } +wxGDIRefData* wxBitmap::CreateGDIRefData() const +{ + return new wxBitmapRefData(0, 0, 0); +} +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const +{ + const wxBitmapRefData* oldRef = static_cast(data); + wxBitmapRefData * const newRef = new wxBitmapRefData(oldRef->m_width, + oldRef->m_height, + oldRef->m_bpp); + if (oldRef->m_pixmap != NULL) + { + newRef->m_pixmap = gdk_pixmap_new( + oldRef->m_pixmap, oldRef->m_width, oldRef->m_height, + // use pixmap depth, m_bpp may not match + gdk_drawable_get_depth(oldRef->m_pixmap)); + wxGtkObject gc(gdk_gc_new(newRef->m_pixmap)); + gdk_draw_drawable( + newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1); + } + if (oldRef->m_pixbuf != NULL) + { + newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf); + } + if (oldRef->m_mask != NULL) + { + newRef->m_mask = new wxMask(*oldRef->m_mask); + } + + return newRef; +} + +/* static */ void wxBitmap::InitStandardHandlers() +{ + // TODO: Insert handler based on GdkPixbufs handler later +}