#include "wx/app.h"
#include "wx/dcmemory.h"
#include "wx/palette.h"
+ #include "wx/icon.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
#endif
-#include "wx/icon.h"
#include "wx/filefn.h"
-#include "wx/image.h"
#include "wx/rawbmp.h"
// need this to get gdk_image_new_bitmap()
#include <gdk/gdkimage.h>
-#include "wx/math.h"
-
extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
GdkGC *gc,
GdkDrawable *src,
if (!bitmap.Ok()) return false;
- wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
+ wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
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_wx_draw_bitmap( m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
g_object_unref (gc);
~wxBitmapRefData();
GdkPixmap *m_pixmap;
- GdkBitmap *m_bitmap;
GdkPixbuf *m_pixbuf;
wxMask *m_mask;
int m_width;
wxBitmapRefData::wxBitmapRefData()
{
m_pixmap = (GdkPixmap *) NULL;
- m_bitmap = (GdkBitmap *) NULL;
m_pixbuf = (GdkPixbuf *) NULL;
m_mask = (wxMask *) NULL;
m_width = 0;
{
if (m_pixmap)
g_object_unref (m_pixmap);
- if (m_bitmap)
- g_object_unref (m_bitmap);
if (m_pixbuf)
g_object_unref (m_pixbuf);
delete m_mask;
//-----------------------------------------------------------------------------
-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_width = width;
M_BMPDATA->m_height = height;
- if (depth == 1)
- {
- M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- M_BMPDATA->m_bpp = 1;
- }
- else if (depth == 32)
+ M_BMPDATA->m_bpp = depth;
+ if (depth == 32)
{
M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
8, width, height);
- M_BMPDATA->m_bpp = 32;
}
else
{
M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
- M_BMPDATA->m_bpp = visual->depth;
}
return Ok();
GdkImage *img = (GdkImage*) NULL;
if (GetPixmap())
img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
- else if (GetBitmap())
- img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() );
else
wxFAIL_MSG( wxT("Ill-formed bitmap") );
GdkGC *gc = NULL;
GdkPixmap *dstpix = NULL;
- if (GetPixmap())
+ if (GetDepth() != 1)
{
GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
if (visual == NULL)
char *dst = NULL;
long dstbyteperline = 0;
- if (GetBitmap())
+ if (GetDepth() == 1)
{
bpp = 1;
dstbyteperline = width/8*M_BMPDATA->m_bpp;
SetHeight( height );
SetWidth( width );
- SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
+ SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
SetDepth( 1 );
// Blit picture
- GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+ GdkGC *data_gc = gdk_gc_new( GetPixmap() );
- gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+ gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
g_object_unref (data_image);
g_object_unref (data_gc);
SetDepth( bpp );
- 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;
-
- if (!s_hasInitialized)
- {
- gdk_rgb_init();
- s_hasInitialized = true;
- }
-
- GdkGC *gc = gdk_gc_new( GetPixmap() );
+ 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_draw_rgb_image( GetPixmap(),
+ gc,
+ 0, 0,
+ width, height,
+ GDK_RGB_DITHER_NONE,
+ image.GetData(),
+ width*3 );
- g_object_unref (gc);
- return true;
- }
-
- // Create picture image
-
- GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
+ g_object_unref (gc);
// 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 );
+ if (!image.HasMask())
+ return true;
- SetMask( mask );
- }
+ unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
- // Render
+ mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
- enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
- byte_order b_o = RGB;
+ wxMask *mask = new wxMask();
+ mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- 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 = 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;
- else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask)) b_o = GBR;
- }
+ SetMask( mask );
int r_mask = image.GetMaskRed();
int g_mask = image.GetMaskGreen();
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 12: // SGI only
- {
- 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 15:
- {
- 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 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 & 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;
- }
- 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 );
- break;
- }
- default: break;
- }
+ 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 );
} // 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 );
-
- g_object_unref (data_image);
- g_object_unref (data_gc);
-
// Blit mask
- if (image.HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+ GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
- gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+ gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
- g_object_unref (mask_image);
- g_object_unref (mask_gc);
- }
+ g_object_unref (mask_image);
+ g_object_unref (mask_gc);
return true;
}
0, 0,
GetWidth(), GetHeight() );
}
- else if (GetBitmap())
- {
- gdk_image = gdk_image_get( GetBitmap(),
- 0, 0,
- GetWidth(), GetHeight() );
- }
else
{
wxFAIL_MSG( wxT("Ill-formed bitmap") );
int blue_shift_left = 0;
bool use_shift = false;
- if (GetPixmap())
+ if (GetDepth() != 1)
{
GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
if (visual == NULL)
use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
}
- if (GetBitmap())
+ else
{
bpp = 1;
}
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
- M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data
+ M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data
(
wxGetRootWindow()->window,
(gchar *) bits,
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
- wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+ wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
}
}
return (m_refData != NULL) &&
(
M_BMPDATA->m_pixbuf ||
- M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap
+ M_BMPDATA->m_pixmap
);
}
}
else
{
- if (ret.GetPixmap())
+ if (ret.GetDepth() != 1)
{
GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
}
else
{
- GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
+ GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
GdkColor col;
col.pixel = 0xFFFFFF;
gdk_gc_set_foreground( gc, &col );
col.pixel = 0;
gdk_gc_set_background( gc, &col );
- gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+ gdk_wx_draw_bitmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
g_object_unref (gc);
}
}
PurgeOtherRepresentations(Pixmap);
}
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
-{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_bitmap = bitmap;
- PurgeOtherRepresentations(Pixmap);
-}
-
GdkPixmap *wxBitmap::GetPixmap() const
{
wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_pixmap != NULL;
}
-GdkBitmap *wxBitmap::GetBitmap() const
-{
- wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
-
- return M_BMPDATA->m_bitmap;
-}
-
GdkPixbuf *wxBitmap::GetPixbuf() const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
projects / wxWidgets.git / blobdiff