Tweaks to the announcement

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 1f62c2a11be98d0aff1282aed4a3abe3aa55ff8d..033071565ef845fdc622e3258135bef48b7be14c 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -21,13 +21,20 @@
 #include "wx/dcmemory.h"
 #include "wx/app.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>
 
 #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,
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,


@@ -89,7 +96,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
         m_bitmap = (GdkBitmap*) NULL;
     }
 
         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 );
     if (!image.Ok()) return FALSE;
 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );


@@ -111,8 +118,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
     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;
 
     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;


@@ -121,12 +127,18 @@ bool wxMask::Create( const wxBitmap& bitmap,
         red = red & 0xf8;
         green = green & 0xf8;
         blue = blue & 0xf8;
         red = red & 0xf8;
         green = green & 0xf8;
         blue = blue & 0xf8;

-    }
+    } else

     if (bpp == 16)
     {
         red = red & 0xf8;
         green = green & 0xfc;
         blue = blue & 0xf8;
     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.red = 0;


@@ -268,8 +280,7 @@ bool wxBitmap::Create( int width, int height, int depth )
 
     wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
 
 
     wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
 

-    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;
 


@@ -296,10 +307,11 @@ bool wxBitmap::Create( int width, int height, int depth )
 
 bool wxBitmap::CreateFromXpm( const char **bits )
 {
 
 bool wxBitmap::CreateFromXpm( const char **bits )
 {

+    UnRef();
+

     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
     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();
 
 
     m_refData = new wxBitmapRefData();
 


@@ -316,14 +328,16 @@ bool wxBitmap::CreateFromXpm( const char **bits )
     }
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
     }
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

-
-    M_BMPDATA->m_bpp = visual->depth;  // ?
+    
+    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 )
 {
 
     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") )
 
     wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
     wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
 


@@ -343,9 +357,8 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
 
         SetDepth( 1 );
         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
 
 
         // Create picture image
 


@@ -439,21 +452,23 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
         SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
 
 
         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 );
 
         int bpp = visual->depth;
 
         SetDepth( bpp );

-
+        

         if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
         if (bpp < 8) bpp = 8;
 
         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;
 
         {
             static bool s_hasInitialized = FALSE;
 


@@ -477,8 +492,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
             return TRUE;
         }
 
             return TRUE;
         }
 

-#endif
-

         // Create picture image
 
         GdkImage *data_image =
         // Create picture image
 
         GdkImage *data_image =


@@ -505,10 +518,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
         byte_order b_o = RGB;
 
         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;
         {
             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;
             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;


@@ -543,7 +556,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
                 switch (bpp)
                 {
 
                 switch (bpp)
                 {

-                case 8:
+                    case 8:

                     {
                         int pixel = -1;
                         if (wxTheApp->m_colorCube)
                     {
                         int pixel = -1;
                         if (wxTheApp->m_colorCube)


@@ -555,7 +568,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
                             GdkColormap *cmap = gtk_widget_get_default_colormap();
                             GdkColor *colors = cmap->colors;
                             int max = 3 * (65536);
                             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;
                             for (int i = 0; i < cmap->size; i++)
                             {
                                 int rdiff = (r << 8) - colors[i].red;


@@ -565,39 +578,74 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
                                 if (sum < max) { pixel = i; max = sum; }
                             }
                         }
                                 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 );
                         gdk_image_put_pixel( data_image, x, y, pixel );

-

                         break;
                     }
                         break;
                     }

-                case 15:
+                    case 15:

                     {
                     {

-                        guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((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;
                     }
                         gdk_image_put_pixel( data_image, x, y, pixel );
                         break;
                     }

-                case 16:
+                    case 16:

                     {
                     {

-                        guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
+                        // 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;
                     }
                         gdk_image_put_pixel( data_image, x, y, pixel );
                         break;
                     }

-                case 32:
-                case 24:
+                    case 32:
+                    case 24:

                     {
                         guint32 pixel = 0;
                         switch (b_o)
                         {
                     {
                         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 << 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 );
                     }
                         }
                         gdk_image_put_pixel( data_image, x, y, pixel );
                     }

-                default: break;
+                    default: break;

                 }
             } // for
         }  // for
                 }
             } // for
         }  // for


@@ -654,7 +702,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();

-
+    

     if (!data)
     {
         gdk_image_destroy( gdk_image );
     if (!data)
     {
         gdk_image_destroy( gdk_image );


@@ -684,8 +732,9 @@ wxImage wxBitmap::ConvertToImage() const
     if (GetPixmap())
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
     if (GetPixmap())
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );

-
-        if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->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;
         bpp = visual->depth;
         if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
         red_shift_right = visual->red_shift;


@@ -711,27 +760,27 @@ wxImage wxBitmap::ConvertToImage() const
         for (int i = 0; i < GetWidth(); i++)
         {
             wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
         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;
                     data[pos]   = 0;
                     data[pos+1] = 0;
                     data[pos+2] = 0;

-                        }
-                        else
-                        {
+                }
+                else
+                {

                     data[pos]   = 255;
                     data[pos+1] = 255;
                     data[pos+2] = 255;
                     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 (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;
             else if (cmap->colors)
             {
                 data[pos] =   cmap->colors[pixel].red   >> 8;


@@ -765,6 +814,7 @@ wxImage wxBitmap::ConvertToImage() const
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )

+    : wxGDIObject()

 {
     Ref( bmp );
 }
 {
     Ref( bmp );
 }


@@ -902,7 +952,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
 
     // Try to save the bitmap via wxImage handlers:
     {
 
     // Try to save the bitmap via wxImage handlers:
     {

-        wxImage image( *this );
+        wxImage image = ConvertToImage();

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


@@ -915,8 +965,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
     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)
     {
 
     if (type == wxBITMAP_TYPE_XPM)
     {


@@ -940,7 +989,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;

-        if (image.Ok()) *this = image.ConvertToBitmap();
+        if (image.Ok())
+            *this = wxBitmap(image);

         else return FALSE;
     }
 
         else return FALSE;
     }