#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/dcmemory.h"
#include "wx/app.h"
+#ifdef __WXGTK20__
+ // need this to get gdk_image_new_bitmap()
+ #define GDK_ENABLE_BROKEN
+#endif
+
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
-#endif
+#ifdef __WXGTK20__
+ #include <gdk/gdkimage.h>
+#else // GTK+ 1.2
+ #include <gdk/gdkrgb.h>
+#endif // GTK+ 2.0/1.2
extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
GdkGC *gc,
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 );
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;
wxBitmapRefData::~wxBitmapRefData()
{
- if (m_pixmap) gdk_pixmap_unref( m_pixmap );
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
- if (m_mask) delete m_mask;
- if (m_palette) delete m_palette;
+ if (m_pixmap)
+ gdk_pixmap_unref( m_pixmap );
+ if (m_bitmap)
+ gdk_bitmap_unref( m_bitmap );
+ delete m_mask;
+ delete m_palette;
}
//-----------------------------------------------------------------------------
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 )
{
UnRef();
- wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+ if ( width <= 0 || height <= 0 )
+ {
+ return false;
+ }
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
- if (depth == -1) depth = visual->depth;
+ if (depth == -1)
+ depth = visual->depth;
- wxCHECK_MSG( (depth == visual->depth) ||
- (depth == 1), FALSE, wxT("invalid bitmap depth") )
+ wxCHECK_MSG( (depth == visual->depth) || (depth == 1), FALSE,
+ wxT("invalid bitmap depth") )
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
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();
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") )
+ int width = image.GetWidth();
+ int height = image.GetHeight();
+
+ if ( width <= 0 || height <= 0 )
+ {
+ return false;
+ }
+
m_refData = new wxBitmapRefData();
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+ SetHeight( height );
+ SetWidth( width );
// ------
- // convertion to mono bitmap:
+ // conversion to mono bitmap:
// ------
if (depth == 1)
{
- int width = image.GetWidth();
- int height = image.GetHeight();
-
- SetHeight( height );
- SetWidth( width );
-
SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
SetDepth( 1 );
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
// Create picture image
}
// ------
- // convertion to colour bitmap:
+ // conversion to colour bitmap:
// ------
else
{
- 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 );
+ 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;
return TRUE;
}
-#endif
-
// Create picture image
GdkImage *data_image =
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;
switch (bpp)
{
- case 8:
+ case 8:
{
int pixel = -1;
if (wxTheApp->m_colorCube)
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
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") );
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") );
}
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;
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;
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;
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;
}
}
}
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))
{
- m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_mask = (wxMask *) NULL;
- M_BMPDATA->m_bitmap =
- 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;
+ if ( width > 0 && height > 0 )
+ {
+ m_refData = new wxBitmapRefData();
- wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+ M_BMPDATA->m_mask = (wxMask *) NULL;
+ M_BMPDATA->m_bitmap = 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;
- if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+ wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+ }
}
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;
}
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() &&
// Try to save the bitmap via wxImage handlers:
{
- wxImage image( *this );
+ wxImage image = ConvertToImage();
if (image.Ok()) return image.SaveFile( name, type );
}
{
UnRef();
- if (!wxFileExists(name)) return FALSE;
+ if (!wxFileExists(name))
+ return FALSE;
- GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
- wxASSERT( visual );
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
if (type == wxBITMAP_TYPE_XPM)
{
GdkBitmap *mask = (GdkBitmap*) NULL;
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );
+ M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm
+ (
+ wxGetRootWindow()->window,
+ &mask,
+ NULL,
+ name.fn_str()
+ );
if (mask)
{
else // try if wxImage can load it
{
wxImage image;
- if (!image.LoadFile( name, type )) return FALSE;
- if (image.Ok()) *this = image.ConvertToBitmap();
- else return FALSE;
+ if ( !image.LoadFile( name, type ) || !image.Ok() )
+ return FALSE;
+
+ *this = wxBitmap(image);
}
return TRUE;
wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok()) return (wxPalette *) NULL;
+ if (!Ok())
+ return (wxPalette *) NULL;
return M_BMPDATA->m_palette;
}
void wxBitmap::SetHeight( int height )
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ if (!m_refData)
+ m_refData = new wxBitmapRefData();
M_BMPDATA->m_height = height;
}
void wxBitmap::SetWidth( int width )
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ if (!m_refData)
+ m_refData = new wxBitmapRefData();
M_BMPDATA->m_width = width;
}
void wxBitmap::SetDepth( int depth )
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ if (!m_refData)
+ m_refData = new wxBitmapRefData();
M_BMPDATA->m_bpp = depth;
}
void wxBitmap::SetPixmap( GdkPixmap *pixmap )
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ if (!m_refData)
+ m_refData = new wxBitmapRefData();
M_BMPDATA->m_pixmap = pixmap;
}
void wxBitmap::SetBitmap( GdkPixmap *bitmap )
{
- if (!m_refData) m_refData = new wxBitmapRefData();
+ if (!m_refData)
+ m_refData = new wxBitmapRefData();
M_BMPDATA->m_bitmap = bitmap;
}
projects / wxWidgets.git / blobdiff