X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/452418c4b0763eb611432e84f077c9766e282057..9ef3e400e02320aecf2ac883f0b58ad3a01932b3:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 019d6cd213..1be0bb94a4 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -23,6 +23,8 @@ #include "wx/rawbmp.h" +#include "wx/gtk/private/object.h" + #include //----------------------------------------------------------------------------- @@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap ) 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); return true; } @@ -181,12 +182,14 @@ GdkBitmap *wxMask::GetBitmap() const // wxBitmap //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData: public wxGDIRefData { public: wxBitmapRefData(); virtual ~wxBitmapRefData(); + virtual bool IsOk() const { return m_pixmap || m_pixbuf; } + GdkPixmap *m_pixmap; GdkPixbuf *m_pixbuf; wxMask *m_mask; @@ -225,7 +228,7 @@ wxBitmapRefData::~wxBitmapRefData() //----------------------------------------------------------------------------- -#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData) +#define M_BMPDATA static_cast(m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) @@ -255,7 +258,7 @@ wxBitmap::wxBitmap(const char* const* bits) wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); GdkBitmap* mask = NULL; - SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits))); + SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast(bits))); if (M_BMPDATA->m_pixmap != NULL && mask != NULL) { @@ -277,207 +280,101 @@ bool wxBitmap::Create( int width, int height, int depth ) return false; } + const GdkVisual* visual = wxTheApp->GetGdkVisual(); + if (depth == 32) { SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32); + // must initialize alpha, otherwise GetPixmap() + // will create a mask out of garbage + gdk_pixbuf_fill(M_BMPDATA->m_pixbuf, 0x000000ff); + } else + if (depth == 24) + { + if (visual->depth == depth) + SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth)); + else + SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height), 24); } else { if (depth != 1) { - const GdkVisual* visual = wxTheApp->GetGdkVisual(); if (depth == -1) depth = visual->depth; - - wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth")); } - SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth)); } return Ok(); } -wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const +wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, + int width, int height) const { wxBitmap bmp; wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap")); - if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height) - return *this; - - int width = wxMax(newx, 1); - int height = wxMax(newy, 1); - width = wxMin(width, clipwidth); - height = wxMin(height, clipheight); - - // scale pixbuf if available and it has alpha or there is no mask - if (M_BMPDATA->m_pixbuf != NULL && ( - M_BMPDATA->m_mask == NULL || gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf))) - { - bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, - gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf), - 8, width, height), M_BMPDATA->m_bpp); - gdk_pixbuf_scale(M_BMPDATA->m_pixbuf, bmp.GetPixbuf(), - 0, 0, width, height, - clipx, clipy, - (double)newx/GetWidth(), (double)newy/GetHeight(), - GDK_INTERP_BILINEAR); - } - else - { - GdkImage* img = gdk_drawable_get_image( - M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height); + width = wxMax(width, 1); + height = wxMax(height, 1); - wxCHECK_MSG(img, bmp, wxT("couldn't create image")); + const double scale_x = double(width) / clipwidth; + const double scale_y = double(height) / clipheight; - GdkGC *gc = NULL; - GdkPixmap *dstpix = NULL; - char *dst = NULL; - long dstbyteperline = 0; + // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting + // back, is faster than scaling pixmap ourselves. - if (GetDepth() != 1) - { - bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap)); - dstpix = bmp.GetPixmap(); - gc = gdk_gc_new( dstpix ); - } - else - { - dstbyteperline = (width + 7) / 8; - dst = (char*) malloc(dstbyteperline*height); - } - - // be careful to use the right scaling factor - float scx = (float)M_BMPDATA->m_width/(float)newx; - float scy = (float)M_BMPDATA->m_height/(float)newy; - // prepare accel-tables - int *tablex = (int *)calloc(width,sizeof(int)); - int *tabley = (int *)calloc(height,sizeof(int)); - - // accel table filled with clipped values - for (int x = 0; x < width; x++) - tablex[x] = (int) (scx * (x+clipx)); - for (int y = 0; y < height; y++) - tabley[y] = (int) (scy * (y+clipy)); - - // Main rescaling routine starts here - for (int h = 0; h < height; h++) - { - char outbyte = 0; - int old_x = -1; - guint32 old_pixval = 0; - - for (int w = 0; w < width; w++) - { - guint32 pixval; - int x = tablex[w]; - if (x == old_x) - pixval = old_pixval; - else - { - pixval = gdk_image_get_pixel( img, x, tabley[h] ); - old_pixval = pixval; - old_x = x; - } - - if ( dst ) - { - if (pixval) - { - char bit=1; - char shift = bit << (w % 8); - outbyte |= shift; - } - - if ((w+1)%8==0) - { - dst[h*dstbyteperline+w/8] = outbyte; - outbyte = 0; - } - } - else - { - GdkColor col; - col.pixel = pixval; - gdk_gc_set_foreground( gc, &col ); - gdk_draw_point( dstpix, gc, w, h); - } - } - - // do not forget the last byte - if ( dst && (width % 8 != 0) ) - dst[h*dstbyteperline+width/8] = outbyte; - } - - g_object_unref (img); - if (gc) g_object_unref (gc); - - if ( dst ) - { - bmp = wxBitmap(dst, width, height, 1); - free( dst ); - } + // 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); - if (GetMask()) - { - dstbyteperline = (width + 7) / 8; - dst = (char*) malloc(dstbyteperline*height); - img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight()); + // new pixbuf for scaled wxBitmap + GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new( + GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height); - for (int h = 0; h < height; h++) - { - char outbyte = 0; - int old_x = -1; - guint32 old_pixval = 0; + // 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*scale_x, -clipy*scale_y, scale_x, scale_y, + GDK_INTERP_NEAREST); - for (int w = 0; w < width; w++) - { - guint32 pixval; - int x = tablex[w]; - if (x == old_x) - pixval = old_pixval; - else - { - pixval = gdk_image_get_pixel( img, x, tabley[h] ); - old_pixval = pixval; - old_x = x; - } + g_object_unref(pixbuf); + bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp); - if (pixval) - { - char bit=1; - char shift = bit << (w % 8); - outbyte |= shift; - } + if (M_BMPDATA->m_mask) + { + 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); - if ((w+1)%8 == 0) - { - dst[h*dstbyteperline+w/8] = outbyte; - outbyte = 0; - } - } + pixbuf_scaled = gdk_pixbuf_new( + GDK_COLORSPACE_RGB, false, 8, width, height); - // do not forget the last byte - if (width % 8 != 0) - dst[h*dstbyteperline+width/8] = outbyte; - } - wxMask* mask = new wxMask; - mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height ); - bmp.SetMask(mask); + gdk_pixbuf_scale( + pixbuf, pixbuf_scaled, + 0, 0, width, height, -clipx, -clipy, scale_x, scale_y, + GDK_INTERP_NEAREST); - free( dst ); - g_object_unref (img); - } + g_object_unref(pixbuf); - free( tablex ); - free( tabley ); + // use existing functionality to create mask from scaled pixbuf + wxBitmap maskbmp; + maskbmp.SetPixbuf(pixbuf_scaled); + bmp.SetMask(new wxMask(maskbmp, *wxBLACK)); } - return bmp; } +#if wxUSE_IMAGE + bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { UnRef(); @@ -525,12 +422,11 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth) else { SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth)); - GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap); + 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(); @@ -653,10 +549,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 @@ -708,19 +603,7 @@ wxImage wxBitmap::ConvertToImage() const return image; } -bool wxBitmap::operator == ( const wxBitmap& bmp ) const -{ - return m_refData == bmp.m_refData; -} - -bool wxBitmap::Ok() const -{ - return (m_refData != NULL) && - ( - M_BMPDATA->m_pixbuf || - M_BMPDATA->m_pixmap - ); -} +#endif // wxUSE_IMAGE int wxBitmap::GetHeight() const { @@ -754,6 +637,7 @@ void wxBitmap::SetMask( wxMask *mask ) { wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + AllocExclusive(); delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; } @@ -787,9 +671,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const else { ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp); - GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); + wxGtkObject 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); } // make mask, unless there is already alpha if (GetMask() && !HasAlpha()) @@ -797,9 +680,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const 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 ); + wxGtkObject 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 ); } @@ -811,9 +693,16 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett { wxCHECK_MSG( Ok(), 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 } bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) @@ -831,12 +720,14 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) 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.Ok()) CreateFromImage(image, -1); } +#endif // wxUSE_IMAGE return Ok(); } @@ -857,25 +748,19 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) void wxBitmap::SetHeight( int height ) { - if (!m_refData) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BMPDATA->m_height = height; } void wxBitmap::SetWidth( int width ) { - if (!m_refData) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BMPDATA->m_width = width; } void wxBitmap::SetDepth( int depth ) { - if (!m_refData) - m_refData = new wxBitmapRefData; - + AllocExclusive(); M_BMPDATA->m_bpp = depth; } @@ -884,6 +769,8 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) if (!m_refData) m_refData = new wxBitmapRefData; + // 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); @@ -909,7 +796,7 @@ GdkPixmap *wxBitmap::GetPixmap() const gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf, &M_BMPDATA->m_pixmap, pmask, - wxIMAGE_ALPHA_THRESHOLD); + 0x80 /* alpha threshold */); } return M_BMPDATA->m_pixmap; @@ -928,6 +815,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const if (M_BMPDATA->m_pixbuf == NULL) { + int width = GetWidth(); int height = GetHeight(); @@ -937,7 +825,6 @@ GdkPixbuf *wxBitmap::GetPixbuf() const M_BMPDATA->m_pixbuf = pixbuf; gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL, 0, 0, 0, 0, width, height); - // apply the mask to created pixbuf: if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask) { @@ -983,6 +870,8 @@ void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth) if (!m_refData) m_refData = new wxBitmapRefData; + // 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); @@ -1015,10 +904,9 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) void* bits = NULL; 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 ); @@ -1038,23 +926,48 @@ bool wxBitmap::HasAlpha() const gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf); } -void wxBitmap::UseAlpha() +wxGDIRefData* wxBitmap::CreateGDIRefData() const { - GdkPixbuf* pixbuf = GetPixbuf(); - // add alpha if necessary - if (!gdk_pixbuf_get_has_alpha(pixbuf)) - { - M_BMPDATA->m_pixbuf = NULL; - SetPixbuf(gdk_pixbuf_add_alpha(pixbuf, false, 0, 0, 0)); - g_object_unref(pixbuf); - } + return new wxBitmapRefData; } -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const +{ + const wxBitmapRefData* oldRef = static_cast(data); + wxBitmapRefData* newRef = new wxBitmapRefData; + newRef->m_width = oldRef->m_width; + newRef->m_height = oldRef->m_height; + newRef->m_bpp = 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; + newRef->m_mask->m_bitmap = gdk_pixmap_new( + oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1); + wxGtkObject 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); + } +#if wxUSE_PALETTE + // implement this if SetPalette is ever implemented + wxASSERT(oldRef->m_palette == NULL); +#endif -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) + return newRef; +} /* static */ void wxBitmap::InitStandardHandlers() {