fixes bug 414369

[wxWidgets.git] / src / msw / xpmhand.cpp

diff --git a/src/msw/xpmhand.cpp b/src/msw/xpmhand.cpp
index a90fa6eba8021c731288e81d96ec372fc081dc7e..7b0a898a5954e1f7ffbfdd07e603fd77f8b77a8a 100644 (file)
--- a/src/msw/xpmhand.cpp
+++ b/src/msw/xpmhand.cpp
@@ -10,172 +10,219 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "xpmhand.h"
+    #pragma implementation "xpmhand.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/palette.h"
-#include "wx/dcmemory.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/palette.h"
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+    #include "wx/icon.h"

 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

-#include "assert.h"
-

 #if wxUSE_XPM_IN_MSW
 #if wxUSE_XPM_IN_MSW

-#define FOR_MSW 1
-#include "../xpm/xpm34.h"
+    #define FOR_MSW 1
+
+    // allow the user to use the system-wide xpm.h by defining
+    // wxUSE_XPM_H_IN_PATH (and always use xpm.h in path if __WX_SETUP_H__ is
+    // defined which means that we use configure as it always add -I../xpm to
+    // the include path if needed)
+    #if !defined(__WX_SETUP_H__) && !defined(wxUSE_XPM_H_IN_PATH)
+        #include "../xpm/xpm.h"
+    #else
+        #include <xpm.h>
+    #endif

 #endif
 
 #include "wx/xpmhand.h"
 #include "wx/msw/dib.h"
 
 #endif
 
 #include "wx/xpmhand.h"
 #include "wx/msw/dib.h"
 

+#if wxUSE_XPM_IN_MSW
+
+static void XpmToBitmap(wxBitmap *bitmap,
+                        const XImage *ximage,
+                        const XImage *xmask,
+                        const XpmAttributes& xpmAttr)
+{
+    wxBitmapRefData *refData = bitmap->GetBitmapData();
+    refData->m_hBitmap = (WXHBITMAP)ximage->bitmap;
+
+    // first set the bitmap width, height, depth...
+    BITMAP bm;
+    if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(bm), (LPSTR) & bm) )
+    {
+        wxLogLastError(wxT("GetObject(bitmap)"));
+    }
+
+    refData->m_width     = bm.bmWidth;
+    refData->m_height    = bm.bmHeight;
+    refData->m_depth     = bm.bmPlanes * bm.bmBitsPixel;
+    refData->m_numColors = xpmAttr.npixels;
+
+    // GRG Jan/2000, mask support
+    if (xmask)
+    {
+        wxMask *mask = new wxMask();
+        mask->SetMaskBitmap((WXHBITMAP) wxInvertMask(xmask->bitmap,
+                                                     bm.bmWidth, bm.bmHeight));
+        bitmap->SetMask(mask);
+    }
+}
+
+#endif // wxUSE_XPM_IN_MSW
+

 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 

-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                long flags,
+                                int desiredWidth, int desiredHeight)

 {
 #if wxUSE_XPM_IN_MSW
 {
 #if wxUSE_XPM_IN_MSW

-    XImage *ximage;
+    XImage *ximage = NULL;
+    XImage *xmask = NULL;

     XpmAttributes xpmAttr;
     HDC     dc;
 
     XpmAttributes xpmAttr;
     HDC     dc;
 

-    M_BITMAPHANDLERDATA->m_ok = FALSE;

     dc = CreateCompatibleDC(NULL);
     if (dc)
     {
     dc = CreateCompatibleDC(NULL);
     if (dc)
     {

-      xpmAttr.valuemask = XpmReturnPixels;
-      int errorStatus = XpmReadFileToImage(&dc, wxMBSTRINGCAST name.mb_str(wxConvFile), &ximage, (XImage **) NULL, &xpmAttr);
-      DeleteDC(dc);
-      if (errorStatus == XpmSuccess)
-      {
-        M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
+        xpmAttr.valuemask = XpmReturnPixels | XpmColorTable;
+        int errorStatus = XpmReadFileToImage(&dc,
+                                             wxMBSTRINGCAST name.fn_str(),
+                                             &ximage,
+                                             &xmask,
+                                             &xpmAttr);
+        DeleteDC(dc);
+        if (errorStatus == XpmSuccess)
+        {
+            XpmToBitmap(bitmap, ximage, xmask, xpmAttr);

 
 

-        BITMAP  bm;
-        GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
+            XpmFree(xpmAttr.pixels);
+            XpmFreeAttributes(&xpmAttr);
+            XImageFree(ximage);
+            if (xmask)
+                XDestroyImage(xmask);
+        }

 
 

-        M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-        M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-        M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-        XpmFreeAttributes(&xpmAttr);
-        XImageFree(ximage);
+#if WXWIN_COMPATIBILITY_2
+        bitmap->SetOk(errorStatus == XpmSuccess);
+#endif // WXWIN_COMPATIBILITY_2

 
 

-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        return TRUE;
-      }
-      else
-      {
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        return FALSE;
-      }
+        return bitmap->Ok();

     }
     }

-#endif
+#endif // wxUSE_XPM_IN_MSW

 
     return FALSE;
 }
 
 
     return FALSE;
 }
 

