#include "wx/rawbmp.h"
+#include "wx/gtk/private/object.h"
+
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxMask
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase)
wxMask::wxMask()
{
- m_bitmap = (GdkBitmap *) NULL;
+ m_bitmap = NULL;
}
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);
}
wxMask::~wxMask()
g_object_unref (m_bitmap);
}
-bool wxMask::Create( const wxBitmap& bitmap,
- const wxColour& colour )
+void wxMask::FreeData()
{
if (m_bitmap)
{
g_object_unref (m_bitmap);
- m_bitmap = (GdkBitmap*) NULL;
+ m_bitmap = NULL;
}
+}
+bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
+{
const int w = bitmap.GetWidth();
const int h = bitmap.GetHeight();
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") );
if (!m_bitmap) return false;
- GdkGC *gc = gdk_gc_new( m_bitmap );
+ wxGtkObject<GdkGC> 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;
}
}
//-----------------------------------------------------------------------------
-// wxBitmap
+// wxBitmapRefData
//-----------------------------------------------------------------------------
-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;
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_pixbuf = (GdkPixbuf *) NULL;
- m_mask = (wxMask *) NULL;
+ m_pixmap = NULL;
+ m_pixbuf = 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()
#endif // wxUSE_PALETTE
}
+
+//-----------------------------------------------------------------------------
+// wxBitmap
//-----------------------------------------------------------------------------
-#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)
+#define M_BMPDATA static_cast<wxBitmapRefData*>(m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
-wxBitmap::wxBitmap()
+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
{
+ LoadFile(filename, type);
}
-wxBitmap::wxBitmap( int width, int height, int depth )
-{
- Create( width, height, depth );
-}
-
-bool wxBitmap::Create( int width, int height, int depth )
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
- UnRef();
-
- if ( width <= 0 || height <= 0 )
- {
- return false;
- }
-
- if (depth == 32)
+ wxASSERT(depth == 1);
+ if (width > 0 && height > 0 && depth == 1)
{
- SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height));
- M_BMPDATA->m_bpp = 32;
- }
- 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));
+ SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
}
-
- return Ok();
}
-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(const char* const* bits)
{
- UnRef();
+ wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
- wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
+ GdkBitmap* mask = NULL;
+ SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
+ if (!M_BMPDATA)
+ return;
- GdkBitmap *mask = (GdkBitmap*) NULL;
- SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits));
-
- wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
-
- if (mask)
+ if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
{
M_BMPDATA->m_mask = new wxMask;
M_BMPDATA->m_mask->m_bitmap = mask;
}
-
- return true;
}
-wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
+wxBitmap::~wxBitmap()
{
- 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);
+bool wxBitmap::Create( int width, int height, int depth )
+{
+ UnRef();
- if (HasPixbuf())
+ if ( width <= 0 || height <= 0 )
{
- bmp.SetDepth(GetDepth());
- bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, //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);
+ return false;
}
- else
- {
- GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight());
- wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
+ const GdkVisual* visual = wxTheApp->GetGdkVisual();
- GdkGC *gc = NULL;
- GdkPixmap *dstpix = NULL;
- char *dst = NULL;
- long dstbyteperline = 0;
+ if (depth == 32)
+ {
+ SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
- if (GetDepth() != 1)
- {
- GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
- if (visual == NULL)
- visual = wxTheApp->GetGdkVisual();
+ if (!M_BMPDATA)
+ return false;
- bmp = wxBitmap(width, height, visual->depth);
- dstpix = bmp.GetPixmap();
- gc = gdk_gc_new( dstpix );
- }
+ // 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)
{
- 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( (const char *)dst, width, height, 1 );
- free( dst );
- }
-
- if (GetMask())
- {
- dstbyteperline = (width + 7) / 8;
- dst = (char*) malloc(dstbyteperline*height);
- img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
-
- 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 );
- g_object_unref (img);
+ if (depth == -1)
+ depth = visual->depth;
}
-
- free( tablex );
- free( tabley );
+ SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
}
- return bmp;
+ return IsOk();
}
+#if wxUSE_IMAGE
+
bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
{
UnRef();
- wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
return false;
- if (depth == 1)
- return CreateFromImageAsPixmap(image, depth);
-
- if (image.HasAlpha())
+ // 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);
}
}
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<GdkGC> 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();
SetMask(mask);
delete[] out;
}
- return true;
+ return IsOk();
}
bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
{
+ wxASSERT(image.HasAlpha());
+
int width = image.GetWidth();
int height = image.GetHeight();
- GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, //image.HasAlpha(),
- 8 /* bits per sample */,
- width, height);
+ Create(width, height, 32);
+ GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
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 );
-
- SetDepth(32);
- SetPixbuf(pixbuf);
-
// Copy the data:
- unsigned char *in = image.GetData();
+ const 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;
+ int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
- for (int y = 0; y < height; y++, out += rowinc)
+ for (int y = 0; y < height; y++, out += rowpad)
{
for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
{
wxImage wxBitmap::ConvertToImage() const
{
- wxImage image;
-
- wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
const int w = GetWidth();
const int h = GetHeight();
- image.Create(w, h);
+ wxImage image(w, h, false);
unsigned char *data = image.GetData();
wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
+ // prefer pixbuf if available, it will preserve alpha and should be quicker
if (HasPixbuf())
{
GdkPixbuf *pixbuf = GetPixbuf();
- wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
-
- image.SetAlpha();
-
- unsigned char *alpha = image.GetAlpha();
- unsigned char *in = gdk_pixbuf_get_pixels(pixbuf);
+ unsigned char* alpha = NULL;
+ if (gdk_pixbuf_get_has_alpha(pixbuf))
+ {
+ image.SetAlpha();
+ alpha = image.GetAlpha();
+ }
+ const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf);
unsigned char *out = data;
- int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+ const int inc = 3 + int(alpha != NULL);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
- for (int y = 0; y < h; y++, in += rowinc)
+ for (int y = 0; y < h; y++, in += rowpad)
{
- for (int x = 0; x < w; x++, in += 4, out += 3, alpha++)
+ for (int x = 0; x < w; x++, in += inc, out += 3)
{
out[0] = in[0];
out[1] = in[1];
out[2] = in[2];
- *alpha = in[3];
+ if (alpha != NULL)
+ *alpha++ = in[3];
}
}
}
{
// 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<GdkGC> 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
g_object_unref(pixbuf);
if (pixmap_invert != NULL)
g_object_unref(pixmap_invert);
+ }
+ // convert mask, unless there is already alpha
+ if (GetMask() && !image.HasAlpha())
+ {
+ // we hard code the mask colour for now but we could also make an
+ // effort (and waste time) to choose a colour not present in the
+ // image already to avoid having to fudge the pixels below --
+ // whether it's worth to do it is unclear however
+ const int MASK_RED = 1;
+ const int MASK_GREEN = 2;
+ const int MASK_BLUE = 3;
+ const int MASK_BLUE_REPLACEMENT = 2;
+
+ image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
+ GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
- if (GetMask())
+ for (int y = 0; y < h; y++)
{
- // the colour used as transparent one in wxImage and the one it is
- // replaced with when it really occurs in the bitmap
- const int MASK_RED = 1;
- const int MASK_GREEN = 2;
- const int MASK_BLUE = 3;
- const int MASK_BLUE_REPLACEMENT = 2;
-
- image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
- GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
-
- for (int y = 0; y < h; y++)
+ for (int x = 0; x < w; x++, data += 3)
{
- for (int x = 0; x < w; x++, data += 3)
+ if (gdk_image_get_pixel(image_mask, x, y) == 0)
{
- if (gdk_image_get_pixel(image_mask, x, y) == 0)
- {
- data[0] = MASK_RED;
- data[1] = MASK_GREEN;
- data[2] = MASK_BLUE;
- }
- else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
- {
- data[2] = MASK_BLUE_REPLACEMENT;
- }
+ data[0] = MASK_RED;
+ data[1] = MASK_GREEN;
+ data[2] = MASK_BLUE;
+ }
+ else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
+ {
+ // we have to fudge the colour a bit to prevent
+ // this pixel from appearing transparent
+ data[2] = MASK_BLUE_REPLACEMENT;
}
}
- g_object_unref(image_mask);
}
+ g_object_unref(image_mask);
}
return image;
}
-wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
-{
- LoadFile( filename, type );
-}
-
-wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
-{
- if ( width > 0 && height > 0 )
- {
- SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
-
- wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
- }
-}
-
-wxBitmap::~wxBitmap()
-{
-}
-
-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) &&
- (
- M_BMPDATA->m_pixbuf ||
- M_BMPDATA->m_pixmap
- );
-}
+#endif // wxUSE_IMAGE
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") );
-
- if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+ wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
+ AllocExclusive();
+ delete M_BMPDATA->m_mask;
M_BMPDATA->m_mask = mask;
}
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
- return Ok();
+ return IsOk();
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{
wxBitmap ret;
- wxCHECK_MSG( Ok() &&
- (rect.x >= 0) && (rect.y >= 0) &&
- (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
- ret, wxT("invalid bitmap or bitmap region") );
+ wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap"));
+ wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
+ rect.x + rect.width <= M_BMPDATA->m_width &&
+ rect.y + rect.height <= M_BMPDATA->m_height,
+ ret, wxT("invalid bitmap region"));
- if (HasPixbuf())
+ if (HasPixbuf() || M_BMPDATA->m_bpp == 32)
{
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
+ gdk_pixbuf_get_has_alpha(GetPixbuf()),
8, rect.width, rect.height);
- ret.SetPixbuf(pixbuf);
- ret.SetDepth(M_BMPDATA->m_bpp);
+ if (!pixbuf)
+ return ret;
+
+ ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
gdk_pixbuf_copy_area(GetPixbuf(),
rect.x, rect.y, rect.width, rect.height,
pixbuf, 0, 0);
}
else
{
- ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp);
- GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+ ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
+ wxGtkObject<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);
}
-
- if (GetMask())
+ // make mask, unless there is already alpha
+ if (GetMask() && !HasAlpha())
{
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<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 );
}
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
}
bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
if (type == wxBITMAP_TYPE_XPM)
{
- GdkBitmap *mask = (GdkBitmap*) NULL;
+ GdkBitmap *mask = NULL;
SetPixmap(gdk_pixmap_create_from_xpm(wxGetRootWindow()->window, &mask, NULL, name.fn_str()));
+ if (!M_BMPDATA)
+ return false; // do not set the mask
if (mask)
{
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())
- *this = wxBitmap(image);
+ CreateFromImage(image, -1);
}
+#endif // wxUSE_IMAGE
- return Ok();
+ return IsOk();
}
#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok())
- return (wxPalette *) NULL;
+ wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap"));
return M_BMPDATA->m_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;
}
void wxBitmap::SetPixmap( GdkPixmap *pixmap )
{
+ if (!pixmap)
+ return;
+
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);
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)
{
- delete M_BMPDATA->m_mask;
- M_BMPDATA->m_mask = new wxMask;
+ GdkPixmap** pmask = NULL;
+ if (gdk_pixbuf_get_has_alpha(M_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;
+ }
gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
&M_BMPDATA->m_pixmap,
- &M_BMPDATA->m_mask->m_bitmap,
- 128 /*threshold*/);
+ pmask,
+ 0x80 /* alpha threshold */);
}
return M_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;
}
GdkPixbuf *wxBitmap::GetPixbuf() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
if (M_BMPDATA->m_pixbuf == NULL)
{
+
int width = GetWidth();
int height = GetHeight();
- // always create the alpha channel so raw bitmap access will work
- // correctly
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, // GetMask() != NULL,
+ 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);
-
+ 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)
{
bool wxBitmap::HasPixbuf() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
return M_BMPDATA->m_pixbuf != NULL;
}
-void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
+void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
{
+ if (!pixbuf)
+ return;
+
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);
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);
}
}
}
+#ifdef wxHAS_RAW_BITMAP
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- if (bpp != 32)
- return NULL;
-
+ void* bits = NULL;
GdkPixbuf *pixbuf = GetPixbuf();
- if (!pixbuf)
- return NULL;
-
- if (!gdk_pixbuf_get_has_alpha( pixbuf ))
- return NULL;
+ const bool hasAlpha = HasAlpha();
-#if 0
- if (gdk_pixbuf_get_has_alpha( pixbuf ))
- wxPrintf( wxT("Has alpha, %d channels\n"), gdk_pixbuf_get_n_channels(pixbuf) );
- else
- wxPrintf( wxT("No alpha, %d channels.\n"), gdk_pixbuf_get_n_channels(pixbuf) );
-#endif
-
- data.m_height = gdk_pixbuf_get_height( pixbuf );
- data.m_width = gdk_pixbuf_get_width( pixbuf );
- data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
-
- return gdk_pixbuf_get_pixels( pixbuf );
+ // allow access if bpp is valid and matches existence of alpha
+ if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
+ {
+ data.m_height = gdk_pixbuf_get_height( pixbuf );
+ data.m_width = gdk_pixbuf_get_width( pixbuf );
+ data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
+ bits = gdk_pixbuf_get_pixels(pixbuf);
+ }
+ return bits;
}
void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
{
}
-
+#endif // wxHAS_RAW_BITMAP
bool wxBitmap::HasAlpha() const
{
- return HasPixbuf();
-}
-
-void wxBitmap::UseAlpha()
-{
- GetPixbuf();
-}
-
-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
-
-wxBitmapHandler::~wxBitmapHandler()
-{
-}
-
-bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
- void * WXUNUSED(data),
- long WXUNUSED(type),
- int WXUNUSED(width),
- int WXUNUSED(height),
- int WXUNUSED(depth))
-{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
+ return m_refData != NULL && M_BMPDATA->m_pixbuf != NULL &&
+ gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
}
-bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- long WXUNUSED(flags),
- int WXUNUSED(desiredWidth),
- int WXUNUSED(desiredHeight))
+wxGDIRefData* wxBitmap::CreateGDIRefData() const
{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
+ return new wxBitmapRefData;
}
-bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- int WXUNUSED(type),
- const wxPalette * WXUNUSED(palette))
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
{
- wxFAIL_MSG( _T("not implemented") );
+ const wxBitmapRefData* oldRef = 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;
+ 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<GdkGC> 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<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);
+ }
+#if wxUSE_PALETTE
+ // implement this if SetPalette is ever implemented
+ wxASSERT(oldRef->m_palette == NULL);
+#endif
- return false;
+ return newRef;
}
/* static */ void wxBitmap::InitStandardHandlers()
projects / wxWidgets.git / blobdiff