X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99c67c777b7d7a6f0ea74823bff7b9c40379b5fa..3112490359260018d5d90deea13f3eff9dbe9564:/src/gtk1/bitmap.cpp?ds=sidebyside diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 3e9ade68da..ed3595f860 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -14,9 +14,27 @@ #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/filefn.h" -#include "gdk/gdkprivate.h" -#include "gdk/gdkx.h" #include "wx/image.h" +#include "wx/dcmemory.h" + +#include +#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); + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern GtkWidget *wxRootWindow; //----------------------------------------------------------------------------- // wxMask @@ -29,24 +47,157 @@ wxMask::wxMask() m_bitmap = (GdkBitmap *) NULL; } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) ) +wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) { + m_bitmap = (GdkBitmap *) NULL; + Create( bitmap, colour ); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) ) +wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { + m_bitmap = (GdkBitmap *) NULL; + Create( bitmap, paletteIndex ); } -wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) ) +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 ); } -GdkBitmap *wxMask::GetBitmap(void) const +bool wxMask::Create( const wxBitmap& bitmap, + const wxColour& colour ) +{ + if (m_bitmap) + { + gdk_bitmap_unref( m_bitmap ); + m_bitmap = (GdkBitmap*) NULL; + } + + wxImage image( bitmap ); + if (!image.Ok()) 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), + int WXUNUSED(paletteIndex) ) +{ + if (m_bitmap) + { + gdk_bitmap_unref( m_bitmap ); + m_bitmap = (GdkBitmap*) NULL; + } + + wxFAIL_MSG( wxT("not implemented") ); + + return FALSE; +} + +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") ); + + 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_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() ); + + gdk_gc_unref( gc ); + + return TRUE; +} + +GdkBitmap *wxMask::GetBitmap() const { return m_bitmap; } @@ -58,16 +209,16 @@ GdkBitmap *wxMask::GetBitmap(void) const class wxBitmapRefData: public wxObjectRefData { public: - wxBitmapRefData(void); - ~wxBitmapRefData(void); - - 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() @@ -102,57 +253,56 @@ wxBitmap::wxBitmap() wxBitmap::wxBitmap( int width, int height, int depth ) { - wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" ) - wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" ) - - m_refData = new wxBitmapRefData(); - - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; - - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; + Create( width, height, depth ); if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } -wxBitmap::wxBitmap( const char **bits ) +bool wxBitmap::Create( int width, int height, int depth ) { - wxCHECK_RET( bits != NULL, "invalid bitmap data" ) + UnRef(); - m_refData = new wxBitmapRefData(); + wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); + wxASSERT( visual ); - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + if (depth == -1) depth = visual->depth; - if (mask) + 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_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; + 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( wxRootWindow->window, width, height, depth ); + M_BMPDATA->m_bpp = visual->depth; } - 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); + return Ok(); } - -wxBitmap::wxBitmap( char **bits ) +bool wxBitmap::CreateFromXpm( const char **bits ) { - wxCHECK_RET( bits != NULL, "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 ); - wxCHECK_RET( M_BMPDATA->m_pixmap, "couldn't create pixmap" ); + wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") ); if (mask) { @@ -162,8 +312,11 @@ wxBitmap::wxBitmap( char **bits ) 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 ) @@ -186,12 +339,12 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth 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; - wxCHECK_RET( M_BMPDATA->m_bitmap, "couldn't create bitmap" ); + wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } @@ -208,66 +361,104 @@ wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) 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; } -bool wxBitmap::Ok(void) const +bool wxBitmap::Ok() const { return (m_refData != NULL); } -int wxBitmap::GetHeight(void) const +int wxBitmap::GetHeight() const { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_height; } -int wxBitmap::GetWidth(void) const +int wxBitmap::GetWidth() const { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_width; } -int wxBitmap::GetDepth(void) const +int wxBitmap::GetDepth() const { - wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); + wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") ); return M_BMPDATA->m_bpp; } -wxMask *wxBitmap::GetMask(void) const +wxMask *wxBitmap::GetMask() const { - wxCHECK_MSG( Ok(), (wxMask *) NULL, "invalid bitmap" ); + wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") ); return M_BMPDATA->m_mask; } void wxBitmap::SetMask( wxMask *mask ) { - wxCHECK_RET( Ok(), "invalid bitmap" ); + wxCHECK_RET( Ok(), wxT("invalid bitmap") ); if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; 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, "invalid bitmap" ); + 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 (image.Ok()) return image.SaveFile( name, type ); } return FALSE; @@ -279,14 +470,16 @@ bool wxBitmap::LoadFile( const wxString &name, int 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 ); + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() ); if (mask) { @@ -295,27 +488,21 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) } 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; } -wxPalette *wxBitmap::GetPalette(void) const +wxPalette *wxBitmap::GetPalette() const { if (!Ok()) return (wxPalette *) NULL; @@ -350,18 +537,23 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) M_BMPDATA->m_pixmap = pixmap; } -GdkPixmap *wxBitmap::GetPixmap(void) const +void wxBitmap::SetBitmap( GdkPixmap *bitmap ) { - wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, "invalid bitmap" ); + if (!m_refData) m_refData = new wxBitmapRefData(); - return M_BMPDATA->m_pixmap; + M_BMPDATA->m_bitmap = bitmap; } -GdkBitmap *wxBitmap::GetBitmap(void) const +GdkPixmap *wxBitmap::GetPixmap() const { - wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, "invalid bitmap" ); + wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") ); - return M_BMPDATA->m_bitmap; + return M_BMPDATA->m_pixmap; } +GdkBitmap *wxBitmap::GetBitmap() const +{ + wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") ); + return M_BMPDATA->m_bitmap; +}