X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..9a0b7e3319912aa9e54e9146efad98e5d693f38d:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index d81d01c970..a7e059c40c 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -11,6 +11,9 @@ #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" @@ -18,13 +21,20 @@ #include "wx/dcmemory.h" #include "wx/app.h" +#ifdef __WXGTK20__ + // need this to get gdk_image_new_bitmap() + #define GDK_ENABLE_BROKEN +#endif + #include #include #include -#if (GTK_MINOR_VERSION > 0) -#include -#endif +#ifdef __WXGTK20__ + #include +#else // GTK+ 1.2 + #include +#endif // GTK+ 2.0/1.2 extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, @@ -86,7 +96,7 @@ bool wxMask::Create( const wxBitmap& bitmap, m_bitmap = (GdkBitmap*) NULL; } - wxImage image( bitmap ); + wxImage image = bitmap.ConvertToImage(); if (!image.Ok()) return FALSE; m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); @@ -108,23 +118,29 @@ bool wxMask::Create( const wxBitmap& bitmap, unsigned char green = colour.Green(); unsigned char blue = colour.Blue(); - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); int bpp = visual->depth; - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if ((bpp == 16) && (visual->red_mask != 0xf800)) + bpp = 15; if (bpp == 15) { red = red & 0xf8; green = green & 0xf8; blue = blue & 0xf8; } - if (bpp == 16) + else if (bpp == 16) { red = red & 0xf8; green = green & 0xfc; blue = blue & 0xf8; } + else if (bpp == 12) + { + red = red & 0xf0; + green = green & 0xf0; + blue = blue & 0xf0; + } color.red = 0; color.green = 0; @@ -252,14 +268,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) wxBitmap::wxBitmap() { - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( int width, int height, int depth ) { Create( width, height, depth ); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } bool wxBitmap::Create( int width, int height, int depth ) @@ -268,8 +281,7 @@ bool wxBitmap::Create( int width, int height, int depth ) wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); if (depth == -1) depth = visual->depth; @@ -296,10 +308,11 @@ bool wxBitmap::Create( int width, int height, int depth ) bool wxBitmap::CreateFromXpm( const char **bits ) { + UnRef(); + wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); m_refData = new wxBitmapRefData(); @@ -317,24 +330,22 @@ bool wxBitmap::CreateFromXpm( const char **bits ) gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); - M_BMPDATA->m_bpp = visual->depth; // ? - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ? return TRUE; } bool wxBitmap::CreateFromImage( 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(); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); - // ------ - // convertion to mono bitmap: + // conversion to mono bitmap: // ------ if (depth == 1) { @@ -348,8 +359,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetDepth( 1 ); - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); // Create picture image @@ -431,7 +441,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) } // ------ - // convertion to colour bitmap: + // conversion to colour bitmap: // ------ else { @@ -443,21 +453,25 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) ); - // Retrieve depth - - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); 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)) + if ((bpp == 16) && (visual->red_mask != 0xf800)) + bpp = 15; + else if (bpp < 8) + bpp = 8; + + // 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 { static bool s_hasInitialized = FALSE; @@ -481,8 +495,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) return TRUE; } -#endif - // Create picture image GdkImage *data_image = @@ -509,10 +521,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; byte_order b_o = RGB; - if (bpp >= 24) + 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 = 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; @@ -547,7 +559,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) switch (bpp) { - case 8: + case 8: { int pixel = -1; if (wxTheApp->m_colorCube) @@ -574,34 +586,69 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) break; } - case 15: + case 12: // SGI only { - guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); + 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 16: + case 15: { - guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); + 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 32: - case 24: + 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 << 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; + 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; } - default: 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 @@ -633,6 +680,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) wxImage wxBitmap::ConvertToImage() const { + // the colour used as transparent one in wxImage and the one it is replaced + // with when it really occurs in the bitmap + static const int MASK_RED = 1; + static const int MASK_GREEN = 2; + static const int MASK_BLUE = 3; + static const int MASK_BLUE_REPLACEMENT = 2; + wxImage image; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); @@ -641,15 +695,16 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { gdk_image = gdk_image_get( GetPixmap(), - 0, 0, - GetWidth(), GetHeight() ); - } else - if (GetBitmap()) + 0, 0, + GetWidth(), GetHeight() ); + } + else if (GetBitmap()) { gdk_image = gdk_image_get( GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); - } else + 0, 0, + GetWidth(), GetHeight() ); + } + else { wxFAIL_MSG( wxT("Ill-formed bitmap") ); } @@ -670,10 +725,10 @@ wxImage wxBitmap::ConvertToImage() const if (GetMask()) { gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); + 0, 0, + GetWidth(), GetHeight() ); - image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); } int bpp = -1; @@ -688,10 +743,12 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + if (visual == NULL) + visual = wxTheApp->GetGdkVisual(); - 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; + 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; @@ -715,27 +772,27 @@ wxImage wxBitmap::ConvertToImage() const for (int i = 0; i < GetWidth(); i++) { wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp == 1) + if (bpp == 1) + { + if (pixel == 0) { - if (pixel == 0) - { data[pos] = 0; data[pos+1] = 0; data[pos+2] = 0; - } - else - { + } + 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; @@ -752,9 +809,15 @@ wxImage wxBitmap::ConvertToImage() const 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; + data[pos] = MASK_RED; + data[pos+1] = MASK_GREEN; + data[pos+2] = MASK_BLUE; + } + else if ( data[pos] == MASK_RED && + data[pos+1] == MASK_GREEN && + data[pos+2] == MASK_BLUE ) + { + data[pos+2] = MASK_BLUE_REPLACEMENT; } } @@ -769,17 +832,14 @@ wxImage wxBitmap::ConvertToImage() const } wxBitmap::wxBitmap( const wxBitmap& bmp ) + : wxGDIObject() { Ref( bmp ); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const wxString &filename, int type ) { LoadFile( filename, type ); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) @@ -794,19 +854,17 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth M_BMPDATA->m_bpp = 1; wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::~wxBitmap() { - if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); } wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) { - if (*this == bmp) return (*this); - Ref( bmp ); + if ( m_refData != bmp.m_refData ) + Ref( bmp ); + return *this; } @@ -862,6 +920,12 @@ 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() && @@ -906,7 +970,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal // Try to save the bitmap via wxImage handlers: { - wxImage image( *this ); + wxImage image = ConvertToImage(); if (image.Ok()) return image.SaveFile( name, type ); } @@ -919,8 +983,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) if (!wxFileExists(name)) return FALSE; - GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); if (type == wxBITMAP_TYPE_XPM) { @@ -944,7 +1007,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) { wxImage image; if (!image.LoadFile( name, type )) return FALSE; - if (image.Ok()) *this = image.ConvertToBitmap(); + if (image.Ok()) + *this = wxBitmap(image); else return FALSE; }