image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 5af0c4c3367c4f19963c77597aa07405d15faeb6..59428e90247ea6501f43bec013cb5e2793f0d067 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -16,9 +16,9 @@
 #include "wx/filefn.h"
 #include "wx/image.h"
 
 #include "wx/filefn.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -33,72 +33,133 @@ wxMask::wxMask()
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {

+    m_bitmap = (GdkBitmap *) NULL;

     Create( bitmap, colour );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     Create( bitmap, colour );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {

+    m_bitmap = (GdkBitmap *) NULL;

     Create( bitmap, paletteIndex );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
     Create( bitmap, paletteIndex );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {

+    m_bitmap = (GdkBitmap *) NULL;

     Create( bitmap );
 }
 
 wxMask::~wxMask()
 {
     Create( bitmap );
 }
 
 wxMask::~wxMask()
 {

-    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    if (m_bitmap) 
+        gdk_bitmap_unref( m_bitmap );

 }
 
 }
 

-bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour )
+bool wxMask::Create( const wxBitmap& bitmap,
+                     const wxColour& colour )

 {
     if (m_bitmap)
 {
     if (m_bitmap)

-    { 
+    {

         gdk_bitmap_unref( m_bitmap );
         gdk_bitmap_unref( m_bitmap );

-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;
+    }
+    
+    wxImage image( bitmap );
+    if (!image.Ok()) return FALSE;
+    
+    GdkVisual *visual = gdk_visual_get_system();
+    
+    GdkImage *mask_image = gdk_image_new( GDK_IMAGE_FASTEST, visual, image.GetWidth(), image.GetHeight() );
+    if (!mask_image) return FALSE;
+
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+    m_bitmap = gdk_pixmap_new( parent, image.GetWidth(), image.GetHeight(), 1 );
+    
+    
+    unsigned char *data = image.GetData();
+    int index = 0;
+    
+    unsigned char red = colour.Red();
+    unsigned char green = colour.Green();
+    unsigned char blue = colour.Blue();
+    
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if (bpp == 15)
+    {
+        red = red & 0xf8;
+        blue = blue & 0xf8;
+        green = green & 0xf8;
+    }
+    if (bpp == 16)
+    {
+        red = red & 0xf8;
+        blue = blue & 0xfc;
+        green = green & 0xf8;

     }
     
     }
     

-    wxFAIL_MSG( "TODO" );
+    for (int j = 0; j < image.GetHeight(); j++)
+      for (int i = 0; i < image.GetWidth(); i++)
+        {
+           if ((data[index] == red) &&
+               (data[index+1] == green) &&
+               (data[index+2] == blue))
+           {
+               gdk_image_put_pixel( mask_image, i, j, 1 );
+           }
+           else
+           {
+               gdk_image_put_pixel( mask_image, i, j, 1 );
+           }
+           index += 3;
+       }
+
+    GdkGC *mask_gc = gdk_gc_new( m_bitmap );
+
+    gdk_draw_image( m_bitmap, mask_gc, mask_image, 0, 0, 0, 0, image.GetWidth(), image.GetHeight() );
+
+    gdk_gc_unref( mask_gc );
+    gdk_image_destroy( mask_image );

     
     return FALSE;
 }
 
     
     return FALSE;
 }
 

-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+                     int WXUNUSED(paletteIndex) )

 {
     if (m_bitmap)
 {
     if (m_bitmap)

-    { 
+    {

         gdk_bitmap_unref( m_bitmap );
         gdk_bitmap_unref( m_bitmap );

-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;

     }
     }

-    
-    wxFAIL_MSG( "not implemented" );
-    
+
+    wxFAIL_MSG( wxT("not implemented") );
+

     return FALSE;
 }
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     return FALSE;
 }
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)

-    { 
+    {

         gdk_bitmap_unref( m_bitmap );
         gdk_bitmap_unref( m_bitmap );

-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;

     }
     }

-    
+

     if (!bitmap.Ok()) return FALSE;
     if (!bitmap.Ok()) return FALSE;

-    
-    wxCHECK_MSG( bitmap.GetBitmap(), FALSE, "Cannot create mask from colour bitmap" );
-    
+
+    wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
+

     m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
     m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );

