X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5f01ae00e0597d24b76e54aff7a8f369ab83c15..e0a76d8d8a91d5a13c1fab7257aae4da8311f58d:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 170e8daf4f..4f5ad6a770 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/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" @@ -40,7 +43,7 @@ extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, // data //----------------------------------------------------------------------------- -extern GtkWidget *wxRootWindow; +extern GtkWidget *wxGetRootWindow(); //----------------------------------------------------------------------------- // wxMask @@ -89,7 +92,7 @@ bool wxMask::Create( const wxBitmap& bitmap, wxImage image( bitmap ); if (!image.Ok()) return FALSE; - m_bitmap = gdk_pixmap_new( wxRootWindow->window, image.GetWidth(), image.GetHeight(), 1 ); + m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); GdkGC *gc = gdk_gc_new( m_bitmap ); GdkColor color; @@ -108,9 +111,8 @@ bool wxMask::Create( const wxBitmap& bitmap, unsigned char green = colour.Green(); unsigned char blue = colour.Blue(); - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); - + GdkVisual *visual = wxTheApp->GetGdkVisual(); + int bpp = visual->depth; if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; if (bpp == 15) @@ -118,12 +120,18 @@ bool wxMask::Create( const wxBitmap& bitmap, 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) + { + red = red & 0xf0; + green = green & 0xf0; + blue = blue & 0xf0; } color.red = 0; @@ -170,7 +178,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) 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)); @@ -188,7 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") ); - m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); + m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 ); if (!m_bitmap) return FALSE; @@ -252,14 +260,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 +273,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( wxRootWindow->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); if (depth == -1) depth = visual->depth; @@ -282,12 +286,12 @@ bool wxBitmap::Create( int width, int height, int depth ) M_BMPDATA->m_height = height; if (depth == 1) { - M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, 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( wxRootWindow->window, width, height, depth ); + M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth ); M_BMPDATA->m_bpp = visual->depth; } @@ -298,14 +302,13 @@ bool wxBitmap::CreateFromXpm( const char **bits ) { wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") ) - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); - + GdkVisual *visual = wxTheApp->GetGdkVisual(); + m_refData = new wxBitmapRefData(); GdkBitmap *mask = (GdkBitmap*) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &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") ); @@ -318,22 +321,16 @@ 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); return TRUE; } -extern GtkWidget *wxRootWindow; - bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) { 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: @@ -346,12 +343,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetHeight( height ); SetWidth( width ); - SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) ); + SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) ); SetDepth( 1 ); - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); // Create picture image @@ -371,7 +367,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); + mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ); SetMask( mask ); } @@ -431,7 +427,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) gdk_gc_unref( mask_gc ); } } - + // ------ // convertion to colour bitmap: // ------ @@ -443,12 +439,9 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetHeight( height ); SetWidth( width ); - SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) ); - - // Retrieve depth + SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) ); - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); + GdkVisual *visual = wxTheApp->GetGdkVisual(); int bpp = visual->depth; @@ -457,9 +450,14 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; if (bpp < 8) bpp = 8; -#if (GTK_MINOR_VERSION > 0) - - if (!image.HasMask() && (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; @@ -483,8 +481,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) return TRUE; } -#endif - // Create picture image GdkImage *data_image = @@ -501,7 +497,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) mask_image = gdk_image_new_bitmap( visual, mask_data, width, height ); wxMask *mask = new wxMask(); - mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 ); + mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ); SetMask( mask ); } @@ -511,7 +507,7 @@ 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; @@ -549,7 +545,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) switch (bpp) { - case 8: + case 8: { int pixel = -1; if (wxTheApp->m_colorCube) @@ -561,7 +557,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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; @@ -571,39 +567,74 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (sum < max) { pixel = i; max = sum; } } } - + gdk_image_put_pixel( data_image, x, y, pixel ); - + 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 @@ -636,7 +667,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) wxImage wxBitmap::ConvertToImage() const { wxImage image; - + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); GdkImage *gdk_image = (GdkImage*) NULL; @@ -657,7 +688,7 @@ wxImage wxBitmap::ConvertToImage() const } wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") ); - + image.Create( GetWidth(), GetHeight() ); char unsigned *data = image.GetData(); @@ -690,8 +721,9 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); - - if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window ); + 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; @@ -717,27 +749,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; @@ -765,7 +797,7 @@ wxImage wxBitmap::ConvertToImage() const } gdk_image_destroy( gdk_image ); - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); return image; } @@ -773,15 +805,11 @@ wxImage wxBitmap::ConvertToImage() const wxBitmap::wxBitmap( const wxBitmap& bmp ) { 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)) @@ -790,25 +818,23 @@ 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( wxRootWindow->window, (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; 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; } @@ -864,6 +890,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() && @@ -890,7 +922,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const if (GetMask()) { wxMask *mask = new wxMask; - mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 ); + 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 ); @@ -921,16 +953,15 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) if (!wxFileExists(name)) return FALSE; - GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window ); - wxASSERT( visual ); - + GdkVisual *visual = wxTheApp->GetGdkVisual(); + if (type == wxBITMAP_TYPE_XPM) { m_refData = new wxBitmapRefData(); GdkBitmap *mask = (GdkBitmap*) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() ); + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() ); if (mask) { @@ -939,7 +970,7 @@ 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 = visual->depth; } else // try if wxImage can load it