/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.cpp
+// Name: src/gtk/bitmap.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/palette.h"
#include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/filefn.h"
-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/app.h"
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
+#ifndef WX_PRECOMP
+ #include "wx/icon.h"
+ #include "wx/image.h"
+ #include "wx/colour.h"
#endif
-extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
- GdkGC *gc,
- GdkDrawable *src,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height);
+#include "wx/rawbmp.h"
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#include "wx/gtk/private/object.h"
+
+#include <gtk/gtk.h>
extern GtkWidget *wxGetRootWindow();
+static void PixmapToPixbuf(GdkPixmap* pixmap, GdkPixbuf* pixbuf, int w, int h)
+{
+ gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
+ if (gdk_drawable_get_depth(pixmap) == 1)
+ {
+ // invert to match XBM convention
+ guchar* p = gdk_pixbuf_get_pixels(pixbuf);
+ const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * inc;
+ for (int y = h; y; y--, p += rowpad)
+ for (int x = w; x; x--, p += inc)
+ {
+ // pixels are either (0,0,0) or (0xff,0xff,0xff)
+ p[0] = ~p[0];
+ p[1] = ~p[1];
+ p[2] = ~p[2];
+ }
+ }
+}
+
+static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h)
+{
+ GdkPixbuf* mask_pixbuf = gdk_pixbuf_get_from_drawable(
+ NULL, mask, NULL, 0, 0, 0, 0, w, h);
+ guchar* p = gdk_pixbuf_get_pixels(pixbuf) + 3;
+ const guchar* mask_data = gdk_pixbuf_get_pixels(mask_pixbuf);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * 4;
+ const int mask_rowpad = gdk_pixbuf_get_rowstride(mask_pixbuf) - w * 3;
+ for (int y = h; y; y--, p += rowpad, mask_data += mask_rowpad)
+ {
+ for (int x = w; x; x--, p += 4, mask_data += 3)
+ {
+ *p = 255;
+ // no need to test all 3 components,
+ // pixels are either (0,0,0) or (0xff,0xff,0xff)
+ if (mask_data[0] == 0)
+ *p = 0;
+ }
+ }
+ g_object_unref(mask_pixbuf);
+}
+
//-----------------------------------------------------------------------------
// wxMask
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase)
wxMask::wxMask()
{
- m_bitmap = (GdkBitmap *) NULL;
+ m_bitmap = NULL;
+}
+
+wxMask::wxMask(const wxMask& mask)
+{
+ if ( !mask.m_bitmap )
+ {
+ m_bitmap = NULL;
+ return;
+ }
+
+ // create a copy of an existing mask
+ gint w, h;
+ gdk_drawable_get_size(mask.m_bitmap, &w, &h);
+ m_bitmap = gdk_pixmap_new(mask.m_bitmap, w, h, 1);
+
+ wxGtkObject<GdkGC> gc(gdk_gc_new(m_bitmap));
+ gdk_draw_drawable(m_bitmap, gc, mask.m_bitmap, 0, 0, 0, 0, -1, -1);
}
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()
{
if (m_bitmap)
- gdk_bitmap_unref( m_bitmap );
+ g_object_unref (m_bitmap);
}
-bool wxMask::Create( const wxBitmap& bitmap,
- const wxColour& colour )
+void wxMask::FreeData()
{
if (m_bitmap)
{
- gdk_bitmap_unref( m_bitmap );
- m_bitmap = (GdkBitmap*) NULL;
+ g_object_unref (m_bitmap);
+ m_bitmap = NULL;
}
+}
- wxImage image( bitmap );
- if (!image.Ok()) return FALSE;
-
- m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
- GdkGC *gc = gdk_gc_new( m_bitmap );
-
- GdkColor color;
- color.red = 65000;
- color.green = 65000;
- color.blue = 65000;
- color.pixel = 1;
- gdk_gc_set_foreground( gc, &color );
- gdk_gc_set_fill( gc, GDK_SOLID );
- gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
-
- unsigned char *data = image.GetData();
- int index = 0;
-
- unsigned char red = colour.Red();
- unsigned char green = colour.Green();
- unsigned char blue = colour.Blue();
+bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
+{
+ const int w = bitmap.GetWidth();
+ const int h = bitmap.GetHeight();
- GdkVisual *visual = wxTheApp->GetGdkVisual();
+ // create mask as XBM format bitmap
- int bpp = visual->depth;
- if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
- if (bpp == 15)
- {
- red = red & 0xf8;
- green = green & 0xf8;
- blue = blue & 0xf8;
- } else
- if (bpp == 16)
- {
- red = red & 0xf8;
- green = green & 0xfc;
- blue = blue & 0xf8;
- } else
- if (bpp == 12)
+ // one bit per pixel, each row starts on a byte boundary
+ const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+ wxByte* out = new wxByte[out_size];
+ // set bits are unmasked
+ memset(out, 0xff, out_size);
+ unsigned bit_index = 0;
+ if (bitmap.HasPixbuf())
{
- red = red & 0xf0;
- green = green & 0xf0;
- blue = blue & 0xf0;
+ const wxByte r_mask = colour.Red();
+ const wxByte g_mask = colour.Green();
+ const wxByte b_mask = colour.Blue();
+ GdkPixbuf* pixbuf = bitmap.GetPixbuf();
+ const wxByte* in = gdk_pixbuf_get_pixels(pixbuf);
+ const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0);
+ const int rowpadding = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
+ for (int y = 0; y < h; y++, in += rowpadding)
+ {
+ for (int x = 0; x < w; x++, in += inc, bit_index++)
+ if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ // move index to next byte boundary
+ bit_index = (bit_index + 7) & ~7u;
+ }
}
-
- color.red = 0;
- color.green = 0;
- color.blue = 0;
- color.pixel = 0;
- gdk_gc_set_foreground( gc, &color );
-
- for (int j = 0; j < image.GetHeight(); j++)
+ else
{
- int start_x = -1;
- int i;
- for (i = 0; i < image.GetWidth(); i++)
+ GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
+ GdkColormap* colormap = gdk_image_get_colormap(image);
+ guint32 mask_pixel;
+ if (colormap == NULL)
+ // mono bitmap, white is pixel value 0
+ mask_pixel = guint32(colour.Red() != 255 || colour.Green() != 255 || colour.Blue() != 255);
+ else
{
- if ((data[index] == red) &&
- (data[index+1] == green) &&
- (data[index+2] == blue))
- {
- if (start_x == -1)
- start_x = i;
- }
- else
- {
- if (start_x != -1)
- {
- gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
- start_x = -1;
- }
- }
- index += 3;
+ wxColor c(colour);
+ c.CalcPixel(colormap);
+ mask_pixel = c.GetPixel();
}
- if (start_x != -1)
- gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++, bit_index++)
+ if (gdk_image_get_pixel(image, x, y) == mask_pixel)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
+ }
+ g_object_unref(image);
}
-
- gdk_gc_unref( gc );
-
- return TRUE;
+ m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h);
+ delete[] out;
+ return true;
}
-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") );
+ if (!bitmap.IsOk()) return false;
- pal->GetRGB(paletteIndex, &r, &g, &b);
-
- return Create(bitmap, wxColour(r, g, b));
-}
-
-bool wxMask::Create( const wxBitmap& bitmap )
-{
- if (m_bitmap)
- {
- gdk_bitmap_unref( m_bitmap );
- m_bitmap = (GdkBitmap*) NULL;
- }
-
- if (!bitmap.Ok()) return FALSE;
-
- wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
+ wxCHECK_MSG( bitmap.GetDepth() == 1, 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;
-
- GdkGC *gc = gdk_gc_new( m_bitmap );
+ if (!m_bitmap) return false;
- gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+ 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());
- gdk_gc_unref( gc );
-
- return TRUE;
+ return true;
}
GdkBitmap *wxMask::GetBitmap() const
}
//-----------------------------------------------------------------------------
-// wxBitmap
+// wxBitmapRefData
//-----------------------------------------------------------------------------
-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData
{
public:
- wxBitmapRefData();
- ~wxBitmapRefData();
+ wxBitmapRefData(int width, int height, int depth);
+ virtual ~wxBitmapRefData();
+
+ virtual bool IsOk() const;
GdkPixmap *m_pixmap;
- GdkBitmap *m_bitmap;
+ GdkPixbuf *m_pixbuf;
wxMask *m_mask;
int m_width;
int m_height;
int m_bpp;
- wxPalette *m_palette;
+ bool m_alphaRequested;
};
-wxBitmapRefData::wxBitmapRefData()
+wxBitmapRefData::wxBitmapRefData(int width, int height, int depth)
{
- m_pixmap = (GdkPixmap *) NULL;
- m_bitmap = (GdkBitmap *) NULL;
- m_mask = (wxMask *) NULL;
- m_width = 0;
- m_height = 0;
- m_bpp = 0;
- m_palette = (wxPalette *) NULL;
+ m_pixmap = NULL;
+ m_pixbuf = NULL;
+ m_mask = NULL;
+ m_width = width;
+ m_height = height;
+ m_bpp = depth;
+ if (m_bpp < 0)
+ m_bpp = gdk_drawable_get_depth(wxGetRootWindow()->window);
+ m_alphaRequested = depth == 32;
}
wxBitmapRefData::~wxBitmapRefData()
{
- if (m_pixmap) gdk_pixmap_unref( m_pixmap );
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
- if (m_mask) delete m_mask;
- if (m_palette) delete m_palette;
+ if (m_pixmap)
+ g_object_unref (m_pixmap);
+ if (m_pixbuf)
+ g_object_unref (m_pixbuf);
+ delete m_mask;
+}
+
+bool wxBitmapRefData::IsOk() const
+{
+ return m_bpp != 0;
}
+//-----------------------------------------------------------------------------
+// wxBitmap
//-----------------------------------------------------------------------------
-#define M_BMPDATA ((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 )
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
- Create( width, height, depth );
+ wxASSERT(depth == 1);
+ if (width > 0 && height > 0 && depth == 1)
+ {
+ SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
+ }
}
-bool wxBitmap::Create( int width, int height, int depth )
+wxBitmap::wxBitmap(const char* const* bits)
{
- UnRef();
-
- wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
+ wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
- if (depth == -1) depth = visual->depth;
+ GdkBitmap* mask = NULL;
+ SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
+ if (!M_BMPDATA)
+ return;
- 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
+ if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
{
- M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
- M_BMPDATA->m_bpp = visual->depth;
+ M_BMPDATA->m_mask = new wxMask;
+ M_BMPDATA->m_mask->m_bitmap = mask;
}
+}
- return Ok();
+wxBitmap::~wxBitmap()
+{
}
-bool wxBitmap::CreateFromXpm( const char **bits )
+bool wxBitmap::Create( int width, int height, int depth )
{
UnRef();
+ wxCHECK_MSG(width >= 0 && height >= 0, false, "invalid bitmap size");
+ m_refData = new wxBitmapRefData(width, height, depth);
+ return true;
+}
- wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = (GdkBitmap*) NULL;
-
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
+#if wxUSE_IMAGE
- wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+ UnRef();
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
+ wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
+ wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
- gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+ if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+ return false;
- M_BMPDATA->m_bpp = visual->depth; // ?
+ // create pixbuf if image has alpha and requested depth is compatible
+ if (image.HasAlpha() && (depth == -1 || depth == 32))
+ return CreateFromImageAsPixbuf(image);
- return TRUE;
+ // otherwise create pixmap, if alpha is present it will be converted to mask
+ return CreateFromImageAsPixmap(image, depth);
}
-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+bool wxBitmap::CreateFromImageAsPixmap(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") )
-
- m_refData = new wxBitmapRefData();
-
- // ------
- // convertion to mono bitmap:
- // ------
+ const int w = image.GetWidth();
+ const int h = image.GetHeight();
if (depth == 1)
{
- int width = image.GetWidth();
- int height = image.GetHeight();
-
- SetHeight( height );
- SetWidth( width );
-
- SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
- SetDepth( 1 );
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- // Create picture image
-
- unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- GdkImage *data_image =
- gdk_image_new_bitmap( visual, data_data, width, height );
-
- // Create mask image
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (image.HasMask())
+ // create XBM format bitmap
+
+ // one bit per pixel, each row starts on a byte boundary
+ const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+ wxByte* out = new wxByte[out_size];
+ // set bits are black
+ memset(out, 0xff, out_size);
+ const wxByte* in = image.GetData();
+ unsigned bit_index = 0;
+ for (int y = 0; y < h; y++)
{
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-
- SetMask( mask );
+ for (int x = 0; x < w; x++, in += 3, bit_index++)
+ if (in[0] == 255 && in[1] == 255 && in[2] == 255)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ // move index to next byte boundary
+ bit_index = (bit_index + 7) & ~7u;
}
+ SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
+ delete[] out;
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
-
- unsigned char* data = image.GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
- {
- for (int x = 0; x < width; x++)
- {
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- if (image.HasMask())
- {
- if ((r == r_mask) && (b == b_mask) && (g == g_mask))
- gdk_image_put_pixel( mask_image, x, y, 1 );
- else
- gdk_image_put_pixel( mask_image, x, y, 0 );
- }
-
- if ((r == 255) && (b == 255) && (g == 255))
- gdk_image_put_pixel( data_image, x, y, 1 );
- else
- gdk_image_put_pixel( data_image, x, y, 0 );
-
- } // for
- } // for
-
- // Blit picture
-
- GdkGC *data_gc = gdk_gc_new( GetBitmap() );
-
- gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
- gdk_image_destroy( data_image );
- gdk_gc_unref( data_gc );
-
- // Blit mask
-
- if (image.HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
- gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
- gdk_image_destroy( mask_image );
- gdk_gc_unref( mask_gc );
- }
+ if (!M_BMPDATA) // SetPixmap may have failed
+ return false;
}
-
- // ------
- // convertion to colour bitmap:
- // ------
else
{
- int width = image.GetWidth();
- int height = image.GetHeight();
-
- SetHeight( height );
- SetWidth( width );
-
- SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- int bpp = visual->depth;
-
- SetDepth( bpp );
+ SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
+ 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);
+ }
- if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
- if (bpp < 8) bpp = 8;
+ const wxByte* alpha = image.GetAlpha();
+ if (alpha != NULL || image.HasMask())
+ {
+ // create mask as XBM format bitmap
- // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
- // visuals are not supported by GDK so we do these ourselves, too.
- // 15-bit and 16-bit should actually work and 24-bit certainly does.
-#ifdef __sgi
- if (!image.HasMask() && (bpp > 16))
-#else
- if (!image.HasMask() && (bpp > 12))
-#endif
+ const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+ wxByte* out = new wxByte[out_size];
+ memset(out, 0xff, out_size);
+ unsigned bit_index = 0;
+ if (alpha != NULL)
{
- static bool s_hasInitialized = FALSE;
-
- if (!s_hasInitialized)
+ for (int y = 0; y < h; y++)
{
- gdk_rgb_init();
- s_hasInitialized = TRUE;
+ for (int x = 0; x < w; x++, bit_index++)
+ if (*alpha++ < wxIMAGE_ALPHA_THRESHOLD)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
}
-
- GdkGC *gc = gdk_gc_new( GetPixmap() );
-
- gdk_draw_rgb_image( GetPixmap(),
- gc,
- 0, 0,
- width, height,
- GDK_RGB_DITHER_NONE,
- image.GetData(),
- width*3 );
-
- gdk_gc_unref( gc );
- return TRUE;
}
-
- // Create picture image
-
- GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
-
- // Create mask image
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (image.HasMask())
+ else
{
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-
- SetMask( mask );
- }
-
- // Render
-
- enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
- byte_order b_o = RGB;
-
- if (bpp > 8)
- {
- if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB;
- else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RBG;
- else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG;
- else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
- else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask)) b_o = GRB;
- else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask)) b_o = GBR;
- }
-
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
-
- unsigned char* data = image.GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
- {
- for (int x = 0; x < width; x++)
+ const wxByte r_mask = image.GetMaskRed();
+ const wxByte g_mask = image.GetMaskGreen();
+ const wxByte b_mask = image.GetMaskBlue();
+ const wxByte* in = image.GetData();
+ for (int y = 0; y < h; y++)
{
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- if (image.HasMask())
- {
- if ((r == r_mask) && (b == b_mask) && (g == g_mask))
- gdk_image_put_pixel( mask_image, x, y, 1 );
- else
- gdk_image_put_pixel( mask_image, x, y, 0 );
- }
-
- switch (bpp)
- {
- case 8:
- {
- int pixel = -1;
- if (wxTheApp->m_colorCube)
- {
- pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
- }
- else
- {
- GdkColormap *cmap = gtk_widget_get_default_colormap();
- GdkColor *colors = cmap->colors;
- int max = 3 * (65536);
-
- for (int i = 0; i < cmap->size; i++)
- {
- int rdiff = (r << 8) - colors[i].red;
- int gdiff = (g << 8) - colors[i].green;
- int bdiff = (b << 8) - colors[i].blue;
- int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
- if (sum < max) { pixel = i; max = sum; }
- }
- }
-
- gdk_image_put_pixel( data_image, x, y, pixel );
-
- break;
- }
- case 12: // SGI only
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break;
- case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break;
- case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break;
- case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break;
- case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break;
- case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 15:
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
- case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
- case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
- case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
- case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
- case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 16:
- {
- // I actually don't know if for 16-bit displays, it is alway the green
- // component or the second component which has 6 bits.
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
- case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
- case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
- case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
- case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
- case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 32:
- case 24:
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = (r << 16) | (g << 8) | b; break;
- case RBG: pixel = (r << 16) | (b << 8) | g; break;
- case BRG: pixel = (b << 16) | (r << 8) | g; break;
- case BGR: pixel = (b << 16) | (g << 8) | r; break;
- case GRB: pixel = (g << 16) | (r << 8) | b; break;
- case GBR: pixel = (g << 16) | (b << 8) | r; break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- }
- default: break;
- }
- } // for
- } // for
+ for (int x = 0; x < w; x++, in += 3, bit_index++)
+ if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
+ }
+ }
+ wxMask* mask = new wxMask;
+ mask->m_bitmap = gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h);
+ SetMask(mask);
+ delete[] out;
+ }
+ return IsOk();
+}
- // Blit picture
+bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
+{
+ wxASSERT(image.HasAlpha());
- GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+ int width = image.GetWidth();
+ int height = image.GetHeight();
- gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+ Create(width, height, 32);
+ GdkPixbuf* pixbuf = GetPixbuf();
+ if (!pixbuf)
+ return false;
- gdk_image_destroy( data_image );
- gdk_gc_unref( data_gc );
+ // Copy the data:
+ const unsigned char* in = image.GetData();
+ unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+ unsigned char *alpha = image.GetAlpha();
- // Blit mask
+ int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
- if (image.HasMask())
+ for (int y = 0; y < height; y++, out += rowpad)
+ {
+ for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
{
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
- gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
- gdk_image_destroy( mask_image );
- gdk_gc_unref( mask_gc );
+ out[0] = in[0];
+ out[1] = in[1];
+ out[2] = in[2];
+ out[3] = *alpha;
}
}
- return TRUE;
+ return true;
}
wxImage wxBitmap::ConvertToImage() const
{
- wxImage image;
-
- wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
-
- GdkImage *gdk_image = (GdkImage*) NULL;
- if (GetPixmap())
- {
- 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") );
- }
+ wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
- wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
-
- image.Create( GetWidth(), GetHeight() );
- char unsigned *data = image.GetData();
+ const int w = GetWidth();
+ const int h = GetHeight();
+ wxImage image(w, h, false);
+ unsigned char *data = image.GetData();
- if (!data)
- {
- gdk_image_destroy( gdk_image );
- wxFAIL_MSG( wxT("couldn't create image") );
- return wxNullImage;
- }
+ wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
- GdkImage *gdk_image_mask = (GdkImage*) NULL;
- if (GetMask())
+ // prefer pixbuf if available, it will preserve alpha and should be quicker
+ if (HasPixbuf())
{
- gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
- 0, 0,
- GetWidth(), GetHeight() );
-
- image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable
- }
-
- 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;
+ GdkPixbuf *pixbuf = GetPixbuf();
+ 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;
+ const int inc = 3 + int(alpha != NULL);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
- 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);
+ for (int y = 0; y < h; y++, in += rowpad)
+ {
+ for (int x = 0; x < w; x++, in += inc, out += 3)
+ {
+ out[0] = in[0];
+ out[1] = in[1];
+ out[2] = in[2];
+ if (alpha != NULL)
+ *alpha++ = in[3];
+ }
+ }
}
- if (GetBitmap())
+ else
{
- bpp = 1;
- }
-
+ GdkPixmap* pixmap = GetPixmap();
+ GdkPixmap* pixmap_invert = NULL;
+ if (GetDepth() == 1)
+ {
+ // mono bitmaps are inverted, i.e. 0 is white
+ pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
+ 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);
+ pixmap = pixmap_invert;
+ }
+ // create a pixbuf which shares data with the wxImage
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
+ data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);
- GdkColormap *cmap = gtk_widget_get_default_colormap();
+ gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
- long pos = 0;
- for (int j = 0; j < GetHeight(); j++)
+ g_object_unref(pixbuf);
+ if (pixmap_invert != NULL)
+ g_object_unref(pixmap_invert);
+ }
+ // convert mask, unless there is already alpha
+ if (GetMask() && !image.HasAlpha())
{
- for (int i = 0; i < GetWidth(); i++)
+ // 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);
+
+ for (int y = 0; y < h; y++)
{
- wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
- if (bpp == 1)
+ for (int x = 0; x < w; x++, data += 3)
{
- if (pixel == 0)
- {
- data[pos] = 0;
- data[pos+1] = 0;
- data[pos+2] = 0;
- }
- else
+ if (gdk_image_get_pixel(image_mask, x, y) == 0)
{
- data[pos] = 255;
- data[pos+1] = 255;
- data[pos+2] = 255;
+ data[0] = MASK_RED;
+ data[1] = MASK_GREEN;
+ data[2] = MASK_BLUE;
}
- }
- 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)
- {
- int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
- if (mask_pixel == 0)
+ else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
{
- data[pos] = 16;
- data[pos+1] = 16;
- data[pos+2] = 16;
+ // we have to fudge the colour a bit to prevent
+ // this pixel from appearing transparent
+ data[2] = MASK_BLUE_REPLACEMENT;
}
}
-
- pos += 3;
}
+ g_object_unref(image_mask);
}
- gdk_image_destroy( gdk_image );
- if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-
return image;
}
-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
- Ref( bmp );
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
-{
- LoadFile( filename, type );
-}
-
-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_bitmap =
- gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
- M_BMPDATA->m_width = width;
- M_BMPDATA->m_height = height;
- M_BMPDATA->m_bpp = 1;
-
- wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
-}
-
-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);
-}
+#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 TRUE;
+ return IsOk();
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{
- 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),
- wxNullBitmap, wxT("invalid bitmap or bitmap region") );
+ wxBitmap ret;
- wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
- wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+ wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap"));
- if (ret.GetPixmap())
+ const int w = rect.width;
+ const int h = rect.height;
+ const wxBitmapRefData* bmpData = M_BMPDATA;
+
+ wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
+ rect.x + w <= bmpData->m_width &&
+ rect.y + h <= bmpData->m_height,
+ ret, wxT("invalid bitmap region"));
+
+ wxBitmapRefData* newRef = new wxBitmapRefData(*bmpData);
+ ret.m_refData = newRef;
+ newRef->m_width = w;
+ newRef->m_height = h;
+
+ if (bmpData->m_pixbuf)
{
- 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 );
+ GdkPixbuf* pixbuf =
+ gdk_pixbuf_new_subpixbuf(bmpData->m_pixbuf, rect.x, rect.y, w, h);
+ newRef->m_pixbuf = gdk_pixbuf_copy(pixbuf);
+ g_object_unref(pixbuf);
}
- else
+ if (bmpData->m_pixmap)
{
- GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
- gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
- gdk_gc_destroy( gc );
+ newRef->m_pixmap = gdk_pixmap_new(bmpData->m_pixmap, w, h, -1);
+ GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+ gdk_draw_drawable(
+ newRef->m_pixmap, gc, bmpData->m_pixmap, rect.x, rect.y, 0, 0, w, h);
+ g_object_unref(gc);
}
-
- if (GetMask())
+ newRef->m_mask = NULL;
+ if (bmpData->m_mask && bmpData->m_mask->m_bitmap)
{
- wxMask *mask = new wxMask;
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
-
- GdkGC *gc = gdk_gc_new( mask->m_bitmap );
- gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
- gdk_gc_destroy( gc );
-
- ret.SetMask( mask );
+ GdkPixmap* sub_mask = gdk_pixmap_new(bmpData->m_mask->m_bitmap, w, h, 1);
+ newRef->m_mask = new wxMask;
+ newRef->m_mask->m_bitmap = sub_mask;
+ GdkGC* gc = gdk_gc_new(sub_mask);
+ gdk_draw_drawable(
+ sub_mask, gc, bmpData->m_mask->m_bitmap, rect.x, rect.y, 0, 0, w, h);
+ g_object_unref(gc);
}
return ret;
}
-bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
+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") );
- // Try to save the bitmap via wxImage handlers:
+#if wxUSE_IMAGE
+ wxImage image = ConvertToImage();
+ if (image.IsOk() && image.SaveFile(name, type))
+ return true;
+#endif
+ const char* type_name = NULL;
+ switch (type)
{
- wxImage image( *this );
- if (image.Ok()) return image.SaveFile( name, type );
+ case wxBITMAP_TYPE_BMP: type_name = "bmp"; break;
+ case wxBITMAP_TYPE_ICO: type_name = "ico"; break;
+ case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break;
+ case wxBITMAP_TYPE_PNG: type_name = "png"; break;
+ default: break;
}
+ return type_name &&
+ gdk_pixbuf_save(GetPixbuf(), name.fn_str(), type_name, NULL, NULL);
+}
- return FALSE;
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
+{
+#if wxUSE_IMAGE
+ wxImage image;
+ if (image.LoadFile(name, type) && image.IsOk())
+ *this = wxBitmap(image);
+ else
+#endif
+ {
+ UnRef();
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(name.fn_str(), NULL);
+ if (pixbuf)
+ SetPixbuf(pixbuf);
+ }
+
+ return IsOk();
}
-bool wxBitmap::LoadFile( const wxString &name, int type )
+#if wxUSE_PALETTE
+wxPalette *wxBitmap::GetPalette() const
{
- UnRef();
+ return NULL;
+}
+
+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+ // TODO
+}
+#endif // wxUSE_PALETTE
- if (!wxFileExists(name)) return FALSE;
+void wxBitmap::SetHeight( int height )
+{
+ AllocExclusive();
+ M_BMPDATA->m_height = height;
+}
- GdkVisual *visual = wxTheApp->GetGdkVisual();
+void wxBitmap::SetWidth( int width )
+{
+ AllocExclusive();
+ M_BMPDATA->m_width = width;
+}
- if (type == wxBITMAP_TYPE_XPM)
- {
- m_refData = new wxBitmapRefData();
+void wxBitmap::SetDepth( int depth )
+{
+ AllocExclusive();
+ M_BMPDATA->m_bpp = depth;
+}
+
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
+{
+ UnRef();
- GdkBitmap *mask = (GdkBitmap*) NULL;
+ if (!pixmap)
+ return;
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );
+ int w, h;
+ gdk_drawable_get_size(pixmap, &w, &h);
+ wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, 0);
+ m_refData = bmpData;
+ bmpData->m_pixmap = pixmap;
+ bmpData->m_bpp = gdk_drawable_get_depth(pixmap);
+}
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
+GdkPixmap *wxBitmap::GetPixmap() const
+{
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
- gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ if (bmpData->m_pixmap)
+ return bmpData->m_pixmap;
- M_BMPDATA->m_bpp = visual->depth;
+ if (bmpData->m_pixbuf)
+ {
+ GdkPixmap** mask_pixmap = NULL;
+ if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))
+ {
+ // make new mask from alpha
+ delete bmpData->m_mask;
+ bmpData->m_mask = new wxMask;
+ mask_pixmap = &bmpData->m_mask->m_bitmap;
+ }
+ gdk_pixbuf_render_pixmap_and_mask(
+ bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128);
}
- else // try if wxImage can load it
+ else
{
- wxImage image;
- if (!image.LoadFile( name, type )) return FALSE;
- if (image.Ok()) *this = image.ConvertToBitmap();
- else return FALSE;
+ bmpData->m_pixmap = gdk_pixmap_new(wxGetRootWindow()->window,
+ bmpData->m_width, bmpData->m_height, bmpData->m_bpp == 1 ? 1 : -1);
}
-
- return TRUE;
+ return bmpData->m_pixmap;
}
-wxPalette *wxBitmap::GetPalette() const
+bool wxBitmap::HasPixmap() const
{
- if (!Ok()) return (wxPalette *) NULL;
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
- return M_BMPDATA->m_palette;
+ return M_BMPDATA->m_pixmap != NULL;
}
-void wxBitmap::SetHeight( int height )
+GdkPixbuf *wxBitmap::GetPixbuf() const
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
- M_BMPDATA->m_height = height;
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ if (bmpData->m_pixbuf)
+ return bmpData->m_pixbuf;
+
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ GdkPixmap* mask = NULL;
+ if (bmpData->m_mask)
+ mask = bmpData->m_mask->m_bitmap;
+ const bool useAlpha = bmpData->m_alphaRequested || mask;
+ bmpData->m_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, useAlpha, 8, w, h);
+ if (bmpData->m_pixmap)
+ PixmapToPixbuf(bmpData->m_pixmap, bmpData->m_pixbuf, w, h);
+ if (mask)
+ MaskToAlpha(mask, bmpData->m_pixbuf, w, h);
+ return bmpData->m_pixbuf;
}
-void wxBitmap::SetWidth( int width )
+bool wxBitmap::HasPixbuf() const
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
- M_BMPDATA->m_width = width;
+ return M_BMPDATA->m_pixbuf != NULL;
}
-void wxBitmap::SetDepth( int depth )
+void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf)
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ UnRef();
+
+ if (!pixbuf)
+ return;
- M_BMPDATA->m_bpp = depth;
+ int depth = -1;
+ if (gdk_pixbuf_get_has_alpha(pixbuf))
+ depth = 32;
+ m_refData = new wxBitmapRefData(
+ gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), depth);
+
+ M_BMPDATA->m_pixbuf = pixbuf;
}
-void wxBitmap::SetPixmap( GdkPixmap *pixmap )
+void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
{
- if (!m_refData) m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_pixmap = pixmap;
+ if (keep == Pixmap && HasPixbuf())
+ {
+ g_object_unref (M_BMPDATA->m_pixbuf);
+ M_BMPDATA->m_pixbuf = NULL;
+ }
+ if (keep == Pixbuf && HasPixmap())
+ {
+ g_object_unref (M_BMPDATA->m_pixmap);
+ M_BMPDATA->m_pixmap = NULL;
+ }
}
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+#ifdef wxHAS_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ void* bits = NULL;
+ GdkPixbuf *pixbuf = GetPixbuf();
+ const bool hasAlpha = HasAlpha();
- M_BMPDATA->m_bitmap = bitmap;
+ // 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;
}
-GdkPixmap *wxBitmap::GetPixmap() const
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
{
- wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+}
+#endif // wxHAS_RAW_BITMAP
- return M_BMPDATA->m_pixmap;
+bool wxBitmap::HasAlpha() const
+{
+ const wxBitmapRefData* bmpData = M_BMPDATA;
+ return bmpData && (bmpData->m_alphaRequested ||
+ (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)));
}
-GdkBitmap *wxBitmap::GetBitmap() const
+wxGDIRefData* wxBitmap::CreateGDIRefData() const
{
- wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
+ return new wxBitmapRefData(0, 0, 0);
+}
- return M_BMPDATA->m_bitmap;
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
+{
+ const wxBitmapRefData* oldRef = static_cast<const wxBitmapRefData*>(data);
+ wxBitmapRefData* newRef = new wxBitmapRefData(*oldRef);
+ 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(*oldRef->m_mask);
+ }
+
+ return newRef;
+}
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+ // TODO: Insert handler based on GdkPixbufs handler later
}
projects / wxWidgets.git / blobdiff