X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b61c88d55f71d59affa4e57df52c99cdaaa5c08..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 90d40cefbf..109450dc55 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/gtk1/bitmap.cpp // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,49 +7,38 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bitmap.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #include "wx/bitmap.h" -#include "wx/palette.h" -#include "wx/icon.h" -#include "wx/filefn.h" -#include "wx/image.h" -#include "wx/dcmemory.h" -#include "wx/app.h" -#ifdef __WXGTK20__ - // need this to get gdk_image_new_bitmap() - #define GDK_ENABLE_BROKEN -#endif +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/palette.h" + #include "wx/icon.h" + #include "wx/math.h" + #include "wx/image.h" +#endif // WX_PRECOMP + +#include "wx/filefn.h" #include #include #include -#ifdef __WXGTK20__ - #include -#else // GTK+ 1.2 - #include -#endif // GTK+ 2.0/1.2 - -#include "wx/math.h" +#include -extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, - GdkGC *gc, - GdkDrawable *src, - gint xsrc, - gint ysrc, - gint xdest, - gint ydest, - gint width, - gint height); +extern +void gdk_wx_draw_bitmap (GdkDrawable *drawable, + GdkGC *gc, + GdkDrawable *src, + gint xsrc, + gint ysrc, + gint xdest, + gint ydest, + gint width, + gint height); //----------------------------------------------------------------------------- // data @@ -65,24 +54,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) wxMask::wxMask() { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = NULL; } wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = NULL; Create( 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; + m_bitmap = NULL; Create( bitmap ); } @@ -98,11 +89,11 @@ bool wxMask::Create( const wxBitmap& bitmap, if (m_bitmap) { gdk_bitmap_unref( m_bitmap ); - m_bitmap = (GdkBitmap*) NULL; + m_bitmap = NULL; } wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return FALSE; + if (!image.Ok()) return false; m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); GdkGC *gc = gdk_gc_new( m_bitmap ); @@ -182,36 +173,38 @@ bool wxMask::Create( const wxBitmap& bitmap, gdk_gc_unref( gc ); - return TRUE; + return true; } +#if wxUSE_PALETTE bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) { unsigned char r,g,b; wxPalette *pal = bitmap.GetPalette(); - wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") ); + 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) { gdk_bitmap_unref( m_bitmap ); - m_bitmap = (GdkBitmap*) NULL; + m_bitmap = NULL; } - if (!bitmap.Ok()) return FALSE; + if (!bitmap.Ok()) return false; - wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") ); + wxCHECK_MSG( bitmap.GetBitmap(), 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; + if (!m_bitmap) return false; GdkGC *gc = gdk_gc_new( m_bitmap ); @@ -219,7 +212,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) gdk_gc_unref( gc ); - return TRUE; + return true; } GdkBitmap *wxMask::GetBitmap() const @@ -227,40 +220,120 @@ GdkBitmap *wxMask::GetBitmap() const return m_bitmap; } + //----------------------------------------------------------------------------- -// wxBitmap +// wxBitmapRefData //----------------------------------------------------------------------------- -class wxBitmapRefData: public wxObjectRefData +class wxBitmapRefData : public wxGDIRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + wxBitmapRefData(const wxBitmapRefData& data); + bool Create(int width, int height, int bpp); + virtual ~wxBitmapRefData(); + + virtual bool IsOk() const { return m_pixmap || m_bitmap; } GdkPixmap *m_pixmap; GdkBitmap *m_bitmap; -#ifdef __WXGTK20__ - 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 }; wxBitmapRefData::wxBitmapRefData() { - m_pixmap = (GdkPixmap *) NULL; - m_bitmap = (GdkBitmap *) NULL; -#ifdef __WXGTK20__ - m_pixbuf = (GdkPixbuf *) NULL; -#endif - m_mask = (wxMask *) NULL; + m_pixmap = NULL; + m_bitmap = NULL; + m_mask = NULL; m_width = 0; m_height = 0; m_bpp = 0; - m_palette = (wxPalette *) NULL; +#if wxUSE_PALETTE + m_palette = NULL; +#endif // wxUSE_PALETTE +} + +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data) +{ + Create(data.m_width, data.m_height, data.m_bpp); + + m_mask = data.m_mask ? new wxMask(*data.m_mask) : NULL; + +#if wxUSE_PALETTE + wxASSERT_MSG( !data.m_palette, + wxT("copying bitmaps palette not implemented") ); +#endif // wxUSE_PALETTE + + + // copy the bitmap data by simply drawing the source bitmap on this one + GdkPixmap **dst; + if ( data.m_pixmap ) + { + dst = &m_pixmap; + } + else if ( data.m_bitmap ) + { + dst = &m_bitmap; + } + else // invalid bitmap? + { + return; + } + + GdkGC *gc = gdk_gc_new(*dst); + if ( m_bpp == 1 ) + { + gdk_wx_draw_bitmap(m_bitmap, gc, data.m_bitmap, 0, 0, 0, 0, -1, -1); + } + else // colour pixmap + { + gdk_draw_pixmap(m_pixmap, gc, data.m_pixmap, 0, 0, 0, 0, -1, -1); + } + + gdk_gc_unref(gc); +} + +bool wxBitmapRefData::Create(int width, int height, int bpp) +{ + m_width = width; + m_height = height; + m_bpp = bpp; + + m_mask = NULL; +#if wxUSE_PALETTE + m_palette = NULL; +#endif + + // to understand how this compiles you should know that GdkPixmap and + // GdkBitmap are one and the same type in GTK+ 1 + GdkPixmap **ppix; + if ( m_bpp != 1 ) + { + const GdkVisual * const visual = wxTheApp->GetGdkVisual(); + + wxCHECK_MSG( (bpp == -1) || (bpp == visual->depth) || (bpp == 32), false, + wxT("invalid bitmap depth") ); + + m_bpp = visual->depth; + + ppix = &m_pixmap; + m_bitmap = NULL; + } + else // mono bitmap + { + ppix = &m_bitmap; + m_pixmap = NULL; + } + + *ppix = gdk_pixmap_new( wxGetRootWindow()->window, width, height, m_bpp ); + + return *ppix != NULL; } wxBitmapRefData::~wxBitmapRefData() @@ -269,27 +342,29 @@ wxBitmapRefData::~wxBitmapRefData() gdk_pixmap_unref( m_pixmap ); if (m_bitmap) gdk_bitmap_unref( m_bitmap ); -#ifdef __WXGTK20__ - if (m_pixbuf) - gdk_pixbuf_unref( m_pixbuf ); -#endif delete m_mask; +#if wxUSE_PALETTE delete m_palette; +#endif // wxUSE_PALETTE } + +//----------------------------------------------------------------------------- +// wxBitmap //----------------------------------------------------------------------------- #define M_BMPDATA ((wxBitmapRefData *)m_refData) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) -wxBitmap::wxBitmap() +wxGDIRefData *wxBitmap::CreateGDIRefData() const { + return new wxBitmapRefData; } -wxBitmap::wxBitmap( int width, int height, int depth ) +wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const { - Create( width, height, depth ); + return new wxBitmapRefData(*static_cast(data)); } bool wxBitmap::Create( int width, int height, int depth ) @@ -301,47 +376,23 @@ bool wxBitmap::Create( int width, int height, int depth ) return false; } - GdkVisual *visual = wxTheApp->GetGdkVisual(); - - if (depth == -1) - depth = visual->depth; - - wxCHECK_MSG( (depth == visual->depth) || (depth == 1), FALSE, - wxT("invalid bitmap depth") ) - m_refData = new wxBitmapRefData(); - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - if (depth == 1) - { - M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ); - M_BMPDATA->m_bpp = 1; - } - else - { - M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth ); - M_BMPDATA->m_bpp = visual->depth; - } - - return Ok(); + return M_BMPDATA->Create(width, height, depth); } -bool wxBitmap::CreateFromXpm( const char **bits ) +wxBitmap::wxBitmap(const char* const* bits) { - UnRef(); - - wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) + wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data")); GdkVisual *visual = wxTheApp->GetGdkVisual(); m_refData = new wxBitmapRefData(); - GdkBitmap *mask = (GdkBitmap*) NULL; + GdkBitmap *mask = NULL; M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits ); - wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") ); + wxCHECK2_MSG(M_BMPDATA->m_pixmap, return, wxT("couldn't create pixmap")); if (mask) { @@ -352,8 +403,6 @@ bool wxBitmap::CreateFromXpm( const char **bits ) gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ? - - return TRUE; } wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy ) @@ -362,85 +411,132 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, 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); - + wxBitmap bmp; -#ifdef __WXGTK20__ - if (HasPixbuf()) + GdkImage *img = NULL; + if (GetPixmap()) + img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() ); + else if (GetBitmap()) + img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() ); + else + wxFAIL_MSG( wxT("Ill-formed bitmap") ); + + wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") ); + + int bpp = -1; + + + GdkGC *gc = NULL; + GdkPixmap *dstpix = NULL; + if (GetPixmap()) { - bmp.SetWidth(width); - bmp.SetHeight(height); - bmp.SetDepth(GetDepth()); - bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, - gdk_pixbuf_get_has_alpha(GetPixbuf()), - 8, width, height)); - gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(), - 0, 0, width, height, - clipx, clipy, - (double)newx/GetWidth(), (double)newy/GetHeight(), - GDK_INTERP_BILINEAR); + GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + if (visual == NULL) + visual = wxTheApp->GetGdkVisual(); + + bpp = visual->depth; + bmp = wxBitmap(width,height,bpp); + dstpix = bmp.GetPixmap(); + gc = gdk_gc_new( dstpix ); } - else -#endif // __WXGTK20__ + + char *dst = NULL; + long dstbyteperline = 0; + + if (GetBitmap()) { - GdkImage *img = (GdkImage*) NULL; - if (GetPixmap()) - img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() ); - else if (GetBitmap()) - img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() ); - else - wxFAIL_MSG( wxT("Ill-formed bitmap") ); - - wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") ); - - int bpp = -1; - - - GdkGC *gc = NULL; - GdkPixmap *dstpix = NULL; - if (GetPixmap()) - { - GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); - if (visual == NULL) - visual = wxTheApp->GetGdkVisual(); - - bpp = visual->depth; - bmp = wxBitmap(width,height,bpp); - dstpix = bmp.GetPixmap(); - gc = gdk_gc_new( dstpix ); - } + bpp = 1; + dstbyteperline = width/8*M_BMPDATA->m_bpp; + if (width*M_BMPDATA->m_bpp % 8 != 0) + dstbyteperline++; + 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; - char *dst = NULL; - long dstbyteperline = 0; - - if (GetBitmap()) + for (int w = 0; w < width; w++) { - bpp = 1; - dstbyteperline = width/8*M_BMPDATA->m_bpp; - if (width*M_BMPDATA->m_bpp % 8 != 0) - dstbyteperline++; - dst = (char*) malloc(dstbyteperline*height); + 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 (bpp == 1) + { + 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); + } } - - // 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 + // do not forget the last byte + if ((bpp == 1) && (width % 8 != 0)) + dst[h*dstbyteperline+width/8] = outbyte; + } + + gdk_image_destroy( img ); + if (gc) gdk_gc_unref( gc ); + + if (bpp == 1) + { + bmp = wxBitmap( (const char *)dst, width, height, 1 ); + free( dst ); + } + + if (GetMask()) + { + dstbyteperline = width/8; + if (width % 8 != 0) + dstbyteperline++; + dst = (char*) malloc(dstbyteperline*height); + img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() ); + for (int h = 0; h < height; h++) { char outbyte = 0; @@ -459,115 +555,49 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, old_pixval = pixval; old_x = x; } - - if (bpp == 1) + + if (pixval) { - 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; - } + char bit=1; + char shift = bit << (w % 8); + outbyte |= shift; } - else + + if ((w+1)%8 == 0) { - GdkColor col; - col.pixel = pixval; - gdk_gc_set_foreground( gc, &col ); - gdk_draw_point( dstpix, gc, w, h); + dst[h*dstbyteperline+w/8] = outbyte; + outbyte = 0; } } - + // do not forget the last byte - if ((bpp == 1) && (width % 8 != 0)) + if (width % 8 != 0) dst[h*dstbyteperline+width/8] = outbyte; } - - gdk_image_destroy( img ); - if (gc) gdk_gc_unref( gc ); - - if (bpp == 1) - { - bmp = wxBitmap( (const char *)dst, width, height, 1 ); - free( dst ); - } - - if (GetMask()) - { - dstbyteperline = width/8; - if (width % 8 != 0) - dstbyteperline++; - dst = (char*) malloc(dstbyteperline*height); - img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() ); + wxMask* mask = new wxMask; + mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height ); + bmp.SetMask(mask); - 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 (pixval) - { - char bit=1; - char shift = bit << w % 8; - outbyte |= shift; - } - - if ((w+1)%8 == 0) - { - dst[h*dstbyteperline+w/8] = outbyte; - outbyte = 0; - } - } - - // 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); + free( dst ); + gdk_image_destroy( img ); + } - free( dst ); - gdk_image_destroy( img ); - } + free( tablex ); + free( tabley ); - free( tablex ); - free( tabley ); - } - - return bmp; + return bmp; } bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { UnRef(); - wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) - wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") ) + 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; - + m_refData = new wxBitmapRefData(); if (depth == 1) @@ -576,10 +606,6 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) } else { -#ifdef __WXGTK20__ - if (image.HasAlpha()) - return CreateFromImageAsPixbuf(image); -#endif return CreateFromImageAsPixmap(image); } } @@ -590,7 +616,7 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) // convert alpha channel to mask, if it is present: wxImage image(img); image.ConvertAlphaToMask(); - + int width = image.GetWidth(); int height = image.GetHeight(); @@ -612,7 +638,7 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) // Create mask image - GdkImage *mask_image = (GdkImage*) NULL; + GdkImage *mask_image = NULL; if (image.HasMask()) { @@ -683,14 +709,14 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) return true; } - + // conversion to colour bitmap: bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) { // convert alpha channel to mask, if it is present: wxImage image(img); image.ConvertAlphaToMask(); - + int width = image.GetWidth(); int height = image.GetHeight(); @@ -719,12 +745,12 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) if (!image.HasMask() && (bpp > 12)) #endif { - static bool s_hasInitialized = FALSE; + static bool s_hasInitialized = false; if (!s_hasInitialized) { gdk_rgb_init(); - s_hasInitialized = TRUE; + s_hasInitialized = true; } GdkGC *gc = gdk_gc_new( GetPixmap() ); @@ -738,7 +764,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) width*3 ); gdk_gc_unref( gc ); - return TRUE; + return true; } // Create picture image @@ -748,7 +774,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) // Create mask image - GdkImage *mask_image = (GdkImage*) NULL; + GdkImage *mask_image = NULL; if (image.HasMask()) { @@ -893,6 +919,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) case GBR: pixel = (g << 16) | (b << 8) | r; break; } gdk_image_put_pixel( data_image, x, y, pixel ); + break; } default: break; } @@ -923,57 +950,12 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) return true; } -#ifdef __WXGTK20__ -bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) -{ - int width = image.GetWidth(); - int height = image.GetHeight(); - - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - image.HasAlpha(), - 8 /* bits per sample */, - width, height); - if (!pixbuf) - return false; - - wxASSERT( image.HasAlpha() ); // for now - wxASSERT( gdk_pixbuf_get_n_channels(pixbuf) == 4 ); - wxASSERT( gdk_pixbuf_get_width(pixbuf) == width ); - wxASSERT( gdk_pixbuf_get_height(pixbuf) == height ); - - M_BMPDATA->m_pixbuf = pixbuf; - SetHeight(height); - SetWidth(width); - SetDepth(wxTheApp->GetGdkVisual()->depth); - - // Copy the data: - unsigned char *in = image.GetData(); - unsigned char *out = gdk_pixbuf_get_pixels(pixbuf); - unsigned char *alpha = image.GetAlpha(); - - int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width; - - for (int y = 0; y < height; y++, out += rowinc) - { - 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; - } - } - - return true; -} -#endif // __WXGTK20__ - wxImage wxBitmap::ConvertToImage() const { wxImage image; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); - + image.Create(GetWidth(), GetHeight()); unsigned char *data = image.GetData(); @@ -983,179 +965,142 @@ wxImage wxBitmap::ConvertToImage() const return wxNullImage; } -#ifdef __WXGTK20__ - if (HasPixbuf()) + // the colour used as transparent one in wxImage and the one it is + // replaced with when it really occurs in the bitmap + static const int MASK_RED = 1; + static const int MASK_GREEN = 2; + static const int MASK_BLUE = 3; + static const int MASK_BLUE_REPLACEMENT = 2; + + GdkImage *gdk_image = NULL; + + if (HasPixmap()) { - GdkPixbuf *pixbuf = GetPixbuf(); - wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) ); - - int w = GetWidth(); - int h = GetHeight(); - - image.SetAlpha(); - - unsigned char *alpha = image.GetAlpha(); - unsigned char *in = gdk_pixbuf_get_pixels(pixbuf); - unsigned char *out = data; - int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w; - - for (int y = 0; y < h; y++, in += rowinc) - { - for (int x = 0; x < w; x++, in += 4, out += 3, alpha++) - { - out[0] = in[0]; - out[1] = in[1]; - out[2] = in[2]; - *alpha = in[3]; - } - } + gdk_image = gdk_image_get( GetPixmap(), + 0, 0, + GetWidth(), GetHeight() ); + } + else if (GetBitmap()) + { + gdk_image = gdk_image_get( GetBitmap(), + 0, 0, + GetWidth(), GetHeight() ); } else -#endif // __WXGTK20__ { - // the colour used as transparent one in wxImage and the one it is - // replaced with when it really occurs in the bitmap - static const int MASK_RED = 1; - static const int MASK_GREEN = 2; - static const int MASK_BLUE = 3; - static const int MASK_BLUE_REPLACEMENT = 2; - - GdkImage *gdk_image = (GdkImage*) NULL; - - if (HasPixmap()) - { - gdk_image = gdk_image_get( GetPixmap(), - 0, 0, - GetWidth(), GetHeight() ); - } - else if (GetBitmap()) - { - gdk_image = gdk_image_get( GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); - } - else - { - wxFAIL_MSG( wxT("Ill-formed bitmap") ); - } + wxFAIL_MSG( wxT("Ill-formed bitmap") ); + } - wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") ); + wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") ); - GdkImage *gdk_image_mask = (GdkImage*) NULL; - if (GetMask()) - { - gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); + GdkImage *gdk_image_mask = NULL; + if (GetMask()) + { + gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), + 0, 0, + GetWidth(), GetHeight() ); - image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); - } + image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); + } - int bpp = -1; - int red_shift_right = 0; - int green_shift_right = 0; - int blue_shift_right = 0; - int red_shift_left = 0; - int green_shift_left = 0; - int blue_shift_left = 0; - bool use_shift = FALSE; + int bpp = -1; + int red_shift_right = 0; + int green_shift_right = 0; + int blue_shift_right = 0; + int red_shift_left = 0; + int green_shift_left = 0; + int blue_shift_left = 0; + bool use_shift = false; - if (GetPixmap()) - { - GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); - if (visual == NULL) - visual = wxTheApp->GetGdkVisual(); - - bpp = visual->depth; - if (bpp == 16) - bpp = visual->red_prec + visual->green_prec + visual->blue_prec; - red_shift_right = visual->red_shift; - red_shift_left = 8-visual->red_prec; - green_shift_right = visual->green_shift; - green_shift_left = 8-visual->green_prec; - blue_shift_right = visual->blue_shift; - blue_shift_left = 8-visual->blue_prec; - - use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); - } - if (GetBitmap()) - { - bpp = 1; - } + if (GetPixmap()) + { + GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + if (visual == NULL) + visual = wxTheApp->GetGdkVisual(); + + bpp = visual->depth; + if (bpp == 16) + bpp = visual->red_prec + visual->green_prec + visual->blue_prec; + red_shift_right = visual->red_shift; + red_shift_left = 8-visual->red_prec; + green_shift_right = visual->green_shift; + green_shift_left = 8-visual->green_prec; + blue_shift_right = visual->blue_shift; + blue_shift_left = 8-visual->blue_prec; + + use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); + } + if (GetBitmap()) + { + bpp = 1; + } - GdkColormap *cmap = gtk_widget_get_default_colormap(); + GdkColormap *cmap = gtk_widget_get_default_colormap(); - long pos = 0; - for (int j = 0; j < GetHeight(); j++) + long pos = 0; + for (int j = 0; j < GetHeight(); j++) + { + for (int i = 0; i < GetWidth(); i++) { - for (int i = 0; i < GetWidth(); i++) + wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); + if (bpp == 1) { - wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp == 1) + if (pixel == 0) { - if (pixel == 0) - { - data[pos] = 0; - data[pos+1] = 0; - data[pos+2] = 0; - } - else - { - data[pos] = 255; - data[pos+1] = 255; - data[pos+2] = 255; - } - } - else if (use_shift) - { - data[pos] = (pixel >> red_shift_right) << red_shift_left; - data[pos+1] = (pixel >> green_shift_right) << green_shift_left; - data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; - } - else if (cmap->colors) - { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->colors[pixel].blue >> 8; + data[pos] = 0; + data[pos+1] = 0; + data[pos+2] = 0; } else { - wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); + data[pos] = 255; + data[pos+1] = 255; + data[pos+2] = 255; } + } + else if (use_shift) + { + data[pos] = (pixel >> red_shift_right) << red_shift_left; + data[pos+1] = (pixel >> green_shift_right) << green_shift_left; + data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; + } + else if (cmap->colors) + { + data[pos] = cmap->colors[pixel].red >> 8; + data[pos+1] = cmap->colors[pixel].green >> 8; + data[pos+2] = cmap->colors[pixel].blue >> 8; + } + else + { + wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") ); + } - if (gdk_image_mask) + if (gdk_image_mask) + { + int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); + if (mask_pixel == 0) { - int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); - if (mask_pixel == 0) - { - data[pos] = MASK_RED; - data[pos+1] = MASK_GREEN; - data[pos+2] = MASK_BLUE; - } - else if ( data[pos] == MASK_RED && - data[pos+1] == MASK_GREEN && - data[pos+2] == MASK_BLUE ) - { - data[pos+2] = MASK_BLUE_REPLACEMENT; - } + data[pos] = MASK_RED; + data[pos+1] = MASK_GREEN; + data[pos+2] = MASK_BLUE; + } + else if ( data[pos] == MASK_RED && + data[pos+1] == MASK_GREEN && + data[pos+2] == MASK_BLUE ) + { + data[pos+2] = MASK_BLUE_REPLACEMENT; } - - pos += 3; } - } - gdk_image_destroy( gdk_image ); - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + pos += 3; + } } - return image; -} + gdk_image_destroy( gdk_image ); + if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); -wxBitmap::wxBitmap( const wxBitmap& bmp ) - : wxBitmapBase() -{ - Ref( bmp ); + return image; } wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type ) @@ -1169,7 +1114,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth { m_refData = new wxBitmapRefData(); - M_BMPDATA->m_mask = (wxMask *) NULL; + M_BMPDATA->m_mask = NULL; M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data ( wxGetRootWindow()->window, @@ -1189,35 +1134,6 @@ wxBitmap::~wxBitmap() { } -wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) -{ - if ( m_refData != bmp.m_refData ) - Ref( bmp ); - - return *this; -} - -bool wxBitmap::operator == ( const wxBitmap& bmp ) const -{ - return m_refData == bmp.m_refData; -} - -bool wxBitmap::operator != ( const wxBitmap& bmp ) const -{ - return m_refData != bmp.m_refData; -} - -bool wxBitmap::Ok() const -{ - return (m_refData != NULL) && - ( -#ifdef __WXGTK20__ - M_BMPDATA->m_pixbuf || -#endif - M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap - ); -} - int wxBitmap::GetHeight() const { wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); @@ -1241,7 +1157,7 @@ int wxBitmap::GetDepth() const wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } @@ -1250,6 +1166,7 @@ void wxBitmap::SetMask( wxMask *mask ) { wxCHECK_RET( Ok(), wxT("invalid bitmap") ); + AllocExclusive(); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; M_BMPDATA->m_mask = mask; @@ -1258,7 +1175,7 @@ void wxBitmap::SetMask( wxMask *mask ) bool wxBitmap::CopyFromIcon(const wxIcon& icon) { *this = icon; - return TRUE; + return true; } wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const @@ -1271,37 +1188,22 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp ); wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") ); -#ifdef __WXGTK20__ - if (HasPixbuf()) + if (ret.GetPixmap()) { - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - gdk_pixbuf_get_has_alpha(GetPixbuf()), - 8, GetWidth(), GetHeight()); - ret.SetPixbuf(pixbuf); - gdk_pixbuf_copy_area(GetPixbuf(), - rect.x, rect.y, rect.width, rect.height, - pixbuf, 0, 0); + GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); + gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); + gdk_gc_destroy( gc ); } else -#endif // __WXGTK20__ { - if (ret.GetPixmap()) - { - GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); - gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); - } - else - { - GdkGC *gc = gdk_gc_new( ret.GetBitmap() ); - GdkColor col; - col.pixel = 0xFFFFFF; - gdk_gc_set_foreground( gc, &col ); - col.pixel = 0; - gdk_gc_set_background( gc, &col ); - gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); - } + GdkGC *gc = gdk_gc_new( ret.GetBitmap() ); + GdkColor col; + col.pixel = 0xFFFFFF; + gdk_gc_set_foreground( gc, &col ); + col.pixel = 0; + gdk_gc_set_background( gc, &col ); + gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); + gdk_gc_destroy( gc ); } if (GetMask()) @@ -1326,7 +1228,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const { - wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") ); + wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); // Try to save the bitmap via wxImage handlers: { @@ -1334,7 +1236,7 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett if (image.Ok()) return image.SaveFile( name, type ); } - return FALSE; + return false; } bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) @@ -1342,7 +1244,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) UnRef(); if (!wxFileExists(name)) - return FALSE; + return false; GdkVisual *visual = wxTheApp->GetGdkVisual(); @@ -1350,7 +1252,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { m_refData = new wxBitmapRefData(); - GdkBitmap *mask = (GdkBitmap*) NULL; + GdkBitmap *mask = NULL; M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm ( @@ -1374,18 +1276,19 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) { wxImage image; if ( !image.LoadFile( name, type ) || !image.Ok() ) - return FALSE; + return false; *this = wxBitmap(image); } - return TRUE; + return true; } +#if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { if (!Ok()) - return (wxPalette *) NULL; + return NULL; return M_BMPDATA->m_palette; } @@ -1394,28 +1297,23 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) { // TODO } +#endif // wxUSE_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; } @@ -1425,9 +1323,6 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) m_refData = new wxBitmapRefData(); M_BMPDATA->m_pixmap = pixmap; -#ifdef __WXGTK20__ - PurgeOtherRepresentations(Pixmap); -#endif } void wxBitmap::SetBitmap( GdkPixmap *bitmap ) @@ -1436,27 +1331,11 @@ void wxBitmap::SetBitmap( GdkPixmap *bitmap ) m_refData = new wxBitmapRefData(); M_BMPDATA->m_bitmap = bitmap; -#ifdef __WXGTK20__ - PurgeOtherRepresentations(Pixmap); -#endif } GdkPixmap *wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") ); - -#ifdef __WXGTK20__ - // create the pixmap on the fly if we use Pixbuf representation: - if (HasPixbuf() && !HasPixmap()) - { - delete M_BMPDATA->m_mask; - M_BMPDATA->m_mask = new wxMask(); - gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf, - &M_BMPDATA->m_pixmap, - &M_BMPDATA->m_mask->m_bitmap, - 128 /*threshold*/); - } -#endif // __WXGTK20__ + wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_pixmap; } @@ -1469,122 +1348,27 @@ bool wxBitmap::HasPixmap() const } GdkBitmap *wxBitmap::GetBitmap() const -{ - wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") ); - - return M_BMPDATA->m_bitmap; -} - -#ifdef __WXGTK20__ -GdkPixbuf *wxBitmap::GetPixbuf() const { wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); - if (HasPixmap() && !HasPixbuf()) - { - int width = GetWidth(); - int height = GetHeight(); - - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - GetMask() != NULL, - 8, width, height); - M_BMPDATA->m_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) - { - GdkPixbuf *pmask = - gdk_pixbuf_get_from_drawable(NULL, - M_BMPDATA->m_mask->GetBitmap(), - NULL, - 0, 0, 0, 0, width, height); - if (pmask) - { - 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; - - 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; - } - } - - gdk_pixbuf_unref(pmask); - } - } - } - - return M_BMPDATA->m_pixbuf; -} - -bool wxBitmap::HasPixbuf() const -{ - wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") ); - - return M_BMPDATA->m_pixbuf != NULL; -} - -void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf ) -{ - if (!m_refData) - m_refData = new wxBitmapRefData(); - - M_BMPDATA->m_pixbuf = pixbuf; - PurgeOtherRepresentations(Pixbuf); -} - -void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) -{ - if (keep == Pixmap && HasPixbuf()) - { - gdk_pixbuf_unref( M_BMPDATA->m_pixbuf ); - M_BMPDATA->m_pixbuf = NULL; - } - if (keep == Pixbuf && HasPixmap()) - { - gdk_pixmap_unref( M_BMPDATA->m_pixmap ); - M_BMPDATA->m_pixmap = NULL; - } -} - -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase) - -wxBitmapHandler::~wxBitmapHandler() -{ + return M_BMPDATA->m_bitmap; } -bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) +void *wxBitmap::GetRawData(wxPixelDataBase& WXUNUSED(data), int WXUNUSED(bpp)) { - return FALSE; + return NULL; } -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) { - return FALSE; } -bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +bool wxBitmap::HasAlpha() const { - return FALSE; + return false; } /* static */ void wxBitmap::InitStandardHandlers() { // TODO: Insert handler based on GdkPixbufs handler later } - - -#endif // __WXGTK20__