X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/533b005afddad05e3d126b5d3ad9227e8eb05701..1b447793ea73455bcec70ee39db841b28e6fc7cf:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index bc18293081..9076d3c0ac 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,94 +280,36 @@ 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 bmp; - - wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap")); - - if (newx==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); - - 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); - - 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); - - 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)); - } - return bmp; -} +#if wxUSE_IMAGE bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { @@ -413,12 +358,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(); @@ -541,10 +485,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 @@ -596,14 +539,7 @@ wxImage wxBitmap::ConvertToImage() const return image; } -bool wxBitmap::IsOk() const -{ - return (m_refData != NULL) && - ( - M_BMPDATA->m_pixbuf || - M_BMPDATA->m_pixmap - ); -} +#endif // wxUSE_IMAGE int wxBitmap::GetHeight() const { @@ -671,9 +607,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()) @@ -681,9 +616,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 ); } @@ -695,9 +629,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 ) @@ -715,12 +656,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(); } @@ -789,7 +732,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; @@ -808,6 +751,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const if (M_BMPDATA->m_pixbuf == NULL) { + int width = GetWidth(); int height = GetHeight(); @@ -817,7 +761,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) { @@ -897,10 +840,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 ); @@ -920,27 +862,14 @@ bool wxBitmap::HasAlpha() const gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf); } -void wxBitmap::UseAlpha() -{ - GdkPixbuf* pixbuf = GetPixbuf(); - // add alpha if necessary - if (!gdk_pixbuf_get_has_alpha(pixbuf)) - { - M_BMPDATA->m_pixbuf = NULL; - AllocExclusive(); - M_BMPDATA->m_pixbuf = gdk_pixbuf_add_alpha(pixbuf, false, 0, 0, 0); - g_object_unref(pixbuf); - } -} - -wxObjectRefData* wxBitmap::CreateRefData() const +wxGDIRefData* wxBitmap::CreateGDIRefData() const { return new wxBitmapRefData; } -wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const { - const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data); + const wxBitmapRefData* oldRef = static_cast(data); wxBitmapRefData* newRef = new wxBitmapRefData; newRef->m_width = oldRef->m_width; newRef->m_height = oldRef->m_height; @@ -951,10 +880,9 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const 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) { @@ -965,10 +893,9 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const 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); + 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); - g_object_unref(gc); } #if wxUSE_PALETTE // implement this if SetPalette is ever implemented @@ -978,12 +905,6 @@ wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const return newRef; } -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase) - /* static */ void wxBitmap::InitStandardHandlers() { // TODO: Insert handler based on GdkPixbufs handler later