-    
+

     if (!m_bitmap) return FALSE;
     if (!m_bitmap) return FALSE;

-    
+

     GdkGC *gc = gdk_gc_new( m_bitmap );
     GdkGC *gc = gdk_gc_new( m_bitmap );

-    
+

     gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
     gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );

-    
+

     gdk_gc_unref( gc );
     gdk_gc_unref( gc );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -158,13 +219,13 @@ wxBitmap::wxBitmap()
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {

-    wxCHECK_RET( (width > 0) && (height > 0), _T("invalid bitmap size") )
-    
+    wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
+

     GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
     if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
     GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
     if (depth == -1) depth = gdk_window_get_visual( parent )->depth;

-    
+

     wxCHECK_RET( (depth ==  gdk_window_get_visual( parent )->depth) ||
     wxCHECK_RET( (depth ==  gdk_window_get_visual( parent )->depth) ||

-                 (depth == 1), _T("invalid bitmap depth") )
+                 (depth == 1), wxT("invalid bitmap depth") )

 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;
 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;


@@ -186,7 +247,7 @@ wxBitmap::wxBitmap( int width, int height, int depth )
 
 wxBitmap::wxBitmap( const char **bits )
 {
 
 wxBitmap::wxBitmap( const char **bits )
 {

-    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 


@@ -209,7 +270,7 @@ wxBitmap::wxBitmap( const char **bits )
 
 wxBitmap::wxBitmap( char **bits )
 {
 
 wxBitmap::wxBitmap( char **bits )
 {

-    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 


@@ -218,7 +279,7 @@ wxBitmap::wxBitmap( char **bits )
 
     M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
 
 
     M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
 

-    wxCHECK_RET( M_BMPDATA->m_pixmap, _T("couldn't create pixmap") );
+    wxCHECK_RET( M_BMPDATA->m_pixmap, wxT("couldn't create pixmap") );

 
     if (mask)
     {
 
     if (mask)
     {


@@ -257,7 +318,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 

-    wxCHECK_RET( M_BMPDATA->m_bitmap, _T("couldn't create bitmap") );
+    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );

 
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
 
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }


@@ -291,35 +352,35 @@ bool wxBitmap::Ok() const
 
 int wxBitmap::GetHeight() const
 {
 
 int wxBitmap::GetHeight() const
 {

-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {
 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {

-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {
 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {

-    wxCHECK_MSG( Ok(), (wxMask *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {

-    wxCHECK_RET( Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( Ok(), wxT("invalid bitmap") );

 
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
 
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 


@@ -328,12 +389,12 @@ void wxBitmap::SetMask( wxMask *mask )
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {

-    wxCHECK_MSG( Ok(), FALSE, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );

 
 

-    if (type == wxBITMAP_TYPE_PNG)
+    // Try to save the bitmap via wxImage handlers:

     {
         wxImage image( *this );
     {
         wxImage image( *this );

-       if (image.Ok()) return image.SaveFile( name, type );
+        if (image.Ok()) return image.SaveFile( name, type );

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -363,20 +424,13 @@ 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 = gdk_window_get_visual( parent )->depth;
     }
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
         M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
     }

-    else if (type == wxBITMAP_TYPE_PNG)
-    {
-        wxImage image;
-        image.LoadFile( name, type );
-        if (image.Ok()) *this = image.ConvertToBitmap();
-    }
-    else if (type == wxBITMAP_TYPE_BMP)
+    else // try if wxImage can load it

     {
         wxImage image;
     {
         wxImage image;

-        image.LoadFile( name, type );
+        if (!image.LoadFile( name, type )) return FALSE;

         if (image.Ok()) *this = image.ConvertToBitmap();
         if (image.Ok()) *this = image.ConvertToBitmap();

+        else return FALSE;

     }
     }

-    else
-        return FALSE;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -418,14 +472,14 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {

-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_pixmap;
 }
 
 GdkBitmap *wxBitmap::GetBitmap() const
 {
 
     return M_BMPDATA->m_pixmap;
 }
 
 GdkBitmap *wxBitmap::GetBitmap() const
 {

-    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_bitmap;
 }
 
     return M_BMPDATA->m_bitmap;
 }