#endif
#include "wx/bitmap.h"
+#include "wx/icon.h"
#include "gdk/gdkprivate.h"
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
+
#include "../gdk_imlib/gdk_imlib.h"
+#include "gdk/gdkx.h" // GDK_DISPLAY
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
#endif
//-----------------------------------------------------------------------------
wxMask::wxMask(void)
{
- m_bitmap = NULL;
-};
+ m_bitmap = (GdkBitmap *) NULL;
+}
wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
{
-};
+}
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
{
-};
+}
wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
{
-};
+}
wxMask::~wxMask(void)
{
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
// do not delete the mask, gdk_imlib does it for you
#else
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
#endif
-};
+}
GdkBitmap *wxMask::GetBitmap(void) const
{
return m_bitmap;
-};
+}
//-----------------------------------------------------------------------------
// wxBitmap
int m_width;
int m_height;
int m_bpp;
+#ifdef wxUSE_GDK_IMLIB
+ GdkImlibImage *m_image;
+#endif
wxPalette *m_palette;
};
wxBitmapRefData::wxBitmapRefData(void)
{
- m_pixmap = NULL;
- m_bitmap = NULL;
- m_mask = NULL;
+ m_pixmap = (GdkPixmap *) NULL;
+ m_bitmap = (GdkBitmap *) NULL;
+ m_mask = (wxMask *) NULL;
m_width = 0;
m_height = 0;
m_bpp = 0;
- m_palette = NULL;
-};
+ m_palette = (wxPalette *) NULL;
+#ifdef wxUSE_GDK_IMLIB
+ m_image = (GdkImlibImage *) NULL;
+#endif
+}
wxBitmapRefData::~wxBitmapRefData(void)
{
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
+ if (m_image) gdk_imlib_kill_image( m_image );
#else
if (m_pixmap) gdk_pixmap_unref( m_pixmap );
- if (m_bitmap) gdk_bitmap_unref( m_bitmap );
#endif
+ if (m_bitmap) gdk_bitmap_unref( m_bitmap );
if (m_mask) delete m_mask;
if (m_palette) delete m_palette;
-};
+}
//-----------------------------------------------------------------------------
wxBitmap::wxBitmap(void)
{
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
+wxBitmap::wxBitmap( int width, int height, int depth )
{
m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
+ M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_pixmap =
gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
- gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+ M_BMPDATA->m_width = width;
+ M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = depth;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
wxBitmap::wxBitmap( char **bits )
{
m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = NULL;
-#ifndef USE_GDK_IMLIB
+#ifndef wxUSE_GDK_IMLIB
+
+ GdkBitmap *mask = NULL;
+
M_BMPDATA->m_pixmap =
gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
-#else
- M_BMPDATA->m_pixmap = NULL;
- int res = gdk_imlib_data_to_pixmap( bits, &M_BMPDATA->m_pixmap, &mask );
-#endif
-
+
if (mask)
{
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = mask;
- };
-
+ }
+
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+
+#else
+
+ M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
+ Render();
+
+#endif
+
M_BMPDATA->m_bpp = 24; // ?
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
wxBitmap::wxBitmap( const wxBitmap& bmp )
{
Ref( bmp );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
wxBitmap::wxBitmap( const wxBitmap* bmp )
{
if (bmp) Ref( *bmp );
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
-wxBitmap::wxBitmap( const wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxString &filename, int type )
{
LoadFile( filename, type );
-};
+
+ if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
// CMB 15/5/98: add constructor for xbm bitmaps
-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
{
m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
+ M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_bitmap =
gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
- gdk_window_get_size( M_BMPDATA->m_bitmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+ M_BMPDATA->m_width = width;
+ M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
wxBitmap::~wxBitmap(void)
{
if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
-};
+}
wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
{
if (*this == bmp) return (*this);
Ref( bmp );
return *this;
-};
+}
bool wxBitmap::operator == ( const wxBitmap& bmp )
{
return m_refData == bmp.m_refData;
-};
+}
bool wxBitmap::operator != ( const wxBitmap& bmp )
{
return m_refData != bmp.m_refData;
-};
+}
bool wxBitmap::Ok(void) const
{
- return m_refData != NULL;
-};
+ return (m_refData != NULL);
+}
int wxBitmap::GetHeight(void) const
{
- if (!Ok()) return 0;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return -1;
+ }
+
return M_BMPDATA->m_height;
-};
+}
int wxBitmap::GetWidth(void) const
{
- if (!Ok()) return 0;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return -1;
+ }
+
return M_BMPDATA->m_width;
-};
+}
int wxBitmap::GetDepth(void) const
{
- if (!Ok()) return 0;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return -1;
+ }
+
return M_BMPDATA->m_bpp;
-};
+}
-void wxBitmap::SetHeight( const int height )
+void wxBitmap::SetHeight( int height )
{
if (!Ok()) return;
+
+ wxFAIL_MSG( "wxBitmap::SetHeight not implemented" );
+
M_BMPDATA->m_height = height;
-};
+}
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetWidth( int width )
{
if (!Ok()) return;
+
+ wxFAIL_MSG( "wxBitmap::SetWidth not implemented" );
+
M_BMPDATA->m_width = width;
-};
+}
-void wxBitmap::SetDepth( const int depth )
+void wxBitmap::SetDepth( int depth )
{
if (!Ok()) return;
+
+ wxFAIL_MSG( "wxBitmap::SetDepth not implemented" );
+
M_BMPDATA->m_bpp = depth;
-};
+}
wxMask *wxBitmap::GetMask(void) const
{
- if (!Ok()) return NULL;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return (wxMask *) NULL;
+ }
+
return M_BMPDATA->m_mask;
-};
+}
void wxBitmap::SetMask( wxMask *mask )
{
- if (!Ok()) return;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+
M_BMPDATA->m_mask = mask;
-};
+}
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type),
+void wxBitmap::Resize( int height, int width )
+{
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
+#ifdef wxUSE_GDK_IMLIB
+
+ if (M_BMPDATA->m_bitmap)
+ {
+ wxFAIL_MSG( "wxBitmap::Resize not supported for mono-bitmaps" );
+ return;
+ }
+
+ if (!M_BMPDATA->m_image) RecreateImage();
+
+ if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
+ if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+
+ GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
+ gdk_imlib_destroy_image( M_BMPDATA->m_image );
+ M_BMPDATA->m_image = image;
+ M_BMPDATA->m_height = height;
+ M_BMPDATA->m_width = width;
+
+ Render();
+
+#else
+
+ wxFAIL_MSG( "wxBitmap::Resize not implemented without GdkImlib" );
+
+#endif
+}
+
+bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return FALSE;
+ }
+
+#ifdef wxUSE_GDK_IMLIB
+
+ if (M_BMPDATA->m_bitmap)
+ {
+ wxFAIL_MSG( "wxBitmap::SaveFile not supported for mono-bitmaps" );
+ return FALSE;
+ }
+
+ if (!M_BMPDATA->m_image) RecreateImage();
+
+ return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL );
+
+#else
+
+ wxFAIL_MSG( "wxBitmap::SaveFile not implemented without GdkImlib" );
+
+#endif
+
return FALSE;
-};
+}
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
{
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
UnRef();
m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = NULL;
-
- GdkBitmap *mask = NULL;
- int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
+ M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
- if (res != 1)
+ if (!M_BMPDATA->m_image)
{
UnRef();
return FALSE;
- };
-
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
}
+
+ Render();
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = 24; // ?
return TRUE;
+
+#else
+
+ wxFAIL_MSG( "wxBitmap::LoadFile not implemented without GdkImlib" );
+
#endif
return FALSE;
-};
+}
wxPalette *wxBitmap::GetPalette(void) const
{
- if (!Ok()) return NULL;
+ if (!Ok()) return (wxPalette *) NULL;
return M_BMPDATA->m_palette;
-};
+}
GdkPixmap *wxBitmap::GetPixmap(void) const
{
- if (!Ok()) return NULL;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return (GdkPixmap *) NULL;
+ }
+
+// if (!M_BMPDATA->m_image) RecreateImage();
+
return M_BMPDATA->m_pixmap;
-};
+}
GdkBitmap *wxBitmap::GetBitmap(void) const
{
- if (!Ok()) return NULL;
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return (GdkBitmap *) NULL;
+ }
+
return M_BMPDATA->m_bitmap;
-};
+}
+
+void wxBitmap::DestroyImage(void)
+{
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
+ if (M_BMPDATA->m_image)
+ {
+ gdk_imlib_destroy_image( M_BMPDATA->m_image );
+ M_BMPDATA->m_image = (GdkImlibImage *) NULL;
+ }
+}
+
+void wxBitmap::RecreateImage(void)
+{
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
+#ifdef wxUSE_GDK_IMLIB
+
+ DestroyImage();
+
+ wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
+
+ long size = (long)(M_BMPDATA->m_width)*(long)(M_BMPDATA->m_height)*(long)3;
+ unsigned char *data = new unsigned char[size];
+ for (long i = 0; i < size; i++) data[i] = 100;
+
+ GdkImage *image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height );
+
+ long pos = 0;
+ for (int j = 0; j < M_BMPDATA->m_height; j++)
+ {
+ for (int i = 0; i < M_BMPDATA->m_width; i++)
+ {
+ XColor xcol;
+ xcol.pixel = gdk_image_get_pixel( image, i, j );
+ Colormap cm = ((GdkColormapPrivate*)gdk_imlib_get_colormap())->xcolormap;
+ XQueryColor( gdk_display, cm, &xcol );
+
+ data[pos] = xcol.red;
+ data[pos+1] = xcol.green;
+ data[pos+2] = xcol.blue;
+ pos += 3;
+ }
+ }
+
+ wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
+
+ M_BMPDATA->m_image = gdk_imlib_create_image_from_data(
+ data, (unsigned char*)NULL, M_BMPDATA->m_width, M_BMPDATA->m_height );
+
+ delete[] data;
+
+ gdk_image_destroy( image );
+
+ Render();
+
+#else
+
+ wxFAIL_MSG( "wxBitmap::RecreateImage not implemented without GdkImlib" );
+#endif
+}
+
+void wxBitmap::Render(void)
+{
+ if (!Ok())
+ {
+ wxFAIL_MSG( "invalid bitmap" );
+ return;
+ }
+
+#ifdef wxUSE_GDK_IMLIB
+
+ if (!M_BMPDATA->m_image) RecreateImage();
+
+ if (M_BMPDATA->m_pixmap)
+ {
+ gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
+ M_BMPDATA->m_pixmap = (GdkPixmap*) NULL;
+ }
+ if (M_BMPDATA->m_mask)
+ {
+ delete M_BMPDATA->m_mask;
+ M_BMPDATA->m_mask = (wxMask*) NULL;
+ }
+
+ gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
+ M_BMPDATA->m_width = M_BMPDATA->m_image->rgb_width;
+ M_BMPDATA->m_height = M_BMPDATA->m_image->rgb_height;
+ M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
+
+ wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "pixmap rendering failed" )
+
+ GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
+ if (mask)
+ {
+ M_BMPDATA->m_mask = new wxMask();
+ M_BMPDATA->m_mask->m_bitmap = mask;
+ }
+
+#else
+
+ wxFAIL_MSG( "wxBitmap::Render not implemented without GdkImlib" );
+
+#endif
+}
+
+
projects / wxWidgets.git / blobdiff