X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/020a1653a4ac95d1dd9c9e918a859d6d6d83d3fe..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/os2/bitmap.cpp?ds=sidebyside diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 2bf5a7dc48..bdd712eeee 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.cpp +// Name: src/os2/bitmap.cpp // Purpose: wxBitmap // Author: David Webster // Modified by: @@ -9,13 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "bitmap.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include @@ -24,15 +22,15 @@ #include "wx/app.h" #include "wx/palette.h" #include "wx/dcmemory.h" - #include "wx/bitmap.h" #include "wx/icon.h" + #include "wx/log.h" + #include "wx/image.h" #endif +#include "wx/os2/dc.h" #include "wx/os2/private.h" -#include "wx/log.h" -//#include "wx/msw/dib.h" -#include "wx/image.h" +#include "wx/xpmdecod.h" // ---------------------------------------------------------------------------- // macros @@ -57,42 +55,61 @@ wxBitmapRefData::wxBitmapRefData() m_pSelectedInto = NULL; m_nNumColors = 0; m_pBitmapMask = NULL; - m_hBitmap = (WXHBITMAP) NULL; + m_hBitmap = (WXHBITMAP) NULL; } // end of wxBitmapRefData::wxBitmapRefData -void wxBitmapRefData::Free() +wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy) { - wxASSERT_MSG( !m_pSelectedInto, - wxT("deleting bitmap still selected into wxMemoryDC") ); + m_nQuality = tocopy.m_nQuality; + m_pSelectedInto = NULL; // don't copy this + m_nNumColors = tocopy.m_nNumColors; + + // copy the mask + if (tocopy.m_pBitmapMask) + m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask); + m_hBitmap = wxCopyBmp(tocopy.m_hBitmap); +} + +void wxBitmapRefData::Free() +{ + if ( m_pSelectedInto ) + { + wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); + } if (m_hBitmap) { - if ( !::GpiDeleteBitmap((HBITMAP)m_hBitmap) ) + if (!::GpiDeleteBitmap((HBITMAP)m_hBitmap)) { - wxLogLastError("GpiDeleteBitmap(hbitmap)"); + wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)")); } } - - delete m_pBitmapMask; - m_pBitmapMask = NULL; + if (m_pBitmapMask) + { + delete m_pBitmapMask; + m_pBitmapMask = NULL; + } } // end of wxBitmapRefData::Free // ---------------------------------------------------------------------------- // wxBitmap creation // ---------------------------------------------------------------------------- +wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const +{ + return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data)); +} + // this function should be called from all wxBitmap ctors void wxBitmap::Init() { - // m_refData = NULL; done in the base class ctor - - if (wxTheBitmapList) - wxTheBitmapList->AddBitmap(this); + m_bIsMono = false; + // + // True for all bitmaps created from bits, wxImages, Xpms + // } // end of wxBitmap::Init -bool wxBitmap::CopyFromIconOrCursor( - const wxGDIImage& rIcon -) +bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon) { HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); POINTERINFO SIconInfo; @@ -100,7 +117,7 @@ bool wxBitmap::CopyFromIconOrCursor( if (!::WinQueryPointerInfo(hIcon, &SIconInfo)) { wxLogLastError(wxT("WinQueryPointerInfo")); - return FALSE; + return false; } wxBitmapRefData* pRefData = new wxBitmapRefData; @@ -115,10 +132,12 @@ bool wxBitmap::CopyFromIconOrCursor( pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor; - // - // No mask in the Info struct in OS/2 - // - return(TRUE); + wxMask* pMask = new wxMask(SIconInfo.hbmPointer); + + pMask->SetMaskBitmap(GetHBITMAP()); + SetMask(pMask); + + return true; } // end of wxBitmap::CopyFromIconOrCursor bool wxBitmap::CopyFromCursor( @@ -128,7 +147,7 @@ bool wxBitmap::CopyFromCursor( UnRef(); if (!rCursor.Ok()) - return(FALSE); + return(false); return(CopyFromIconOrCursor(rCursor)); } // end of wxBitmap::CopyFromCursor @@ -139,22 +158,20 @@ bool wxBitmap::CopyFromIcon( UnRef(); if (!rIcon.Ok()) - return(FALSE); + return(false); return CopyFromIconOrCursor(rIcon); } // end of wxBitmap::CopyFromIcon wxBitmap::~wxBitmap() { - if (wxTheBitmapList) - wxTheBitmapList->DeleteObject(this); } // end of wxBitmap::~wxBitmap wxBitmap::wxBitmap( const char zBits[] -, int nTheWidth -, int nTheHeight -, int nNoBits +, int nWidth +, int nHeight +, int nDepth ) { Init(); @@ -166,80 +183,97 @@ wxBitmap::wxBitmap( HPS hPs; DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; SIZEL vSize = {0, 0}; + char* pzData; wxASSERT(vHabmain != NULL); - hDc = ::DevOpenDC(vHabmain, OD_MEMORY, (PSZ)"*", 1L, (PDEVOPENDATA)&vDop, 0L); + m_refData = pRefData; - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)nTheWidth; - vHeader.cy = (USHORT)nTheHeight; - vHeader.cPlanes = 1L; - vHeader.cBitCount = nNoBits; - vHeader.ulCompression = BCA_UNCOMP; - vHeader.cxResolution = 0; - vHeader.cyResolution = 0; - vHeader.cclrUsed = 0; - vHeader.cclrImportant = 0; - vHeader.usUnits = BRU_METRIC; - vHeader.usRecording = BRA_BOTTOMUP; - vHeader.usRendering = BRH_NOTHALFTONED; - vHeader.cSize1 = 0; - vHeader.cSize2 = 0; - vHeader.ulColorEncoding = 0; - vHeader.ulIdentifier = 0; + pRefData->m_nWidth = nWidth; + pRefData->m_nHeight = nHeight; + pRefData->m_nDepth = nDepth; + pRefData->m_nNumColors = 0; + pRefData->m_pSelectedInto = NULL; + hDc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS); if (hPs == 0) { - wxLogLastError("GpiCreatePS Failure"); + wxLogLastError(wxT("GpiCreatePS Failure")); } - m_refData = pRefData; - - pRefData->m_nWidth = nTheWidth; - pRefData->m_nHeight = nTheHeight; - pRefData->m_nDepth = nNoBits; - pRefData->m_nNumColors = 0; - pRefData->m_pSelectedInto = NULL; - - HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, 0L, NULL, &vInfo); - if (!hBmp) + if (nDepth == 1) + { + // + // We assume that it is in XBM format which is not quite the same as + // the format CreateBitmap() wants because the order of bytes in the + // line is reversed! + // + const size_t nBytesPerLine = (nWidth + 7) / 8; + const size_t nPadding = nBytesPerLine % 2; + const size_t nLen = nHeight * (nPadding + nBytesPerLine); + const char* pzSrc = zBits; + int nRows; + size_t nCols; + + pzData = (char *)malloc(nLen); + + char* pzDst = pzData; + + for (nRows = 0; nRows < nHeight; nRows++) + { + for (nCols = 0; nCols < nBytesPerLine; nCols++) + { + unsigned char ucVal = *pzSrc++; + unsigned char ucReversed = 0; + int nBits; + + for (nBits = 0; nBits < 8; nBits++) + { + ucReversed <<= 1; + ucReversed = (unsigned char)(ucReversed | (ucVal & 0x01)); + ucVal >>= 1; + } + *pzDst++ = ucReversed; + } + if (nPadding) + *pzDst++ = 0; + } + } + else { - wxLogLastError("CreateBitmap"); + // + // Bits should already be in Windows standard format + // + pzData = (char *)zBits; // const_cast is harmless } - SetHBITMAP((WXHBITMAP)hBmp); -} // end of wxBitmap::wxBitmap -// -// Create from XPM data -// -wxBitmap::wxBitmap( - char** ppData -) -{ - Init(); + if (nDepth > 24) + nDepth = 24; // MAX supported in PM + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; + vHeader.cx = (USHORT)nWidth; + vHeader.cy = (USHORT)nHeight; + vHeader.cPlanes = 1L; + vHeader.cBitCount = (USHORT)nDepth; + vHeader.usReserved = 0; - (void)Create( (void *)ppData - ,wxBITMAP_TYPE_XPM_DATA - ,0 - ,0 - ,0 - ); -} // end of wxBitmap::wxBitmap + memset(&vInfo, '\0', 16); + vInfo.cbFix = 16; + vInfo.cx = (USHORT)nWidth; + vInfo.cy = (USHORT)nHeight; + vInfo.cPlanes = 1L; + vInfo.cBitCount = (USHORT)nDepth; -wxBitmap::wxBitmap( - const char** ppData -) -{ - Init(); + HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo); - (void)Create( (void *)ppData - ,wxBITMAP_TYPE_XPM_DATA - ,0 - ,0 - ,0 - ); + if (!hBmp) + { + wxLogLastError(wxT("CreateBitmap")); + } + ::GpiDestroyPS(hPs); + ::DevCloseDC(hDc); + SetHBITMAP((WXHBITMAP)hBmp); } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( @@ -249,7 +283,6 @@ wxBitmap::wxBitmap( ) { Init(); - (void)Create( nW ,nH ,nD @@ -257,8 +290,8 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - void* pData -, long lType + const void* pData +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -275,15 +308,15 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - const wxString& rFilename -, long lType + int nId +, wxBitmapType lType ) { Init(); - - LoadFile( rFilename - ,(int)lType + LoadFile( nId + ,lType ); + SetId(nId); } // end of wxBitmap::wxBitmap bool wxBitmap::Create( @@ -302,6 +335,10 @@ bool wxBitmap::Create( GetBitmapData()->m_nHeight = nH; GetBitmapData()->m_nDepth = nD; + // + // Xpms and bitmaps from other images can also be mono's, but only + // mono's need help changing their colors with MemDC changes + // if (nD > 0) { DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; @@ -309,12 +346,14 @@ bool wxBitmap::Create( HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); - memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); - vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + if (nD == 1) + m_bIsMono = true; + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; vHeader.cx = nW; vHeader.cy = nH; vHeader.cPlanes = 1; - vHeader.cBitCount = nD; + vHeader.cBitCount = 24; //nD; hBmp = ::GpiCreateBitmap( hPS ,&vHeader @@ -335,12 +374,15 @@ bool wxBitmap::Create( hDCScreen = ::GpiQueryDevice(hPSScreen); ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); - memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); - vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + if (lBitCount > 24) + lBitCount = 24; + + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; vHeader.cx = nW; vHeader.cy = nH; vHeader.cPlanes = 1; - vHeader.cBitCount = lBitCount; + vHeader.cBitCount = (USHORT)lBitCount; hBmp = ::GpiCreateBitmap( hPSScreen ,&vHeader @@ -354,20 +396,42 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); -#if WXWIN_COMPATIBILITY_2 - GetBitmapData()->m_bOk = hBmp != 0; -#endif // WXWIN_COMPATIBILITY_2 - return Ok(); } // end of wxBitmap::Create +bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type) +{ + UnRef(); + + wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler); + + if ( handler ) + { + m_refData = new wxBitmapRefData; + + return handler->LoadFile(this, filename, type, -1, -1); + } +#if wxUSE_IMAGE + else // no bitmap handler found + { + wxImage image; + if ( image.LoadFile( filename, type ) && image.Ok() ) + { + *this = wxBitmap(image); + + return true; + } + } +#endif // wxUSE_IMAGE + + return false; +} + bool wxBitmap::LoadFile( - const wxString& rFilename -, long lType + int nId +, wxBitmapType lType ) { - HPS hPs = NULLHANDLE; - UnRef(); wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) @@ -379,8 +443,7 @@ bool wxBitmap::LoadFile( m_refData = new wxBitmapRefData; return(pHandler->LoadFile( this - ,rFilename - ,hPs + ,nId ,lType , -1 , -1 @@ -388,20 +451,13 @@ bool wxBitmap::LoadFile( } else { - wxImage vImage; - - if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() ) - return(FALSE); - - *this = vImage.ConvertToBitmap(); - - return(TRUE); + return false; } } // end of wxBitmap::LoadFile bool wxBitmap::Create( - void* pData -, long lType + const void* pData +, wxBitmapType lType , int nWidth , int nHeight , int nDepth @@ -415,10 +471,9 @@ bool wxBitmap::Create( if (!pHandler) { - wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for " - "type %d defined."), lType); + wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), lType); - return(FALSE); + return false; } m_refData = new wxBitmapRefData; @@ -434,7 +489,7 @@ bool wxBitmap::Create( bool wxBitmap::SaveFile( const wxString& rFilename -, int lType +, wxBitmapType lType , const wxPalette* pPalette ) { @@ -453,10 +508,10 @@ bool wxBitmap::SaveFile( else { // FIXME what about palette? shouldn't we use it? - wxImage vImage(*this); + wxImage vImage = ConvertToImage(); if (!vImage.Ok()) - return(FALSE); + return false; return(vImage.SaveFile( rFilename ,lType @@ -464,6 +519,568 @@ bool wxBitmap::SaveFile( } } // end of wxBitmap::SaveFile + +// ---------------------------------------------------------------------------- +// wxImage-wxBitmap conversion +// ---------------------------------------------------------------------------- + +bool wxBitmap::CreateFromImage ( + const wxImage& rImage +, int nDepth +) +{ + wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + m_refData = new wxBitmapRefData(); + + int nSizeLimit = 1024 * 768 * 3; + int nWidth = rImage.GetWidth(); + int nBmpHeight = rImage.GetHeight(); + int nBytePerLine = nWidth * 3; + int nSizeDWORD = sizeof(DWORD); + int nLineBoundary = nBytePerLine % nSizeDWORD; + int nPadding = 0; + + if (nLineBoundary > 0) + { + nPadding = nSizeDWORD - nLineBoundary; + nBytePerLine += nPadding; + } + + // + // Calc the number of DIBs and heights of DIBs + // + int nNumDIB = 1; + int nHRemain = 0; + int nHeight = nSizeLimit / nBytePerLine; + + if (nHeight >= nBmpHeight) + nHeight = nBmpHeight; + else + { + nNumDIB = nBmpHeight / nHeight; + nHRemain = nBmpHeight % nHeight; + if (nHRemain > 0) + nNumDIB++; + } + + // + // Set bitmap parameters + // + wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image")); + SetWidth(nWidth); + SetHeight(nBmpHeight); + if (nDepth == 1) + m_bIsMono = true; + else + m_bIsMono = false; + if (nDepth == -1) + nDepth = wxDisplayDepth(); + SetDepth(nDepth); + +#if wxUSE_PALETTE + // + // Copy the palette from the source image + // + SetPalette(rImage.GetPalette()); +#endif // wxUSE_PALETTE + + // + // Create a DIB header + // + BITMAPINFOHEADER2 vHeader; + BITMAPINFO2 vInfo; + + // + // Fill in the DIB header + // + memset(&vHeader, '\0', 16); + vHeader.cbFix = 16; + vHeader.cx = (ULONG)nWidth; + vHeader.cy = (ULONG)nHeight; + vHeader.cPlanes = 1L; + vHeader.cBitCount = 24; + + // + // Memory for DIB data + // + unsigned char* pucBits; + + pucBits = (unsigned char *)malloc(nBytePerLine * nHeight); + if(!pucBits) + { + wxFAIL_MSG(wxT("could not allocate memory for DIB")); + return false; + } + memset(pucBits, '\0', (nBytePerLine * nHeight)); + + // + // Create and set the device-dependent bitmap + // + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + SIZEL vSize = {0, 0}; + HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); + LONG lScans; + HDC hDCScreen = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSScreen; + HBITMAP hBmp; + HBITMAP hBmpOld; + + memset(&vInfo, '\0', 16); + vInfo.cbFix = 16; + vInfo.cx = (ULONG)nWidth; + vInfo.cy = (ULONG)nHeight; + vInfo.cPlanes = 1; + vInfo.cBitCount = 24; // Set to desired count going in + + hBmp = ::GpiCreateBitmap( hPS + ,&vHeader + ,0L + ,NULL + ,NULL + ); +#if wxUSE_PALETTE + HPAL hOldPalette = NULLHANDLE; + if (rImage.GetPalette().Ok()) + { + hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE()); + } +#endif // wxUSE_PALETTE + + // + // Copy image data into DIB data and then into DDB (in a loop) + // + unsigned char* pData = rImage.GetData(); + int i; + int j; + int n; + int nOrigin = 0; + unsigned char* ptdata = pData; + unsigned char* ptbits; + + if ((hBmpOld = ::GpiSetBitmap(hPS, hBmp)) == HBM_ERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + for (n = 0; n < nNumDIB; n++) + { + if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0) + { + // + // Redefine height and size of the (possibly) last smaller DIB + // memory is not reallocated + // + nHeight = nHRemain; + vHeader.cy = (DWORD)(nHeight); + vHeader.cbImage = nBytePerLine * nHeight; + } + ptbits = pucBits; + for (j = 0; j < nHeight; j++) + { + for (i = 0; i < nWidth; i++) + { + *(ptbits++) = *(ptdata + 2); + *(ptbits++) = *(ptdata + 1); + *(ptbits++) = *(ptdata); + ptdata += 3; + } + for (i = 0; i < nPadding; i++) + *(ptbits++) = 0; + } + + // + // Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt + // in combination with setting the bits into the selected bitmap + // + if ((lScans = ::GpiSetBitmapBits( hPS + ,0 // Start at the bottom + ,(LONG)nHeight // One line per scan + ,(PBYTE)pucBits + ,&vInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + hPSScreen = ::GpiCreatePS( vHabmain + ,hDCScreen + ,&vSize + ,PU_PELS | GPIA_ASSOC + ); + + POINTL vPoint[4] = { {0, nOrigin}, + {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} + }; + + + ::GpiBitBlt( hPSScreen + ,hPS + ,4 + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + ::GpiDestroyPS(hPSScreen); + nOrigin += nHeight; + } + SetHBITMAP((WXHBITMAP)hBmp); +#if wxUSE_PALETTE + if (hOldPalette) + ::GpiSelectPalette(hPS, hOldPalette); +#endif // wxUSE_PALETTE + + // + // Similarly, created an mono-bitmap for the possible mask + // + if (rImage.HasMask()) + { + vHeader.cbFix = 16; + vHeader.cx = nWidth; + vHeader.cy = nHeight; + vHeader.cPlanes = 1; + vHeader.cBitCount = 24; + hBmp = ::GpiCreateBitmap( hPS + ,&vHeader + ,0L + ,NULL + ,NULL + ); + hBmpOld = ::GpiSetBitmap(hPS, hBmp); + if (nNumDIB == 1) + nHeight = nBmpHeight; + else + nHeight = nSizeLimit / nBytePerLine; + vHeader.cy = (DWORD)(nHeight); + nOrigin = 0; + + unsigned char cRed = rImage.GetMaskRed(); + unsigned char cGreen = rImage.GetMaskGreen(); + unsigned char cBlue = rImage.GetMaskBlue(); + unsigned char cZero = 0; + unsigned char cOne = 255; + + ptdata = pData; + for (n = 0; n < nNumDIB; n++) + { + if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0) + { + // + // Redefine height and size of the (possibly) last smaller DIB + // memory is not reallocated + // + nHeight = nHRemain; + vHeader.cy = (DWORD)(nHeight); + vHeader.cbImage = nBytePerLine * nHeight; + } + ptbits = pucBits; + for (int j = 0; j < nHeight; j++) + { + for (i = 0; i < nWidth; i++) + { + unsigned char cRedImage = (*(ptdata++)) ; + unsigned char cGreenImage = (*(ptdata++)) ; + unsigned char cBlueImage = (*(ptdata++)) ; + + if ((cRedImage != cRed) || (cGreenImage != cGreen) || (cBlueImage != cBlue)) + { + *(ptbits++) = cOne; + *(ptbits++) = cOne; + *(ptbits++) = cOne; + } + else + { + *(ptbits++) = cZero; + *(ptbits++) = cZero; + *(ptbits++) = cZero; + } + } + for (i = 0; i < nPadding; i++) + *(ptbits++) = cZero; + } + lScans = ::GpiSetBitmapBits( hPS + ,0 // Start at the bottom + ,(LONG)nHeight // One line per scan + ,(PBYTE)pucBits + ,&vInfo + ); + hPSScreen = ::GpiCreatePS( vHabmain + ,hDCScreen + ,&vSize + ,PU_PELS | GPIA_ASSOC + ); + POINTL vPoint2[4] = { {0, nOrigin}, + {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} + }; + ::GpiBitBlt( hPSScreen + ,hPS + ,4 + ,vPoint2 + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + ::GpiDestroyPS(hPSScreen); + nOrigin += nHeight; + } + + // + // Create a wxMask object + // + wxMask* pMask = new wxMask(); + + pMask->SetMaskBitmap((WXHBITMAP)hBmp); + SetMask(pMask); + hBmpOld = ::GpiSetBitmap(hPS, hBmpOld); + } + + // + // Free allocated resources + // + ::GpiSetBitmap(hPS, NULLHANDLE); + ::GpiDestroyPS(hPS); + ::DevCloseDC(hDCScreen); + ::DevCloseDC(hDC); + free(pucBits); + return true; +} // end of wxBitmap::CreateFromImage + +wxImage wxBitmap::ConvertToImage() const +{ + wxImage vImage; + wxDC* pDC; + + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + + // + // Create an wxImage object + // + int nWidth = GetWidth(); + int nHeight = GetHeight(); + int nDevWidth; + int nDevHeight; + int nBytePerLine = nWidth * 3; + int nSizeDWORD = sizeof(DWORD); + int nLineBoundary = nBytePerLine % nSizeDWORD; + int nPadding = 0; + unsigned char* pData; + unsigned char* lpBits; + long lScans; + BITMAPINFOHEADER2 vDIBh; + BITMAPINFO2 vDIBInfo; + HPS hPSMem; + HBITMAP hBitmap; + HBITMAP hOldBitmap; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + SIZEL vSizlPage = {0,0}; + HDC hDCMem = NULLHANDLE; + + vImage.Create( nWidth + ,nHeight + ); + pData = vImage.GetData(); + if(!pData) + { + wxFAIL_MSG( wxT("could not allocate data for image") ); + return wxNullImage; + } + if(nLineBoundary > 0) + { + nPadding = nSizeDWORD - nLineBoundary; + nBytePerLine += nPadding; + } + wxDisplaySize( &nDevWidth + ,&nDevHeight + ); + // + // Create and fill a DIB header + // + memset(&vDIBh, '\0', 16); + vDIBh.cbFix = 16; + vDIBh.cx = nWidth; + vDIBh.cy = nHeight; + vDIBh.cPlanes = 1; + vDIBh.cBitCount = 24; + + memset(&vDIBInfo, '\0', 16); + vDIBInfo.cbFix = 16; + vDIBInfo.cx = nWidth; + vDIBInfo.cy = nHeight; + vDIBInfo.cPlanes = 1; + vDIBInfo.cBitCount = 24; + + lpBits = (unsigned char *)malloc(nBytePerLine * nHeight); + if (!lpBits) + { + wxFAIL_MSG(wxT("could not allocate data for DIB")); + free(pData); + return wxNullImage; + } + memset(lpBits, '\0', (nBytePerLine * nHeight)); + hBitmap = (HBITMAP)GetHBITMAP(); + + // + // May already be selected into a PS + // + pDC = GetSelectedInto(); + const wxPMDCImpl *impl; + if (pDC != NULL && + (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL) + { + hPSMem = impl->GetHPS(); + } + else + { + hDCMem = ::DevOpenDC( vHabmain + ,OD_MEMORY + ,"*" + ,5L + ,(PDEVOPENDATA)&vDop + ,NULLHANDLE + ); + hPSMem = ::GpiCreatePS( vHabmain + ,hDCMem + ,&vSizlPage + ,PU_PELS | GPIA_ASSOC + ); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + + // + // Copy data from the device-dependent bitmap to the DIB + // + if ((lScans = ::GpiQueryBitmapBits( hPSMem + ,0L + ,(LONG)nHeight + ,(PBYTE)lpBits + ,&vDIBInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } + + // + // Copy DIB data into the wxImage object + // + int i; + int j; + unsigned char* ptdata = pData; + unsigned char* ptbits = lpBits; + + for (i = 0; i < nHeight; i++) + { + for (j = 0; j < nWidth; j++) + { + *(ptdata++) = *(ptbits+2); + *(ptdata++) = *(ptbits+1); + *(ptdata++) = *(ptbits ); + ptbits += 3; + } + ptbits += nPadding; + } + if ((pDC = GetSelectedInto()) == NULL) + { + ::GpiSetBitmap(hPSMem, NULLHANDLE); + ::GpiDestroyPS(hPSMem); + ::DevCloseDC(hDCMem); + } + + // + // Similarly, set data according to the possible mask bitmap + // + if (GetMask() && GetMask()->GetMaskBitmap()) + { + hBitmap = (HBITMAP)GetMask()->GetMaskBitmap(); + + // + // Memory DC/PS created, color set, data copied, and memory DC/PS deleted + // + HDC hMemDC = ::DevOpenDC( vHabmain + ,OD_MEMORY + ,"*" + ,5L + ,(PDEVOPENDATA)&vDop + ,NULLHANDLE + ); + HPS hMemPS = ::GpiCreatePS( vHabmain + ,hMemDC + ,&vSizlPage + ,PU_PELS | GPIA_ASSOC + ); + ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0)); + ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) ); + ::GpiSetBitmap(hMemPS, hBitmap); + ::GpiQueryBitmapBits( hPSMem + ,0L + ,(LONG)nHeight + ,(PBYTE)lpBits + ,&vDIBInfo + ); + ::GpiSetBitmap(hMemPS, NULLHANDLE); + ::GpiDestroyPS(hMemPS); + ::DevCloseDC(hMemDC); + + // + // Background color set to RGB(16,16,16) in consistent with wxGTK + // + unsigned char ucRed = 16; + unsigned char ucGreen = 16; + unsigned char ucBlue = 16; + + ptdata = pData; + ptbits = lpBits; + for (i = 0; i < nHeight; i++) + { + for (j = 0; j < nWidth; j++) + { + if (*ptbits != 0) + ptdata += 3; + else + { + *(ptdata++) = ucRed; + *(ptdata++) = ucGreen; + *(ptdata++) = ucBlue; + } + ptbits += 3; + } + ptbits += nPadding; + } + vImage.SetMaskColour( ucRed + ,ucGreen + ,ucBlue + ); + vImage.SetMask(true); + } + else + { + vImage.SetMask(false); + } + + // + // Free allocated resources + // + free(lpBits); + return vImage; +} // end of wxBitmap::ConvertToImage + // ---------------------------------------------------------------------------- // sub bitmap extraction // ---------------------------------------------------------------------------- @@ -494,9 +1111,9 @@ wxBitmap wxBitmap::GetSubBitmap( HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { rRect.x, rRect.y, - rRect.x + rRect.width, rRect.y + rRect.height, - 0, 0, GetWidth(), GetHeight() + POINTL vPoint[4] = { {0, 0}, {rRect.width, rRect.height}, + {rRect.x, rRect.y}, + {rRect.x + rRect.width, rRect.y + rRect.height} }; ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); @@ -521,7 +1138,7 @@ wxBitmap wxBitmap::GetSubBitmap( vBmih.cx = rRect.width; vBmih.cy = rRect.height; vBmih.cPlanes = 1; - vBmih.cBitCount = 1; + vBmih.cBitCount = 24; HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst ,&vBmih @@ -569,17 +1186,6 @@ void wxBitmap::SetQuality( GetBitmapData()->m_nQuality = nQ; } // end of wxBitmap::SetQuality -#if WXWIN_COMPATIBILITY_2 -void wxBitmap::SetOk( - bool bOk -) -{ - EnsureHasData(); - - GetBitmapData()->m_bOk = bOk; -} // end of wxBitmap::SetOk -#endif // WXWIN_COMPATIBILITY_2 - void wxBitmap::SetPalette( const wxPalette& rPalette ) @@ -598,34 +1204,9 @@ void wxBitmap::SetMask( GetBitmapData()->m_pBitmapMask = pMask; } // end of wxBitmap::SetMask -// -// Will try something for OS/2 but not really sure how close -// to the msw intent this is. -// -wxBitmap wxBitmap::GetBitmapForDC( - wxDC& rDc -) const +wxBitmap wxBitmap::GetBitmapForDC(wxDC& WXUNUSED(rDc)) const { - wxMemoryDC vMemDC; - wxBitmap vTmpBitmap( this->GetWidth() - ,this->GetHeight() - ,rDc.GetDepth() - ); - WXHBITMAP vOldBitmap; - HPS hMemoryPS; - HPS hPs; - POINTL vPoint[4]; - SIZEL vSize = {0,0}; - - hMemoryPS = ::GpiCreatePS(vHabmain, (HDC)vMemDC.GetHDC(), &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - hPs = ::GpiCreatePS(vHabmain, (HDC)rDc.GetHDC(), &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - - // TODO: Set the points - - vOldBitmap = (WXHBITMAP)::GpiSetBitmap(hPs, (HBITMAP)vTmpBitmap.GetHBITMAP()); - ::GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY, BBO_IGNORE); - - return(vTmpBitmap); + return(*this); } // end of wxBitmap::GetBitmapForDC // ---------------------------------------------------------------------------- @@ -637,6 +1218,11 @@ wxMask::wxMask() m_hMaskBitmap = 0; } // end of wxMask::wxMask +wxMask::wxMask(const wxMask& tocopy) +{ + m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap); +} // end of wxMask::wxMask + // Construct a mask from a bitmap and a colour indicating // the transparent area wxMask::wxMask( @@ -690,8 +1276,8 @@ bool wxMask::Create( HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), - 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + POINTL vPoint[4] = { {0 ,0}, {rBitmap.GetWidth(), rBitmap.GetHeight()}, + {0, 0}, {rBitmap.GetWidth(), rBitmap.GetHeight()} }; if (m_hMaskBitmap) @@ -701,7 +1287,7 @@ bool wxMask::Create( } if (!rBitmap.Ok() || rBitmap.GetDepth() != 1) { - return(FALSE); + return false; } memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); @@ -709,7 +1295,7 @@ bool wxMask::Create( vBmih.cx = rBitmap.GetWidth(); vBmih.cy = rBitmap.GetHeight(); vBmih.cPlanes = 1; - vBmih.cBitCount = 1; + vBmih.cBitCount = 24; m_hMaskBitmap = ::GpiCreateBitmap( hPSDst ,&vBmih @@ -732,7 +1318,7 @@ bool wxMask::Create( ::GpiDestroyPS(hPSDst); ::DevCloseDC(hDCSrc); ::DevCloseDC(hDCDst); - return(TRUE); + return true; } // end of wxMask::Create // Create a mask from a bitmap and a palette index indicating @@ -769,7 +1355,7 @@ bool wxMask::Create( )); } } - return(FALSE); + return false; } // end of wxMask::Create // Create a mask from a bitmap and a colour indicating @@ -779,7 +1365,7 @@ bool wxMask::Create( , const wxColour& rColour ) { - bool bOk = TRUE; + bool bOk = true; COLORREF vMaskColour = OS2RGB( rColour.Red() ,rColour.Green() ,rColour.Blue() @@ -791,9 +1377,6 @@ bool wxMask::Create( HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), - 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() - }; if (m_hMaskBitmap) { @@ -802,7 +1385,7 @@ bool wxMask::Create( } if (!rBitmap.Ok()) { - return(FALSE); + return false; } // @@ -843,7 +1426,7 @@ bool wxMask::Create( // // Doesn't make sense to continue // - bOk = FALSE; + bOk = false; break; } @@ -865,39 +1448,37 @@ bool wxMask::Create( ::GpiDestroyPS(hPSDst); ::DevCloseDC(hDCSrc); ::DevCloseDC(hDCDst); - return(TRUE); + return true; } // end of wxMask::Create // ---------------------------------------------------------------------------- // wxBitmapHandler // ---------------------------------------------------------------------------- -bool wxBitmapHandler::Create( - wxGDIImage* pImage -, void* pData -, long lFlags -, int nWidth -, int nHeight -, int nDepth -) +bool wxBitmapHandler::Create( wxGDIImage* pImage, + const void* pData, + wxBitmapType lType, + int nWidth, + int nHeight, + int nDepth) { - wxBitmap* pBitmap = wxDynamicCast( pImage - ,wxBitmap - ); + wxBitmap* pBitmap = wxDynamicCast( pImage + ,wxBitmap + ); return(pBitmap ? Create( pBitmap ,pData + ,lType ,nWidth ,nHeight ,nDepth - ) : FALSE); + ) : false); } bool wxBitmapHandler::Load( wxGDIImage* pImage -, const wxString& rName -, HPS hPs -, long lFlags +, int nId +, wxBitmapType lFlags , int nWidth , int nHeight ) @@ -907,19 +1488,18 @@ bool wxBitmapHandler::Load( ); return(pBitmap ? LoadFile( pBitmap - ,rName - ,hPs + ,nId ,lFlags ,nWidth ,nHeight - ) : FALSE); + ) : false); } bool wxBitmapHandler::Save( - wxGDIImage* pImage + const wxGDIImage* pImage , const wxString& rName -, int lType -) +, wxBitmapType lType +) const { wxBitmap* pBitmap = wxDynamicCast( pImage ,wxBitmap @@ -928,41 +1508,51 @@ bool wxBitmapHandler::Save( return(pBitmap ? SaveFile( pBitmap ,rName ,lType - ) : FALSE); + ) : false); } bool wxBitmapHandler::Create( wxBitmap* WXUNUSED(pBitmap) -, void* WXUNUSED(pData) -, long WXUNUSED(lType) +, const void* WXUNUSED(pData) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nWidth) , int WXUNUSED(nHeight) , int WXUNUSED(nDepth) ) { - return(FALSE); + return false; +} + +bool wxBitmapHandler::LoadFile( + wxBitmap* WXUNUSED(pBitmap) +, int WXUNUSED(nId) +, wxBitmapType WXUNUSED(lType) +, int WXUNUSED(nDesiredWidth) +, int WXUNUSED(nDesiredHeight) +) +{ + return false; } bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, HPS WXUNUSED(hPs) -, long WXUNUSED(lType) +, wxBitmapType WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) { - return(FALSE); + return false; } bool wxBitmapHandler::SaveFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) -, int WXUNUSED(nType) +, wxBitmapType WXUNUSED(nType) , const wxPalette* WXUNUSED(pPalette) -) +) const { - return(FALSE); + return false; } // ---------------------------------------------------------------------------- @@ -989,26 +1579,26 @@ HBITMAP wxInvertMask( ,&vBmhdr ); nWidth = (int)vBmhdr.cx; - nHeight = (int)vBmhdr.cyt; + nHeight = (int)vBmhdr.cy; } BITMAPINFOHEADER2 vBmih; SIZEL vSize = {0, 0}; DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; - HDC hDCSrc = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HDC hDCDst = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); - HPS hPSSrc = ::GpiCreatePS(ghAb, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); - HPS hPSDst = ::GpiCreatePS(ghAb, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); - POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), - 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); + HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); + HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); + POINTL vPoint[4] = { {0 ,0}, {nWidth, nHeight}, + {0, 0}, {nWidth, nHeight} }; - memset(&vBmih, NULLC, sizeof(BITMAPINFOHEADER2)); - vBmih.cbFix = sizeof(BITMAPINFOHEADER2); - vBmih.cx = lWidth; - vBmih.cy = lHeight; + memset(&vBmih, '\0', 16); + vBmih.cbFix = 16; + vBmih.cx = nWidth; + vBmih.cy = nHeight; vBmih.cPlanes = 1; - vBmih.cBitCount = 1; + vBmih.cBitCount = 24; hBmpInvMask = ::GpiCreateBitmap( hPSDst ,&vBmih @@ -1023,15 +1613,96 @@ HBITMAP wxInvertMask( ::GpiBitBlt( hPSDst ,hPSSrc ,4L - ,&vPoint - ,ROP_SRCCOPY + ,vPoint + ,ROP_SRCINVERT ,BBO_IGNORE ); ::GpiDestroyPS(hPSSrc); ::GpiDestroyPS(hPSDst); ::DevCloseDC(hDCSrc); - ::DevCloseDC(hDCDtl); + ::DevCloseDC(hDCDst); return hBmpInvMask; } // end of WxWinGdi_InvertMask + +HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight ) +{ + wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxCopyBmp") ); + + // + // Get width/height from the bitmap if not given + // + if (!nWidth || !nHeight) + { + BITMAPINFOHEADER2 vBmhdr; + + vBmhdr.cbFix = 16; + ::GpiQueryBitmapInfoHeader( hBmp, + &vBmhdr ); + nWidth = (int)vBmhdr.cx; + nHeight = (int)vBmhdr.cy; + } + + BITMAPINFOHEADER2 vBmih; + SIZEL vSize = {0, 0}; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + HDC hDCSrc = ::DevOpenDC( vHabmain, + OD_MEMORY, + "*", + 5L, + (PDEVOPENDATA)&vDop, + NULLHANDLE ); + HDC hDCDst = ::DevOpenDC( vHabmain, + OD_MEMORY, + "*", + 5L, + (PDEVOPENDATA)&vDop, + NULLHANDLE ); + HPS hPSSrc = ::GpiCreatePS( vHabmain, + hDCSrc, + &vSize, + PU_PELS | GPIA_ASSOC ); + HPS hPSDst = ::GpiCreatePS( vHabmain, + hDCDst, + &vSize, + PU_PELS | GPIA_ASSOC ); + POINTL vPoint[4] = { {0, nHeight}, + {nWidth, 0}, + {0, 0}, + {nWidth, nHeight} }; + if (!flip) + { + vPoint[0].y = 0; + vPoint[1].y = nHeight; + } + memset(&vBmih, '\0', 16); + vBmih.cbFix = 16; + vBmih.cx = nWidth; + vBmih.cy = nHeight; + vBmih.cPlanes = 1; + vBmih.cBitCount = 24; + + HBITMAP hInvBmp = ::GpiCreateBitmap( hPSDst, + &vBmih, + 0L, + NULL, + NULL ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmp); + ::GpiSetBitmap(hPSDst, (HBITMAP) hInvBmp); + + ::GpiBitBlt( hPSDst, + hPSSrc, + 4L, + vPoint, + ROP_SRCCOPY, + BBO_IGNORE ); + + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + + return hInvBmp; +} // end of wxFlipBmp