X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..a111f2b216a90bacb254644d3cae526eddc9f9f1:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 975f4ab6ed..e104eb7e82 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -11,15 +11,40 @@ #pragma implementation "bitmap.h" #endif +#include "wx/defs.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 <gdk/gdkprivate.h> +#include <gtk/gtk.h> #include <gdk/gdkx.h> +#if (GTK_MINOR_VERSION > 0) +#include <gdk/gdkrgb.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); + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern GtkWidget *wxGetRootWindow(); + //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- @@ -33,26 +58,30 @@ wxMask::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) { @@ -60,23 +89,94 @@ bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), m_bitmap = (GdkBitmap*) NULL; } - wxFAIL_MSG( wxT("TODO") ); + wxImage image( bitmap ); + if (!image.Ok()) return FALSE; - return FALSE; -} + m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); + GdkGC *gc = gdk_gc_new( m_bitmap ); -bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), - int WXUNUSED(paletteIndex) ) -{ - if (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( wxGetRootWindow()->window ); + wxASSERT( visual ); + + int bpp = visual->depth; + if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if (bpp == 15) { - gdk_bitmap_unref( m_bitmap ); - m_bitmap = (GdkBitmap*) NULL; + red = red & 0xf8; + green = green & 0xf8; + blue = blue & 0xf8; + } + if (bpp == 16) + { + red = red & 0xf8; + green = green & 0xfc; + blue = blue & 0xf8; } - wxFAIL_MSG( wxT("not implemented") ); + color.red = 0; + color.green = 0; + color.blue = 0; + color.pixel = 0; + gdk_gc_set_foreground( gc, &color ); - return FALSE; + 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& bitmap, int paletteIndex ) +{ + 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)); } bool wxMask::Create( const wxBitmap& bitmap ) @@ -91,13 +191,13 @@ bool wxMask::Create( const wxBitmap& 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( wxGetRootWindow()->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 ); @@ -116,16 +216,16 @@ GdkBitmap *wxMask::GetBitmap() const 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() @@ -160,13 +260,24 @@ wxBitmap::wxBitmap() wxBitmap::wxBitmap( int width, int height, int depth ) { - wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") ) + Create( width, height, depth ); + + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); +} + +bool wxBitmap::Create( int width, int height, int depth ) +{ + UnRef(); + + wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; - if (depth == -1) depth = gdk_window_get_visual( parent )->depth; + GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); + wxASSERT( visual ); - wxCHECK_RET( (depth == gdk_window_get_visual( parent )->depth) || - (depth == 1), wxT("invalid bitmap depth") ) + 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; @@ -174,28 +285,32 @@ wxBitmap::wxBitmap( int width, int height, int depth ) 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( wxGetRootWindow()->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( wxGetRootWindow()->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( wxGetRootWindow()->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( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits ); + + wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") ); if (mask) { @@ -205,33 +320,455 @@ wxBitmap::wxBitmap( const 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( char **bits ) +bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { - wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") ) + wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) + wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") ) m_refData = new wxBitmapRefData(); - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + // ------ + // convertion to mono bitmap: + // ------ + if (depth == 1) + { + int width = image.GetWidth(); + int height = image.GetHeight(); - wxCHECK_RET( M_BMPDATA->m_pixmap, wxT("couldn't create pixmap") ); + SetHeight( height ); + SetWidth( width ); - if (mask) + SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) ); + + SetDepth( 1 ); + + GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); + wxASSERT( visual ); + + // 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()) + { + 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 ); + } + + 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 ); + } + } + + // ------ + // convertion to colour bitmap: + // ------ + else { - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; + int width = image.GetWidth(); + int height = image.GetHeight(); + + SetHeight( height ); + SetWidth( width ); + + SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) ); + + // Retrieve depth + + GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); + wxASSERT( visual ); + + int bpp = visual->depth; + + SetDepth( bpp ); + + if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if (bpp < 8) bpp = 8; + +#if (GTK_MINOR_VERSION > 0) + + if (!image.HasMask() && (bpp > 8)) + { + static bool s_hasInitialized = FALSE; + + if (!s_hasInitialized) + { + gdk_rgb_init(); + s_hasInitialized = TRUE; + } + + 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; + } + +#endif + + // 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()) + { + 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 >= 24) + { + 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 = RGB; + 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++) + { + 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 15: + { + guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); + gdk_image_put_pixel( data_image, x, y, pixel ); + break; + } + case 16: + { + guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); + 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 + + // Blit picture + + GdkGC *data_gc = gdk_gc_new( GetPixmap() ); + + gdk_draw_image( GetPixmap(), 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 ); + } } - gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); + return TRUE; +} - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); +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( gdk_image, wxNullImage, wxT("couldn't create image") ); + + image.Create( GetWidth(), GetHeight() ); + char unsigned *data = image.GetData(); + + if (!data) + { + gdk_image_destroy( gdk_image ); + wxFAIL_MSG( wxT("couldn't create image") ); + return wxNullImage; + } + + GdkImage *gdk_image_mask = (GdkImage*) NULL; + if (GetMask()) + { + 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; + + if (GetPixmap()) + { + GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + + if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window ); + bpp = visual->depth; + if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec; + red_shift_right = visual->red_shift; + red_shift_left = 8-visual->red_prec; + green_shift_right = visual->green_shift; + green_shift_left = 8-visual->green_prec; + blue_shift_right = visual->blue_shift; + blue_shift_left = 8-visual->blue_prec; + + use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); + } + if (GetBitmap()) + { + bpp = 1; + } + + + GdkColormap *cmap = gtk_widget_get_default_colormap(); + + long pos = 0; + for (int j = 0; j < GetHeight(); j++) + { + for (int i = 0; i < GetWidth(); i++) + { + wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); + if (bpp == 1) + { + if (pixel == 0) + { + data[pos] = 0; + data[pos+1] = 0; + data[pos+2] = 0; + } + else + { + data[pos] = 255; + data[pos+1] = 255; + data[pos+2] = 255; + } + } + else if (use_shift) + { + data[pos] = (pixel >> red_shift_right) << red_shift_left; + data[pos+1] = (pixel >> green_shift_right) << green_shift_left; + data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; + } + else if (cmap->colors) + { + data[pos] = cmap->colors[pixel].red >> 8; + data[pos+1] = cmap->colors[pixel].green >> 8; + data[pos+2] = cmap->colors[pixel].blue >> 8; + } + 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) + { + data[pos] = 16; + data[pos+1] = 16; + data[pos+2] = 16; + } + } + + pos += 3; + } + } + + gdk_image_destroy( gdk_image ); + if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + + return image; } wxBitmap::wxBitmap( const wxBitmap& bmp ) @@ -254,7 +791,7 @@ 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( wxGetRootWindow()->window, (gchar *) bits, width, height ); M_BMPDATA->m_width = width; M_BMPDATA->m_height = height; M_BMPDATA->m_bpp = 1; @@ -276,12 +813,12 @@ 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; } @@ -328,6 +865,50 @@ void wxBitmap::SetMask( wxMask *mask ) M_BMPDATA->m_mask = mask; } +bool wxBitmap::CopyFromIcon(const wxIcon& icon) +{ + *this = icon; + return TRUE; +} + +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( 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 ); + } + + return ret; +} + bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) { wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") ); @@ -347,14 +928,16 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) if (!wxFileExists(name)) return FALSE; + GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->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( wxGetRootWindow()->window, &mask, NULL, name.fn_str() ); if (mask) { @@ -363,7 +946,8 @@ 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 // try if wxImage can load it { @@ -411,6 +995,13 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) 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") );