X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86f2cc84aabc8a58b1984c1ed7fb9475f6abe67..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index b1fe2f76f1..a551b04a28 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -13,73 +13,190 @@ #include "wx/bitmap.h" #ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/palette.h" #include "wx/icon.h" - #include "wx/math.h" #include "wx/image.h" #include "wx/colour.h" #endif #include "wx/rawbmp.h" -#include +#include "wx/gtk/private/object.h" +#include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- +#include extern GtkWidget *wxGetRootWindow(); +#ifndef __WXGTK3__ +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); +} +#endif + //----------------------------------------------------------------------------- // 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) +{ +#ifdef __WXGTK3__ + m_bitmap = NULL; + if (mask.m_bitmap) + { + const int w = cairo_image_surface_get_width(mask.m_bitmap); + const int h = cairo_image_surface_get_height(mask.m_bitmap); + m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); + const guchar* src = cairo_image_surface_get_data(mask.m_bitmap); + guchar* dst = cairo_image_surface_get_data(m_bitmap); + const int stride = cairo_image_surface_get_stride(m_bitmap); + wxASSERT(stride == cairo_image_surface_get_stride(mask.m_bitmap)); + memcpy(dst, src, stride * h); + cairo_surface_mark_dirty(m_bitmap); + } +#else + 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); +#endif } wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { - m_bitmap = (GdkBitmap *) NULL; - Create( bitmap, colour ); + m_bitmap = NULL; + InitFromColour(bitmap, colour); } #if wxUSE_PALETTE wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = NULL; Create( bitmap, paletteIndex ); } #endif // wxUSE_PALETTE wxMask::wxMask( const wxBitmap& bitmap ) { - m_bitmap = (GdkBitmap *) NULL; - Create( bitmap ); + m_bitmap = NULL; + InitFromMonoBitmap(bitmap); +} + +#ifdef __WXGTK3__ +wxMask::wxMask(cairo_surface_t* bitmap) +#else +wxMask::wxMask(GdkPixmap* bitmap) +#endif +{ + m_bitmap = bitmap; } wxMask::~wxMask() { if (m_bitmap) + { +#ifdef __WXGTK3__ + cairo_surface_destroy(m_bitmap); +#else g_object_unref (m_bitmap); +#endif + } } -bool wxMask::Create( const wxBitmap& bitmap, - const wxColour& colour ) +void wxMask::FreeData() { if (m_bitmap) { +#ifdef __WXGTK3__ + cairo_surface_destroy(m_bitmap); +#else g_object_unref (m_bitmap); - m_bitmap = (GdkBitmap*) NULL; +#endif + m_bitmap = NULL; } +} +bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour) +{ const int w = bitmap.GetWidth(); const int h = bitmap.GetHeight(); +#ifdef __WXGTK3__ + m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); + GdkPixbuf* pixbuf = bitmap.GetPixbufNoMask(); + const guchar* src = gdk_pixbuf_get_pixels(pixbuf); + guchar* dst = cairo_image_surface_get_data(m_bitmap); + const int stride_src = gdk_pixbuf_get_rowstride(pixbuf); + const int stride_dst = cairo_image_surface_get_stride(m_bitmap); + const int src_inc = gdk_pixbuf_get_n_channels(pixbuf); + const guchar r = colour.Red(); + const guchar g = colour.Green(); + const guchar b = colour.Blue(); + for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst) + { + const guchar* s = src; + for (int i = 0; i < w; i++, s += src_inc) + { + dst[i] = 0xff; + if (s[0] == r && s[1] == g && s[2] == b) + dst[i] = 0; + } + } + cairo_surface_mark_dirty(m_bitmap); +#else // create mask as XBM format bitmap // one bit per pixel, each row starts on a byte boundary @@ -131,111 +248,130 @@ bool wxMask::Create( const wxBitmap& bitmap, } m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h); delete[] out; +#endif return true; } -#if wxUSE_PALETTE -bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) +bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap) { - unsigned char r,g,b; - wxPalette *pal = bitmap.GetPalette(); - - wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") ); - - pal->GetRGB(paletteIndex, &r, &g, &b); - - return Create(bitmap, wxColour(r, g, b)); -} -#endif // wxUSE_PALETTE - -bool wxMask::Create( const wxBitmap& bitmap ) -{ - if (m_bitmap) - { - g_object_unref (m_bitmap); - m_bitmap = (GdkBitmap*) NULL; - } - - if (!bitmap.Ok()) return false; + if (!bitmap.IsOk()) return false; wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") ); +#ifdef __WXGTK3__ + InitFromColour(bitmap, *wxBLACK); +#else m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); if (!m_bitmap) return false; - GdkGC *gc = gdk_gc_new( m_bitmap ); + 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()); - g_object_unref (gc); +#endif return true; } -GdkBitmap *wxMask::GetBitmap() const +#ifdef __WXGTK3__ +cairo_surface_t* wxMask::GetBitmap() const +#else +GdkPixmap* wxMask::GetBitmap() const +#endif { return m_bitmap; } //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- class wxBitmapRefData: public wxGDIRefData { public: - wxBitmapRefData(); + wxBitmapRefData(int width, int height, int depth); virtual ~wxBitmapRefData(); - virtual bool IsOk() const { return m_pixmap || m_pixbuf; } + virtual bool IsOk() const; +#ifdef __WXGTK3__ + GdkPixbuf* m_pixbufMask; + GdkPixbuf* m_pixbufNoMask; + cairo_surface_t* m_surface; +#else GdkPixmap *m_pixmap; GdkPixbuf *m_pixbuf; +#endif wxMask *m_mask; int m_width; int m_height; int m_bpp; -#if wxUSE_PALETTE - wxPalette *m_palette; -#endif // wxUSE_PALETTE +#ifndef __WXGTK3__ + bool m_alphaRequested; +#endif + + // 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_pixbuf = (GdkPixbuf *) NULL; - m_mask = (wxMask *) NULL; - m_width = 0; - m_height = 0; - m_bpp = 0; -#if wxUSE_PALETTE - m_palette = (wxPalette *) NULL; -#endif // wxUSE_PALETTE +#ifdef __WXGTK3__ + m_pixbufMask = NULL; + m_pixbufNoMask = NULL; + m_surface = NULL; +#else + m_pixmap = NULL; + m_pixbuf = NULL; +#endif + m_mask = NULL; + m_width = width; + m_height = height; + m_bpp = depth; +#ifdef __WXGTK3__ + if (m_bpp != 1 && m_bpp != 32) + m_bpp = 24; +#else + if (m_bpp < 0) + m_bpp = gdk_drawable_get_depth(wxGetRootWindow()->window); + m_alphaRequested = depth == 32; +#endif } wxBitmapRefData::~wxBitmapRefData() { +#ifdef __WXGTK3__ + if (m_pixbufMask) + g_object_unref(m_pixbufMask); + if (m_pixbufNoMask) + g_object_unref(m_pixbufNoMask); + if (m_surface) + cairo_surface_destroy(m_surface); +#else if (m_pixmap) g_object_unref (m_pixmap); if (m_pixbuf) g_object_unref (m_pixbuf); +#endif delete m_mask; -#if wxUSE_PALETTE - delete m_palette; -#endif // wxUSE_PALETTE } +bool wxBitmapRefData::IsOk() const +{ + return m_bpp != 0; +} + +//----------------------------------------------------------------------------- +// wxBitmap //----------------------------------------------------------------------------- -#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData) +#define M_BMPDATA static_cast(m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) -wxBitmap::wxBitmap(int width, int height, int depth) -{ - Create(width, height, depth); -} - wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type) { LoadFile(filename, type); @@ -246,9 +382,30 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) wxASSERT(depth == 1); if (width > 0 && height > 0 && depth == 1) { - SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height)); - - wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") ); + m_refData = new wxBitmapRefData(width, height, 1); +#ifdef __WXGTK3__ + GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height); + M_BMPDATA->m_pixbufNoMask = pixbuf; + const char* src = bits; + guchar* dst = gdk_pixbuf_get_pixels(pixbuf); + const int stride_src = (width + 7) / 8; + const int rowinc_dst = gdk_pixbuf_get_rowstride(pixbuf) - 3 * width; + for (int j = 0; j < width; j++, src += stride_src, dst += rowinc_dst) + { + for (int i = 0; i < height; i++) + { + guchar c = 0xff; + if (src[i >> 3] & (1 << (i & 7))) + c = 0; + *dst++ = c; + *dst++ = c; + *dst++ = c; + } + } +#else + M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data( + wxGetRootWindow()->window, bits, width, height); +#endif } } @@ -256,13 +413,48 @@ wxBitmap::wxBitmap(const char* const* bits) { wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); +#if wxUSE_IMAGE + *this = wxBitmap(wxImage(bits)); +#elif defined __WXGTK3__ + GdkPixbuf* pixbuf = gdk_pixbuf_new_from_xpm_data(const_cast(bits)); + if (pixbuf) + { + m_refData = new wxBitmapRefData( + gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), + gdk_pixbuf_get_n_channels(pixbuf) * 8); + M_BMPDATA->m_pixbufNoMask = pixbuf; + wxASSERT(M_BMPDATA->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbufNoMask)); + } +#else GdkBitmap* mask = NULL; - SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits))); + GdkPixmap* pixmap = gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast(bits)); + if (pixmap) + { + int width, height; + gdk_drawable_get_size(pixmap, &width, &height); + m_refData = new wxBitmapRefData(width, height, -1); + M_BMPDATA->m_pixmap = pixmap; + if (mask) + { + M_BMPDATA->m_mask = new wxMask(mask); + } + } +#endif +} - if (M_BMPDATA->m_pixmap != NULL && mask != NULL) +wxBitmap::wxBitmap(GdkPixbuf* pixbuf) +{ + if (pixbuf) { - M_BMPDATA->m_mask = new wxMask; - M_BMPDATA->m_mask->m_bitmap = mask; + wxBitmapRefData* bmpData = new wxBitmapRefData( + gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), + gdk_pixbuf_get_n_channels(pixbuf) * 8); + m_refData = bmpData; +#ifdef __WXGTK3__ + bmpData->m_pixbufNoMask = pixbuf; +#else + bmpData->m_pixbuf = pixbuf; +#endif } } @@ -273,116 +465,115 @@ wxBitmap::~wxBitmap() bool wxBitmap::Create( int width, int height, int depth ) { UnRef(); + wxCHECK_MSG(width >= 0 && height >= 0, false, "invalid bitmap size"); + m_refData = new wxBitmapRefData(width, height, depth); + return true; +} - if ( width <= 0 || height <= 0 ) - { - return false; - } - - if (depth == 32) +#ifdef __WXGTK3__ +static void CopyImageData( + guchar* dst, int dstChannels, int dstStride, + const guchar* src, int srcChannels, int srcStride, + int w, int h) +{ + if (dstChannels == srcChannels) { - SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32); + if (dstStride == srcStride) + memcpy(dst, src, size_t(dstStride) * h); + else + { + const int stride = dstStride < srcStride ? dstStride : srcStride; + for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) + memcpy(dst, src, stride); + } } else { - if (depth != 1) + for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) { - const GdkVisual* visual = wxTheApp->GetGdkVisual(); - if (depth == -1) - depth = visual->depth; - - wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth")); + guchar* d = dst; + const guchar* s = src; + if (dstChannels == 4) + { + for (int i = 0; i < w; i++, d += 4, s += 3) + { + d[0] = s[0]; + d[1] = s[1]; + d[2] = s[2]; + d[3] = 0xff; + } + } + else + { + for (int i = 0; i < w; i++, d += 3, s += 4) + { + d[0] = s[0]; + d[1] = s[1]; + d[2] = s[2]; + } + } } - - SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth)); } - - return Ok(); } +#endif -wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const +#if wxUSE_IMAGE +#ifdef __WXGTK3__ +wxBitmap::wxBitmap(const wxImage& image, int depth) { - wxBitmap bmp; - - wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap")); - - int width = wxMax(newx, 1); - int height = wxMax(newy, 1); - width = wxMin(width, clipwidth); - height = wxMin(height, clipheight); - - const double scale_x = double(newx) / M_BMPDATA->m_width; - const double scale_y = double(newy) / M_BMPDATA->m_height; - - // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting - // back, is faster than scaling pixmap ourselves. - - // use pixbuf if already available, - // otherwise create temporary pixbuf from pixmap - GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf; - if (pixbuf) - g_object_ref(pixbuf); - else - pixbuf = gdk_pixbuf_get_from_drawable( - NULL, M_BMPDATA->m_pixmap, NULL, - 0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height); - - // new pixbuf for scaled wxBitmap - GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new( - GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height); - - // GDK_INTERP_NEAREST is the lowest-quality method for continuous-tone - // images, but the only one which preserves sharp edges - gdk_pixbuf_scale( - pixbuf, pixbuf_scaled, - 0, 0, width, height, -clipx, -clipy, scale_x, scale_y, - GDK_INTERP_NEAREST); - - g_object_unref(pixbuf); - bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp); + wxCHECK_RET(image.IsOk(), "invalid image"); - if (M_BMPDATA->m_mask) + const int w = image.GetWidth(); + const int h = image.GetHeight(); + const guchar* alpha = image.GetAlpha(); + if (depth < 0) + depth = alpha ? 32 : 24; + else if (depth != 1 && depth != 32) + depth = 24; + wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, depth); + m_refData = bmpData; + GdkPixbuf* pixbuf_dst = gdk_pixbuf_new(GDK_COLORSPACE_RGB, depth == 32, 8, w, h); + bmpData->m_pixbufNoMask = pixbuf_dst; + wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); + const guchar* src = image.GetData(); + + guchar* dst = gdk_pixbuf_get_pixels(pixbuf_dst); + const int dstStride = gdk_pixbuf_get_rowstride(pixbuf_dst); + CopyImageData(dst, gdk_pixbuf_get_n_channels(pixbuf_dst), dstStride, src, 3, 3 * w, w, h); + + if (depth == 32 && alpha) { - pixbuf = gdk_pixbuf_get_from_drawable( - NULL, M_BMPDATA->m_mask->m_bitmap, NULL, - 0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height); - - pixbuf_scaled = gdk_pixbuf_new( - GDK_COLORSPACE_RGB, false, 8, width, height); - - gdk_pixbuf_scale( - pixbuf, pixbuf_scaled, - 0, 0, width, height, -clipx, -clipy, scale_x, scale_y, - GDK_INTERP_NEAREST); - - g_object_unref(pixbuf); - - // use existing functionality to create mask from scaled pixbuf - wxBitmap maskbmp; - maskbmp.SetPixbuf(pixbuf_scaled); - bmp.SetMask(new wxMask(maskbmp, *wxBLACK)); + for (int j = 0; j < h; j++, dst += dstStride) + for (int i = 0; i < w; i++) + dst[i * 4 + 3] = *alpha++; + } + if (image.HasMask()) + { + const guchar r = image.GetMaskRed(); + const guchar g = image.GetMaskGreen(); + const guchar b = image.GetMaskBlue(); + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h); + const int stride = cairo_image_surface_get_stride(surface); + dst = cairo_image_surface_get_data(surface); + memset(dst, 0xff, stride * h); + for (int j = 0; j < h; j++, dst += stride) + for (int i = 0; i < w; i++, src += 3) + if (src[0] == r && src[1] == g && src[2] == b) + dst[i] = 0; + cairo_surface_mark_dirty(surface); + bmpData->m_mask = new wxMask(surface); } - return bmp; } - -#if wxUSE_IMAGE - -bool wxBitmap::CreateFromImage(const wxImage& image, int depth) +#else +wxBitmap::wxBitmap(const wxImage& image, int depth) { - UnRef(); + wxCHECK_RET(image.IsOk(), "invalid image"); - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); - wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ); - - 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); + if (depth == 32 || (depth == -1 && image.HasAlpha())) + CreateFromImageAsPixbuf(image); + else + // otherwise create pixmap, if alpha is present it will be converted to mask + CreateFromImageAsPixmap(image, depth); } bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) @@ -410,16 +601,21 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) } 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)); - GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap); + 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); - g_object_unref(gc); } const wxByte* alpha = image.GetAlpha(); @@ -455,23 +651,19 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) 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); + SetMask(new wxMask(gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h))); delete[] out; } - return true; + return IsOk(); } bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) { - wxASSERT(image.HasAlpha()); - int width = image.GetWidth(); int height = image.GetHeight(); Create(width, height, 32); - GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf; + GdkPixbuf* pixbuf = GetPixbuf(); if (!pixbuf) return false; @@ -484,21 +676,85 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) for (int y = 0; y < height; y++, out += rowpad) { - for (int x = 0; x < width; x++, alpha++, out += 4, in += 3) + for (int x = 0; x < width; x++, out += 4, in += 3) { out[0] = in[0]; out[1] = in[1]; out[2] = in[2]; - out[3] = *alpha; + if (alpha) + out[3] = *alpha++; } } return true; } +#endif wxImage wxBitmap::ConvertToImage() const { - wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); +#ifdef __WXGTK3__ + wxImage image; + wxCHECK_MSG(IsOk(), image, "invalid bitmap"); + wxBitmapRefData* bmpData = M_BMPDATA; + const int w = bmpData->m_width; + const int h = bmpData->m_height; + image.Create(w, h, false); + guchar* dst = image.GetData(); + GdkPixbuf* pixbuf_src = NULL; + if (bmpData->m_pixbufNoMask) + pixbuf_src = bmpData->m_pixbufNoMask; + else if (bmpData->m_surface) + { + pixbuf_src = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h); + bmpData->m_pixbufNoMask = pixbuf_src; + wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); + } + if (pixbuf_src) + { + const guchar* src = gdk_pixbuf_get_pixels(pixbuf_src); + const int srcStride = gdk_pixbuf_get_rowstride(pixbuf_src); + const int srcChannels = gdk_pixbuf_get_n_channels(pixbuf_src); + CopyImageData(dst, 3, 3 * w, src, srcChannels, srcStride, w, h); + + if (srcChannels == 4) + { + image.SetAlpha(); + guchar* alpha = image.GetAlpha(); + for (int j = 0; j < h; j++, src += srcStride) + { + const guchar* s = src; + for (int i = 0; i < w; i++, s += 4) + *alpha++ = s[3]; + } + } + } + cairo_surface_t* maskSurf = NULL; + if (bmpData->m_mask) + maskSurf = bmpData->m_mask->GetBitmap(); + if (maskSurf) + { + const guchar r = 1; + const guchar g = 2; + const guchar b = 3; + image.SetMaskColour(r, g, b); + wxASSERT(cairo_image_surface_get_format(maskSurf) == CAIRO_FORMAT_A8); + const int stride = cairo_image_surface_get_stride(maskSurf); + const guchar* src = cairo_image_surface_get_data(maskSurf); + for (int j = 0; j < h; j++, src += stride) + { + for (int i = 0; i < w; i++, dst += 3) + if (src[i] == 0) + { + dst[0] = r; + dst[1] = g; + dst[2] = b; + } + else if (dst[0] == r && dst[1] == g && dst[2] == b) + dst[2]--; + } + } +#else + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") ); const int w = GetWidth(); const int h = GetHeight(); @@ -542,10 +798,9 @@ wxImage wxBitmap::ConvertToImage() const { // mono bitmaps are inverted, i.e. 0 is white pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1); - GdkGC* gc = gdk_gc_new(pixmap_invert); + 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); - g_object_unref(gc); pixmap = pixmap_invert; } // create a pixbuf which shares data with the wxImage @@ -593,6 +848,7 @@ wxImage wxBitmap::ConvertToImage() const } g_object_unref(image_mask); } +#endif return image; } @@ -601,139 +857,224 @@ wxImage wxBitmap::ConvertToImage() const int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask( wxMask *mask ) { - wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + wxCHECK_RET( IsOk(), wxT("invalid bitmap") ); AllocExclusive(); delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; } +wxBitmap wxBitmap::GetMaskBitmap() const +{ + wxBitmap bitmap; + wxBitmapRefData* bmpData = M_BMPDATA; +#ifdef __WXGTK3__ + cairo_surface_t* mask = NULL; + if (bmpData && bmpData->m_mask) + mask = bmpData->m_mask->GetBitmap(); + if (mask) + { + const int w = cairo_image_surface_get_width(mask); + const int h = cairo_image_surface_get_height(mask); + GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, w, h); + const guchar* src = cairo_image_surface_get_data(mask); + guchar* dst = gdk_pixbuf_get_pixels(pixbuf); + const int stride_src = cairo_image_surface_get_stride(mask); + const int stride_dst = gdk_pixbuf_get_rowstride(pixbuf); + for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst) + { + guchar* d = dst; + for (int i = 0; i < w; i++, d += 3) + { + d[0] = src[i]; + d[1] = src[i]; + d[2] = src[i]; + } + } + bitmap = wxBitmap(pixbuf); + } +#else + GdkPixmap* mask = NULL; + if (bmpData && bmpData->m_mask) + mask = bmpData->m_mask->GetBitmap(); + if (mask) + { + int w, h; + gdk_drawable_get_size(mask, &w, &h); + GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable( + NULL, mask, NULL, 0, 0, 0, 0, w, h); + bitmap = wxBitmap(pixbuf); + } +#endif + return bitmap; +} + bool wxBitmap::CopyFromIcon(const wxIcon& icon) { *this = icon; - return Ok(); + return IsOk(); } +#ifdef __WXGTK3__ +static cairo_surface_t* GetSubSurface(cairo_surface_t* surface, const wxRect& rect) +{ + cairo_surface_flush(surface); + const cairo_format_t format = cairo_image_surface_get_format(surface); + int x = rect.x; + if (format != CAIRO_FORMAT_A8) + x *= 4; + cairo_surface_t* subSurface = cairo_image_surface_create(format, rect.width, rect.height); + const int srcStride = cairo_image_surface_get_stride(surface); + const int dstStride = cairo_image_surface_get_stride(subSurface); + const guchar* src = cairo_image_surface_get_data(surface) + rect.y * srcStride + x; + guchar* dst = cairo_image_surface_get_data(subSurface); + for (int j = 0; j < rect.height; j++, src += srcStride, dst += dstStride) + memcpy(dst, src, dstStride); + cairo_surface_mark_dirty(subSurface); + return subSurface; +} +#endif + wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { wxBitmap ret; - wxCHECK_MSG(Ok(), ret, wxT("invalid bitmap")); + 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 + rect.width <= M_BMPDATA->m_width && - rect.y + rect.height <= M_BMPDATA->m_height, + rect.x + w <= bmpData->m_width && + rect.y + h <= bmpData->m_height, ret, wxT("invalid bitmap region")); - if (HasPixbuf() || M_BMPDATA->m_bpp == 32) + wxBitmapRefData * const newRef = new wxBitmapRefData(w, h, bmpData->m_bpp); + ret.m_refData = newRef; + +#ifdef __WXGTK3__ + if (bmpData->m_pixbufNoMask) { - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - gdk_pixbuf_get_has_alpha(GetPixbuf()), - 8, rect.width, rect.height); - ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp); - gdk_pixbuf_copy_area(GetPixbuf(), - rect.x, rect.y, rect.width, rect.height, - pixbuf, 0, 0); + GdkPixbuf* pixbuf = gdk_pixbuf_new_subpixbuf(bmpData->m_pixbufNoMask, rect.x, rect.y, w, h); + newRef->m_pixbufNoMask = gdk_pixbuf_copy(pixbuf); + wxASSERT(newRef->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(newRef->m_pixbufNoMask)); + g_object_unref(pixbuf); } - else + else if (bmpData->m_surface) + newRef->m_surface = GetSubSurface(bmpData->m_surface, rect); + + cairo_surface_t* maskSurf = NULL; + if (bmpData->m_mask) + maskSurf = bmpData->m_mask->GetBitmap(); + if (maskSurf) { - ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp); - GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); - gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - g_object_unref (gc); + newRef->m_mask = new wxMask(GetSubSurface(maskSurf, rect)); } - // make mask, unless there is already alpha - if (GetMask() && !HasAlpha()) +#else + if (bmpData->m_pixbuf) { - wxMask *mask = new wxMask; - mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 ); - - GdkGC *gc = gdk_gc_new( mask->m_bitmap ); - gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height); - g_object_unref (gc); - - ret.SetMask( mask ); + 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); + } + GdkPixmap* mask = NULL; + if (bmpData->m_mask) + mask = bmpData->m_mask->GetBitmap(); + if (mask) + { + GdkPixmap* sub_mask = gdk_pixmap_new(mask, w, h, 1); + newRef->m_mask = new wxMask(sub_mask); + GdkGC* gc = gdk_gc_new(sub_mask); + gdk_draw_drawable( + sub_mask, gc, mask, rect.x, rect.y, 0, 0, w, h); + g_object_unref(gc); + } +#endif return ret; } bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); #if wxUSE_IMAGE - // Try to save the bitmap via wxImage handlers: wxImage image = ConvertToImage(); - return image.Ok() && image.SaveFile(name, type); -#else // !wxUSE_IMAGE - wxUnusedVar(name); - wxUnusedVar(type); - - return false; -#endif // wxUSE_IMAGE + 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(), wxGTK_CONV_FN(name), type_name, NULL, NULL); } bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { - UnRef(); - - if (type == wxBITMAP_TYPE_XPM) - { - GdkBitmap *mask = (GdkBitmap*) NULL; - SetPixmap(gdk_pixmap_create_from_xpm(wxGetRootWindow()->window, &mask, NULL, name.fn_str())); - - if (mask) - { - M_BMPDATA->m_mask = new wxMask; - M_BMPDATA->m_mask->m_bitmap = mask; - } - } #if wxUSE_IMAGE - else // try if wxImage can load it + wxImage image; + if (image.LoadFile(name, type) && image.IsOk()) + *this = wxBitmap(image); + else +#endif { - wxImage image; - if (image.LoadFile(name, type) && image.Ok()) - CreateFromImage(image, -1); + wxUnusedVar(type); // The type is detected automatically by GDK. + + *this = wxBitmap(gdk_pixbuf_new_from_file(wxGTK_CONV_FN(name), NULL)); } -#endif // wxUSE_IMAGE - return Ok(); + return IsOk(); } #if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { - wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap")); - - return M_BMPDATA->m_palette; + return NULL; } void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) @@ -760,125 +1101,264 @@ void wxBitmap::SetDepth( int depth ) M_BMPDATA->m_bpp = depth; } +#ifndef __WXGTK3__ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) { - if (!m_refData) - m_refData = new wxBitmapRefData; + UnRef(); + + if (!pixmap) + return; - // AllocExclusive should not be needed for this internal function - wxASSERT(m_refData->GetRefCount() == 1); - wxASSERT(M_BMPDATA->m_pixmap == NULL); - M_BMPDATA->m_pixmap = pixmap; - gdk_drawable_get_size(pixmap, &M_BMPDATA->m_width, &M_BMPDATA->m_height); - M_BMPDATA->m_bpp = gdk_drawable_get_depth(pixmap); - PurgeOtherRepresentations(Pixmap); + 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); } GdkPixmap *wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); - // create the pixmap on the fly if we use Pixbuf representation: - if (M_BMPDATA->m_pixmap == NULL) + wxBitmapRefData* bmpData = M_BMPDATA; + if (bmpData->m_pixmap) + return bmpData->m_pixmap; + + if (bmpData->m_pixbuf) { - GdkPixmap** pmask = NULL; - if (gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf)) + GdkPixmap* pixmap = NULL; + GdkPixmap** mask_pixmap = NULL; + if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)) { // make new mask from alpha - delete M_BMPDATA->m_mask; - M_BMPDATA->m_mask = new wxMask; - pmask = &M_BMPDATA->m_mask->m_bitmap; + mask_pixmap = &pixmap; + } + gdk_pixbuf_render_pixmap_and_mask( + bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128); + if (pixmap) + { + delete bmpData->m_mask; + bmpData->m_mask = new wxMask(pixmap); } - gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf, - &M_BMPDATA->m_pixmap, - pmask, - 0x80 /* alpha threshold */); } - - return M_BMPDATA->m_pixmap; + else + { + bmpData->m_pixmap = gdk_pixmap_new(wxGetRootWindow()->window, + bmpData->m_width, bmpData->m_height, bmpData->m_bpp == 1 ? 1 : -1); + } + return bmpData->m_pixmap; } bool wxBitmap::HasPixmap() const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); return M_BMPDATA->m_pixmap != NULL; } +#endif -GdkPixbuf *wxBitmap::GetPixbuf() const +#ifdef __WXGTK3__ +GdkPixbuf* wxBitmap::GetPixbufNoMask() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); + wxCHECK_MSG(IsOk(), NULL, "invalid bitmap"); - if (M_BMPDATA->m_pixbuf == NULL) - { - int width = GetWidth(); - int height = GetHeight(); + wxBitmapRefData* bmpData = M_BMPDATA; + GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask; + if (pixbuf) + return pixbuf; - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - GetMask() != NULL, - 8, width, height); - M_BMPDATA->m_pixbuf = pixbuf; - gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL, - 0, 0, 0, 0, width, height); + const int w = bmpData->m_width; + const int h = bmpData->m_height; + if (bmpData->m_surface) + pixbuf = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h); + else + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, bmpData->m_bpp == 32, 8, w, h); + bmpData->m_pixbufNoMask = pixbuf; + wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask)); - // apply the mask to created pixbuf: - if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask) - { - GdkPixbuf *pmask = - gdk_pixbuf_get_from_drawable(NULL, - M_BMPDATA->m_mask->GetBitmap(), - NULL, - 0, 0, 0, 0, width, height); - if (pmask) + return pixbuf; +} + +// helper to set up a simulated depth 1 surface +static void SetSourceSurface1(const wxBitmapRefData* bmpData, cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) +{ + GdkPixbuf* pixbuf = gdk_pixbuf_copy(bmpData->m_pixbufNoMask); + const int w = bmpData->m_width; + const int h = bmpData->m_height; + const int stride = gdk_pixbuf_get_rowstride(pixbuf); + const int channels = gdk_pixbuf_get_n_channels(pixbuf); + guchar* dst = gdk_pixbuf_get_pixels(pixbuf); + guchar fg_r = 0, fg_g = 0, fg_b = 0; + if (fg && fg->IsOk()) + { + fg_r = fg->Red(); + fg_g = fg->Green(); + fg_b = fg->Blue(); + } + guchar bg_r = 255, bg_g = 255, bg_b = 255; + if (bg && bg->IsOk()) + { + bg_r = bg->Red(); + bg_g = bg->Green(); + bg_b = bg->Blue(); + } + for (int j = 0; j < h; j++, dst += stride) + { + guchar* d = dst; + for (int i = 0; i < w; i++, d += channels) + if (d[0]) { - guchar *bmp = gdk_pixbuf_get_pixels(pixbuf); - guchar *mask = gdk_pixbuf_get_pixels(pmask); - int bmprowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width; - int maskrowinc = gdk_pixbuf_get_rowstride(pmask) - 3 * width; + d[0] = bg_r; + d[1] = bg_g; + d[2] = bg_b; + } + else + { + d[0] = fg_r; + d[1] = fg_g; + d[2] = fg_b; + } + } + gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y); + g_object_unref(pixbuf); +} - for (int y = 0; y < height; - y++, bmp += bmprowinc, mask += maskrowinc) - { - for (int x = 0; x < width; x++, bmp += 4, mask += 3) - { - if (mask[0] == 0 /*black pixel*/) - bmp[3] = 0; - } - } +void wxBitmap::SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) const +{ + wxBitmapRefData* bmpData = M_BMPDATA; + if (bmpData->m_surface) + { + cairo_set_source_surface(cr, bmpData->m_surface, x, y); + return; + } + wxCHECK_RET(bmpData->m_pixbufNoMask, "no bitmap data"); + if (bmpData->m_bpp == 1) + SetSourceSurface1(bmpData, cr, x, y, fg, bg); + else + { + gdk_cairo_set_source_pixbuf(cr, bmpData->m_pixbufNoMask, x, y); + cairo_pattern_get_surface(cairo_get_source(cr), &bmpData->m_surface); + cairo_surface_reference(bmpData->m_surface); + } +} - g_object_unref (pmask); - } +cairo_t* wxBitmap::CairoCreate() const +{ + wxCHECK_MSG(IsOk(), NULL, "invalid bitmap"); + + wxBitmapRefData* bmpData = M_BMPDATA; + cairo_t* cr; + if (bmpData->m_surface) + cr = cairo_create(bmpData->m_surface); + else + { + GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask; + const bool useAlpha = bmpData->m_bpp == 32 || (pixbuf && gdk_pixbuf_get_has_alpha(pixbuf)); + bmpData->m_surface = cairo_image_surface_create( + useAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, + bmpData->m_width, bmpData->m_height); + cr = cairo_create(bmpData->m_surface); + if (pixbuf) + { + gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0); + cairo_paint(cr); + cairo_set_source_rgb(cr, 0, 0, 0); } } - - return M_BMPDATA->m_pixbuf; + if (bmpData->m_pixbufNoMask) + { + g_object_unref(bmpData->m_pixbufNoMask); + bmpData->m_pixbufNoMask = NULL; + } + if (bmpData->m_pixbufMask) + { + g_object_unref(bmpData->m_pixbufMask); + bmpData->m_pixbufMask = NULL; + } + wxASSERT(cr && cairo_status(cr) == 0); + return cr; } -bool wxBitmap::HasPixbuf() const +void wxBitmap::Draw(cairo_t* cr, int x, int y, bool useMask, const wxColour* fg, const wxColour* bg) const { - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); + wxCHECK_RET(IsOk(), "invalid bitmap"); + + wxBitmapRefData* bmpData = M_BMPDATA; + SetSourceSurface(cr, x, y, fg, bg); + cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST); + cairo_surface_t* mask = NULL; + if (useMask && bmpData->m_mask) + mask = bmpData->m_mask->GetBitmap(); + if (mask) + cairo_mask_surface(cr, mask, x, y); + else + cairo_paint(cr); +} +#endif - return M_BMPDATA->m_pixbuf != NULL; +GdkPixbuf *wxBitmap::GetPixbuf() const +{ + wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ); + + wxBitmapRefData* bmpData = M_BMPDATA; +#ifdef __WXGTK3__ + if (bmpData->m_pixbufMask) + return bmpData->m_pixbufMask; + + if (bmpData->m_pixbufNoMask == NULL) + GetPixbufNoMask(); + cairo_surface_t* mask = NULL; + if (bmpData->m_mask) + mask = bmpData->m_mask->GetBitmap(); + if (mask == NULL) + return bmpData->m_pixbufNoMask; + + const int w = bmpData->m_width; + const int h = bmpData->m_height; + bmpData->m_pixbufMask = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h); + + guchar* dst = gdk_pixbuf_get_pixels(bmpData->m_pixbufMask); + const int dstStride = gdk_pixbuf_get_rowstride(bmpData->m_pixbufMask); + CopyImageData(dst, 4, dstStride, + gdk_pixbuf_get_pixels(bmpData->m_pixbufNoMask), + gdk_pixbuf_get_n_channels(bmpData->m_pixbufNoMask), + gdk_pixbuf_get_rowstride(bmpData->m_pixbufNoMask), + w, h); + + const guchar* src = cairo_image_surface_get_data(mask); + const int srcStride = cairo_image_surface_get_stride(mask); + for (int j = 0; j < h; j++, src += srcStride, dst += dstStride) + for (int i = 0; i < w; i++) + if (src[i] == 0) + dst[i * 4 + 3] = 0; + + return bmpData->m_pixbufMask; +#else + 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->GetBitmap(); + 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; +#endif } -void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth) +#ifndef __WXGTK3__ +bool wxBitmap::HasPixbuf() const { - if (!m_refData) - m_refData = new wxBitmapRefData; + wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); - // AllocExclusive should not be needed for this internal function - wxASSERT(m_refData->GetRefCount() == 1); - wxASSERT(M_BMPDATA->m_pixbuf == NULL); - M_BMPDATA->m_pixbuf = pixbuf; - M_BMPDATA->m_width = gdk_pixbuf_get_width(pixbuf); - M_BMPDATA->m_height = gdk_pixbuf_get_height(pixbuf); - // if depth specified - if (depth != 0) - M_BMPDATA->m_bpp = depth; - else if (M_BMPDATA->m_bpp == 0) - // use something reasonable - M_BMPDATA->m_bpp = wxTheApp->GetGdkVisual()->depth; - PurgeOtherRepresentations(Pixbuf); + return M_BMPDATA->m_pixbuf != NULL; } void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) @@ -894,76 +1374,113 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) M_BMPDATA->m_pixmap = NULL; } } +#endif +#ifdef wxHAS_RAW_BITMAP void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { void* bits = NULL; +#ifdef __WXGTK3__ + GdkPixbuf* pixbuf = GetPixbufNoMask(); + if ((bpp == 32) == (gdk_pixbuf_get_has_alpha(pixbuf) != 0)) + { + bits = gdk_pixbuf_get_pixels(pixbuf); + wxBitmapRefData* bmpData = M_BMPDATA; + data.m_width = bmpData->m_width; + data.m_height = bmpData->m_height; + data.m_stride = gdk_pixbuf_get_rowstride(pixbuf); + if (bmpData->m_pixbufMask) + { + g_object_unref(bmpData->m_pixbufMask); + bmpData->m_pixbufMask = NULL; + } + if (bmpData->m_surface) + { + cairo_surface_destroy(bmpData->m_surface); + bmpData->m_surface = NULL; + } + } +#else GdkPixbuf *pixbuf = GetPixbuf(); const bool hasAlpha = HasAlpha(); + // allow access if bpp is valid and matches existence of alpha - if (pixbuf != NULL && ( - bpp == 24 && !hasAlpha || - bpp == 32 && hasAlpha)) + 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); } +#endif return bits; } void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) { } +#endif // wxHAS_RAW_BITMAP bool wxBitmap::HasAlpha() const { - return m_refData != NULL && M_BMPDATA->m_pixbuf != NULL && - gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf); + const wxBitmapRefData* bmpData = M_BMPDATA; +#ifdef __WXGTK3__ + return bmpData && bmpData->m_bpp == 32; +#else + return bmpData && (bmpData->m_alphaRequested || + (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))); +#endif } wxGDIRefData* wxBitmap::CreateGDIRefData() const { - return new wxBitmapRefData; + return new wxBitmapRefData(0, 0, 0); } wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { - const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data); - wxBitmapRefData* newRef = new wxBitmapRefData; - newRef->m_width = oldRef->m_width; - newRef->m_height = oldRef->m_height; - newRef->m_bpp = oldRef->m_bpp; + const wxBitmapRefData* oldRef = static_cast(data); + wxBitmapRefData * const newRef = new wxBitmapRefData(oldRef->m_width, + oldRef->m_height, + oldRef->m_bpp); +#ifdef __WXGTK3__ + if (oldRef->m_pixbufNoMask) + newRef->m_pixbufNoMask = gdk_pixbuf_copy(oldRef->m_pixbufNoMask); + if (oldRef->m_surface) + { + const int w = oldRef->m_width; + const int h = oldRef->m_height; + cairo_surface_t* surface = cairo_image_surface_create( + cairo_image_surface_get_format(oldRef->m_surface), w, h); + newRef->m_surface = surface; + cairo_surface_flush(oldRef->m_surface); + const guchar* src = cairo_image_surface_get_data(oldRef->m_surface); + guchar* dst = cairo_image_surface_get_data(surface); + const int stride = cairo_image_surface_get_stride(surface); + wxASSERT(stride == cairo_image_surface_get_stride(oldRef->m_surface)); + memcpy(dst, src, stride * h); + cairo_surface_mark_dirty(surface); + } +#else 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)); - GdkGC* gc = gdk_gc_new(newRef->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); - g_object_unref(gc); } if (oldRef->m_pixbuf != NULL) { newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf); } +#endif if (oldRef->m_mask != NULL) { - newRef->m_mask = new wxMask; - newRef->m_mask->m_bitmap = gdk_pixmap_new( - oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1); - GdkGC* gc = gdk_gc_new(newRef->m_mask->m_bitmap); - gdk_draw_drawable(newRef->m_mask->m_bitmap, - gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1); - g_object_unref(gc); + newRef->m_mask = new wxMask(*oldRef->m_mask); } -#if wxUSE_PALETTE - // implement this if SetPalette is ever implemented - wxASSERT(oldRef->m_palette == NULL); -#endif return newRef; }