-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                int type,
+                                const wxPalette *palette)

 {
 #if wxUSE_XPM_IN_MSW
 {
 #if wxUSE_XPM_IN_MSW

-    HDC     dc = NULL;
-    
-    XImage  ximage;
-    
-    dc = CreateCompatibleDC(NULL);
+    XImage ximage;
+    XImage xmask;
+    bool hasmask = FALSE;
+
+    HDC dc = CreateCompatibleDC(NULL);

     if (dc)
     {
     if (dc)
     {

-        if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap))
+        /* fill the XImage struct 'by hand' */
+        wxBitmapRefData *refData = bitmap->GetBitmapData();
+        ximage.width  = refData->m_width;
+        ximage.height = refData->m_height;
+        ximage.depth  = refData->m_depth;
+        ximage.bitmap = (HBITMAP)refData->m_hBitmap;
+
+        // GRG Jan/2000, mask support
+        hasmask = (refData->m_bitmapMask != NULL);
+        if (hasmask)

         {
         {

-            /* for following SetPixel */
-            /* fill the XImage struct 'by hand' */
-            ximage.width = M_BITMAPHANDLERDATA->m_width; 
-            ximage.height = M_BITMAPHANDLERDATA->m_height;
-            ximage.depth = M_BITMAPHANDLERDATA->m_depth; 
-            ximage.bitmap = (HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap;
-            int errorStatus = XpmWriteFileFromImage(&dc, wxMBSTRINGCAST name.mb_str(wxConvFile),
-                &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
-            
-            if (dc)
-                DeleteDC(dc);
-            
-            if (errorStatus == XpmSuccess)
-                return TRUE;    /* no error */
-            else
-                return FALSE;
-        } else return FALSE;
-    } else return FALSE;
-#else
+            /* Strangely enough, the MSW version of xpmlib is not
+             * coherent with itself regarding masks; we have to invert
+             * the mask we get when loading, but we still must pass it
+             * 'as is' when saving...
+             */
+            xmask.bitmap = (HBITMAP) refData->m_bitmapMask->GetMaskBitmap();
+            xmask.width  = refData->m_width;
+            xmask.height = refData->m_height;
+            xmask.depth  = 1;
+        }
+
+        int errorStatus = XpmWriteFileFromImage(
+            &dc,
+            wxMBSTRINGCAST name.fn_str(),
+            &ximage,
+            (hasmask? &xmask : (XImage *)NULL),
+            (XpmAttributes *) NULL);
+
+        DeleteDC(dc);
+
+        return (errorStatus == XpmSuccess);
+    }
+#endif // !wxUSE_XPM_IN_MSW
+

     return FALSE;
     return FALSE;

-#endif

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 

-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
+bool wxXPMDataHandler::Create(wxBitmap *bitmap,
+                              void *data,
+                              long flags,
+                              int width,
+                              int height,
+                              int depth)

 {
 #if wxUSE_XPM_IN_MSW
 {
 #if wxUSE_XPM_IN_MSW

-  XImage *ximage;
-  int     ErrorStatus;
+  XImage *ximage = NULL;
+  XImage *xmask = NULL;

   XpmAttributes xpmAttr;
   XpmAttributes xpmAttr;

-  HDC     dc;

 
 

-  M_BITMAPHANDLERDATA->m_ok = FALSE;
-  M_BITMAPHANDLERDATA->m_numColors = 0;
-
-  dc = CreateCompatibleDC(NULL);  /* memory DC */
+  HDC dc = CreateCompatibleDC(NULL);  /* memory DC */

 
   if (dc)
   {
 
   if (dc)
   {

-    xpmAttr.valuemask = XpmReturnInfos; /* get infos back */
-    ErrorStatus = XpmCreateImageFromData(&dc, (char **)data,
-         &ximage, (XImage **) NULL, &xpmAttr);
-
-    if (ErrorStatus == XpmSuccess)
-    {
-      /* ximage is malloced and contains bitmap and attributes */
-      M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
+      xpmAttr.valuemask = XpmReturnInfos | XpmColorTable;
+      int errorStatus = XpmCreateImageFromData(&dc, (char **)data,
+                                               &ximage,
+                                               &xmask,
+                                               &xpmAttr);
+      DeleteDC(dc);

 
 

-      BITMAP  bm;
-      GetObject((HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
+      if ( errorStatus == XpmSuccess )
+      {
+          XpmToBitmap(bitmap, ximage, xmask, xpmAttr);

 
 

-      M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-      M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-      M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-      M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-      XpmFreeAttributes(&xpmAttr);
+          XpmFree(xpmAttr.pixels);
+          XpmFreeAttributes(&xpmAttr);
+          XImageFree(ximage); // releases the malloc, but does not destroy bitmap
+          if (xmask)
+              XDestroyImage(xmask);
+      }

 
 

-      XImageFree(ximage); // releases the malloc, but does not detroy
-                          // the bitmap
-      M_BITMAPHANDLERDATA->m_ok = TRUE;
-      DeleteDC(dc);
+#if WXWIN_COMPATIBILITY_2
+      bitmap->SetOk(errorStatus == XpmSuccess);
+#endif // WXWIN_COMPATIBILITY_2

 
 

-      return TRUE;
-    } 
-    else
-    {
-      M_BITMAPHANDLERDATA->m_ok = FALSE;
-//    XpmDebugError(ErrorStatus, NULL);
-      DeleteDC(dc);
-      return FALSE;
-    }
+      return bitmap->Ok();

   }
   }

-#endif
+#endif // wxUSE_XPM_IN_MSW

 
   return FALSE;
 }
 
   return FALSE;
 }