#include "wx/icon.h"
#include "wx/filefn.h"
#include "wx/image.h"
+#include "wx/dcmemory.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+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
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;
//-----------------------------------------------------------------------------
// wxMask
wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, colour );
}
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex );
}
wxMask::wxMask( const wxBitmap& bitmap )
{
+ m_bitmap = (GdkBitmap *) NULL;
Create( bitmap );
}
wxMask::~wxMask()
{
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+ if (m_bitmap)
+ gdk_bitmap_unref( m_bitmap );
}
-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
- const wxColour& WXUNUSED(colour) )
+bool wxMask::Create( const wxBitmap& bitmap,
+ const wxColour& colour )
{
if (m_bitmap)
{
m_bitmap = (GdkBitmap*) NULL;
}
- wxFAIL_MSG( wxT("TODO") );
+ wxImage image( bitmap );
+ if (!image.Ok()) return FALSE;
- return FALSE;
+ m_bitmap = gdk_pixmap_new( wxRootWindow->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();
+
+ GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+ wxASSERT( visual );
+
+ 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;
+ }
+ if (bpp == 16)
+ {
+ red = red & 0xf8;
+ green = green & 0xfc;
+ blue = blue & 0xf8;
+ }
+
+ 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++)
+ {
+ int start_x = -1;
+ int i;
+ for (i = 0; i < image.GetWidth(); i++)
+ {
+ 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;
+ }
+ if (start_x != -1)
+ gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+ }
+
+ gdk_gc_unref( gc );
+
+ return TRUE;
}
bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
- m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
+ m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
if (!m_bitmap) return FALSE;
GdkGC *gc = gdk_gc_new( m_bitmap );
- gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+ gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
gdk_gc_unref( gc );
class wxBitmapRefData: public wxObjectRefData
{
public:
- wxBitmapRefData();
- ~wxBitmapRefData();
-
- GdkPixmap *m_pixmap;
- GdkBitmap *m_bitmap;
- wxMask *m_mask;
- int m_width;
- int m_height;
- int m_bpp;
- wxPalette *m_palette;
+ wxBitmapRefData();
+ ~wxBitmapRefData();
+
+ GdkPixmap *m_pixmap;
+ GdkBitmap *m_bitmap;
+ wxMask *m_mask;
+ int m_width;
+ int m_height;
+ int m_bpp;
+ wxPalette *m_palette;
};
wxBitmapRefData::wxBitmapRefData()
wxBitmap::wxBitmap( int width, int height, int depth )
{
- wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
+ Create( width, height, depth );
- GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
- if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
- wxCHECK_RET( (depth == gdk_window_get_visual( parent )->depth) ||
- (depth == 1), wxT("invalid bitmap depth") )
+bool wxBitmap::Create( int width, int height, int depth )
+{
+ UnRef();
+
+ wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+
+ GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+ wxASSERT( visual );
+
+ 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_height = height;
if (depth == 1)
{
- M_BMPDATA->m_bitmap = gdk_pixmap_new( parent, width, height, 1 );
+ M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
M_BMPDATA->m_bpp = 1;
}
else
{
- M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth );
- M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
+ M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
+ M_BMPDATA->m_bpp = visual->depth;
}
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+ return Ok();
}
-
-wxBitmap::wxBitmap( const char **bits )
+bool wxBitmap::CreateFromXpm( const char **bits )
{
- wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
+ wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+ GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+ wxASSERT( visual );
+
m_refData = new wxBitmapRefData();
GdkBitmap *mask = (GdkBitmap*) NULL;
- GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+ M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, (gchar **) bits );
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
-
- gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
- M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ?
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::wxBitmap( char **bits )
-{
- wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
-
- m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = (GdkBitmap*) NULL;
- GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
-
- wxCHECK_RET( M_BMPDATA->m_pixmap, wxT("couldn't create pixmap") );
+ wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
if (mask)
{
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
- M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ?
+ M_BMPDATA->m_bpp = visual->depth; // ?
+
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+
+ return TRUE;
}
wxBitmap::wxBitmap( const wxBitmap& bmp )
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_bitmap =
- gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
+ gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
M_BMPDATA->m_width = width;
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
return *this;
}
-bool wxBitmap::operator == ( const wxBitmap& bmp )
+bool wxBitmap::operator == ( const wxBitmap& bmp ) const
{
return m_refData == bmp.m_refData;
}
-bool wxBitmap::operator != ( const wxBitmap& bmp )
+bool wxBitmap::operator != ( const wxBitmap& bmp ) const
{
return m_refData != bmp.m_refData;
}
M_BMPDATA->m_mask = mask;
}
+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( rect.width, rect.height, M_BMPDATA->m_bpp );
+ wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+ 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() );
+ gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+ gdk_gc_destroy( gc );
+ }
+
+ if (GetMask())
+ {
+ wxMask *mask = new wxMask;
+ mask->m_bitmap = gdk_pixmap_new( wxRootWindow->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 );
+ }
+
+ return ret;
+}
+
bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
{
wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
- if (type == wxBITMAP_TYPE_PNG)
+ // Try to save the bitmap via wxImage handlers:
{
wxImage image( *this );
if (image.Ok()) return image.SaveFile( name, type );
if (!wxFileExists(name)) return FALSE;
+ GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+ wxASSERT( visual );
+
if (type == wxBITMAP_TYPE_XPM)
{
m_refData = new wxBitmapRefData();
GdkBitmap *mask = (GdkBitmap*) NULL;
- GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name.fn_str() );
+ M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() );
if (mask)
{
}
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
- M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
+
+ M_BMPDATA->m_bpp = visual->depth;
}
- else if (type == wxBITMAP_TYPE_PNG)
+ else // try if wxImage can load it
{
wxImage image;
- image.LoadFile( name, type );
+ if (!image.LoadFile( name, type )) return FALSE;
if (image.Ok()) *this = image.ConvertToBitmap();
+ else return FALSE;
}
- else if (type == wxBITMAP_TYPE_BMP)
- {
- wxImage image;
- image.LoadFile( name, type );
- if (image.Ok()) *this = image.ConvertToBitmap();
- }
- else
- return FALSE;
return TRUE;
}
M_BMPDATA->m_pixmap = pixmap;
}
+void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+{
+ if (!m_refData) m_refData = new wxBitmapRefData();
+
+ M_BMPDATA->m_bitmap = bitmap;
+}
+
GdkPixmap *wxBitmap::GetPixmap() const
{
wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
projects / wxWidgets.git / blobdiff