X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58b1642453c5858a4dd29425b065e9215cb8ec79..53e46b61bbe4ce72b92c8898907f0a879d5f012b:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 8b7c34da37..eb52b51de1 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ + #pragma implementation "bitmap.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,12 +38,10 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) -#endif // ============================================================================ // implementation @@ -55,7 +57,8 @@ wxBitmapRefData::wxBitmapRefData() m_pSelectedInto = NULL; m_nNumColors = 0; m_pBitmapMask = NULL; -} + m_hBitmap = (WXHBITMAP) NULL; +} // end of wxBitmapRefData::wxBitmapRefData void wxBitmapRefData::Free() { @@ -72,7 +75,7 @@ void wxBitmapRefData::Free() delete m_pBitmapMask; m_pBitmapMask = NULL; -} +} // end of wxBitmapRefData::Free // ---------------------------------------------------------------------------- // wxBitmap creation @@ -85,30 +88,38 @@ void wxBitmap::Init() if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); -} +} // end of wxBitmap::Init bool wxBitmap::CopyFromIconOrCursor( const wxGDIImage& rIcon ) { + HPOINTER hIcon = (HPOINTER)rIcon.GetHandle(); + POINTERINFO SIconInfo; + + if (!::WinQueryPointerInfo(hIcon, &SIconInfo)) + { + wxLogLastError(wxT("WinQueryPointerInfo")); + return FALSE; + } wxBitmapRefData* pRefData = new wxBitmapRefData; m_refData = pRefData; - refData->m_width = rIcon.GetWidth(); - refData->m_height = rIcon.GetHeight(); - refData->m_depth = wxDisplayDepth(); + int nWidth = rIcon.GetWidth(); + int nHeight = rIcon.GetHeight(); - refData->m_hBitmap = (WXHBITMAP)rIcon.GetHandle(); - // no mask??? - refData->m_bitmapMask = new wxMask(); + pRefData->m_nWidth = nWidth; + pRefData->m_nHeight = nHeight; + pRefData->m_nDepth = wxDisplayDepth(); -#if WXWIN_COMPATIBILITY_2 - refData->m_ok = TRUE; -#endif // WXWIN_COMPATIBILITY_2 + pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor; + // + // No mask in the Info struct in OS/2 + // return(TRUE); -} +} // end of wxBitmap::CopyFromIconOrCursor bool wxBitmap::CopyFromCursor( const wxCursor& rCursor @@ -118,8 +129,8 @@ bool wxBitmap::CopyFromCursor( if (!rCursor.Ok()) return(FALSE); - return CopyFromIconOrCursor(wxGDIImage)rCursor); -} + return(CopyFromIconOrCursor(rCursor)); +} // end of wxBitmap::CopyFromCursor bool wxBitmap::CopyFromIcon( const wxIcon& rIcon @@ -130,18 +141,14 @@ bool wxBitmap::CopyFromIcon( if (!rIcon.Ok()) return(FALSE); -#if WXWIN_COMPATIBILITY_2 - refData->m_ok = TRUE; -#endif // WXWIN_COMPATIBILITY_2 - - return CopyFromIconOrCursor(icon); -} + return CopyFromIconOrCursor(rIcon); +} // end of wxBitmap::CopyFromIcon wxBitmap::~wxBitmap() { if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); -} +} // end of wxBitmap::~wxBitmap wxBitmap::wxBitmap( const char zBits[] @@ -157,10 +164,10 @@ wxBitmap::wxBitmap( BITMAPINFO2 vInfo; HDC hDc; HPS hPs; - DEVOPENSTRUCT vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; SIZEL vSize = {0, 0}; - wxAssert(vHabmain != NULL); + wxASSERT(vHabmain != NULL); hDc = ::DevOpenDC(vHabmain, OD_MEMORY, (PSZ)"*", 1L, (PDEVOPENDATA)&vDop, 0L); @@ -182,45 +189,58 @@ wxBitmap::wxBitmap( vHeader.ulColorEncoding = 0; vHeader.ulIdentifier = 0; - hPs = ::GpiCreatePS(vHabMain, hdc, &vSize, GPIA_ASSOC | PU_PELS); + hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS); if (hPs == 0) { wxLogLastError("GpiCreatePS Failure"); } - m_hDc = hDc; - m_hPs = hPs; - m_refData = pRefData; - refData->m_width = nTheWidth; - refData->m_height = nTheHeight; - refData->m_depth = nNoBits; - refData->m_numColors = 0; - refData->m_selectedInto = NULL; + 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 (!hBmp) { wxLogLastError("CreateBitmap"); } - SetHBITMAP((WXHBITMAP)hbmp); -} + SetHBITMAP((WXHBITMAP)hBmp); +} // end of wxBitmap::wxBitmap +// // Create from XPM data +// wxBitmap::wxBitmap( char** ppData -, wxControl* WXUNUSED(pAnItem)) +) { Init(); -F (void)Create( (void *)ppData + (void)Create( (void *)ppData ,wxBITMAP_TYPE_XPM_DATA ,0 ,0 ,0 ); -} +} // end of wxBitmap::wxBitmap + +wxBitmap::wxBitmap( + const char** ppData +) +{ + Init(); + + (void)Create( (void *)ppData + ,wxBITMAP_TYPE_XPM_DATA + ,0 + ,0 + ,0 + ); +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( int nW @@ -234,7 +254,7 @@ wxBitmap::wxBitmap( ,nH ,nD ); -} +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( void* pData @@ -252,7 +272,7 @@ wxBitmap::wxBitmap( ,nHeight ,nDepth ); -} +} // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( const wxString& rFilename @@ -264,7 +284,7 @@ wxBitmap::wxBitmap( LoadFile( rFilename ,(int)lType ); -} +} // end of wxBitmap::wxBitmap bool wxBitmap::Create( int nW @@ -274,64 +294,63 @@ bool wxBitmap::Create( { HBITMAP hBmp; BITMAPINFOHEADER2 vHeader; - BITMAPINFO2 vInfo; - HPS hpsScreen; - HDC hdcScreen; - DEVOPENSTRUCT vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; - SIZEL vSize = {0, 0}; - LONG lBitCount; - - wxAssert(vHabmain != NULL); - - hpsScreen = ::WinGetScreenPS(HWND_DESKTOP); - hdcScreen = ::GpiQueryDevice(hpsScreen); - ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, &lBitCount); - - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)nW; - vHeader.cy = (USHORT)nH; - vHeader.cPlanes = (USHORT)nD; - vHeader.cBitCount = lBitCount; - 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; - + wxASSERT(vHabmain != NULL); UnRef(); m_refData = new wxBitmapRefData; - - GetBitmapData()->m_width = nW; - GetBitmapData()->m_height = nH; - GetBitmapData()->m_depth = nD; + GetBitmapData()->m_nWidth = nW; + GetBitmapData()->m_nHeight = nH; + GetBitmapData()->m_nDepth = nD; if (nD > 0) { - hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo); - if (!hBmp) - { - wxLogLastError("CreateBitmap"); - } + 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); + + memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); + vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + vHeader.cx = nW; + vHeader.cy = nH; + vHeader.cPlanes = 1; + vHeader.cBitCount = nD; + + hBmp = ::GpiCreateBitmap( hPS + ,&vHeader + ,0L + ,NULL + ,NULL + ); + ::GpiDestroyPS(hPS); + ::DevCloseDC(hDC); } else { - LONG lPlanes; - - ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, &lPlanes); - hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo); - if (!hBmp) - { - wxLogLastError("CreateBitmap"); - } - GetBitmapData()->m_depth = wxDisplayDepth(); + HPS hPSScreen; + HDC hDCScreen; + LONG lBitCount; + + hPSScreen = ::WinGetScreenPS(HWND_DESKTOP); + hDCScreen = ::GpiQueryDevice(hPSScreen); + ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); + + memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); + vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + vHeader.cx = nW; + vHeader.cy = nH; + vHeader.cPlanes = 1; + vHeader.cBitCount = lBitCount; + + hBmp = ::GpiCreateBitmap( hPSScreen + ,&vHeader + ,0L + ,NULL + ,NULL + ); + + GetBitmapData()->m_nDepth = wxDisplayDepth(); + ::WinReleasePS(hPSScreen); } SetHBITMAP((WXHBITMAP)hBmp); @@ -340,13 +359,15 @@ bool wxBitmap::Create( #endif // WXWIN_COMPATIBILITY_2 return Ok(); -} +} // end of wxBitmap::Create bool wxBitmap::LoadFile( const wxString& rFilename , long lType ) { + HPS hPs = NULLHANDLE; + UnRef(); wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType) @@ -359,23 +380,24 @@ bool wxBitmap::LoadFile( return(pHandler->LoadFile( this ,rFilename + ,hPs ,lType , -1 , -1 - ); + )); } else { wxImage vImage; - if (!vImage.LoadFile(rFilename, lType) || !image.Ok() ) + if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() ) return(FALSE); *this = vImage.ConvertToBitmap(); return(TRUE); } -} +} // end of wxBitmap::LoadFile bool wxBitmap::Create( void* pData @@ -394,21 +416,21 @@ bool wxBitmap::Create( if (!pHandler) { wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for " - "type %d defined."), type); + "type %d defined."), lType); return(FALSE); } m_refData = new wxBitmapRefData; - return(handler->Create( this - ,pData - ,lType - ,nWidth - ,nHeight - ,nDepth - )); -} + return(pHandler->Create( this + ,pData + ,lType + ,nWidth + ,nHeight + ,nDepth + )); +} // end of wxBitmap::Create bool wxBitmap::SaveFile( const wxString& rFilename @@ -440,8 +462,435 @@ bool wxBitmap::SaveFile( ,lType )); } +} // end of wxBitmap::SaveFile + + +// ---------------------------------------------------------------------------- +// wxImage-wxBitmap convertion +// ---------------------------------------------------------------------------- + +bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) +{ + wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) + +// TODO: +/* + int sizeLimit = 1024*768*3; + + // width and height of the device-dependent bitmap + int width = GetWidth(); + int bmpHeight = GetHeight(); + + // calc the number of bytes per scanline and padding + int bytePerLine = width*3; + int sizeDWORD = sizeof( DWORD ); + int lineBoundary = bytePerLine % sizeDWORD; + int padding = 0; + if( lineBoundary > 0 ) + { + padding = sizeDWORD - lineBoundary; + bytePerLine += padding; + } + // calc the number of DIBs and heights of DIBs + int numDIB = 1; + int hRemain = 0; + int height = sizeLimit/bytePerLine; + if( height >= bmpHeight ) + height = bmpHeight; + else + { + numDIB = bmpHeight / height; + hRemain = bmpHeight % height; + if( hRemain >0 ) numDIB++; + } + + // set bitmap parameters + wxBitmap bitmap; + wxCHECK_MSG( Ok(), bitmap, wxT("invalid image") ); + bitmap.SetWidth( width ); + bitmap.SetHeight( bmpHeight ); + bitmap.SetDepth( wxDisplayDepth() ); + + // create a DIB header + int headersize = sizeof(BITMAPINFOHEADER); + LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); + wxCHECK_MSG( lpDIBh, bitmap, wxT("could not allocate memory for DIB header") ); + // Fill in the DIB header + lpDIBh->bmiHeader.biSize = headersize; + lpDIBh->bmiHeader.biWidth = (DWORD)width; + lpDIBh->bmiHeader.biHeight = (DWORD)(-height); + lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + // the general formula for biSizeImage: + // ( ( ( ((DWORD)width*24) +31 ) & ~31 ) >> 3 ) * height; + lpDIBh->bmiHeader.biPlanes = 1; + lpDIBh->bmiHeader.biBitCount = 24; + lpDIBh->bmiHeader.biCompression = BI_RGB; + lpDIBh->bmiHeader.biClrUsed = 0; + // These seem not really needed for our purpose here. + lpDIBh->bmiHeader.biClrImportant = 0; + lpDIBh->bmiHeader.biXPelsPerMeter = 0; + lpDIBh->bmiHeader.biYPelsPerMeter = 0; + // memory for DIB data + unsigned char *lpBits; + lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage ); + if( !lpBits ) + { + wxFAIL_MSG( wxT("could not allocate memory for DIB") ); + free( lpDIBh ); + return bitmap; + } + + // create and set the device-dependent bitmap + HDC hdc = ::GetDC(NULL); + HDC memdc = ::CreateCompatibleDC( hdc ); + HBITMAP hbitmap; + hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight ); + ::SelectObject( memdc, hbitmap); + + // copy image data into DIB data and then into DDB (in a loop) + unsigned char *data = GetData(); + int i, j, n; + int origin = 0; + unsigned char *ptdata = data; + unsigned char *ptbits; + + for( n=0; n 1 && n == numDIB-1 && hRemain > 0 ) + { + // redefine height and size of the (possibly) last smaller DIB + // memory is not reallocated + height = hRemain; + lpDIBh->bmiHeader.biHeight = (DWORD)(-height); + lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + } + ptbits = lpBits; + + for( j=0; jbmiHeader), CBM_INIT, lpBits, lpDIBh, DIB_RGB_COLORS ); + // The above line is equivalent to the following two lines. + // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); + // ::SetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS); + // or the following lines + // hbitmap = ::CreateCompatibleBitmap( hdc, width, height ); + // HDC memdc = ::CreateCompatibleDC( hdc ); + // ::SelectObject( memdc, hbitmap); + // ::SetDIBitsToDevice( memdc, 0, 0, width, height, + // 0, 0, 0, height, (void *)lpBits, lpDIBh, DIB_RGB_COLORS); + // ::SelectObject( memdc, 0 ); + // ::DeleteDC( memdc ); + } + bitmap.SetHBITMAP( (WXHBITMAP) hbitmap ); + + // similarly, created an mono-bitmap for the possible mask + if( HasMask() ) + { + hbitmap = ::CreateBitmap( (WORD)width, (WORD)bmpHeight, 1, 1, NULL ); + ::SelectObject( memdc, hbitmap); + if( numDIB == 1 ) height = bmpHeight; + else height = sizeLimit/bytePerLine; + lpDIBh->bmiHeader.biHeight = (DWORD)(-height); + lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + origin = 0; + unsigned char r = GetMaskRed(); + unsigned char g = GetMaskGreen(); + unsigned char b = GetMaskBlue(); + unsigned char zero = 0, one = 255; + ptdata = data; + for( n=0; n 1 && n == numDIB - 1 && hRemain > 0 ) + { + // redefine height and size of the (possibly) last smaller DIB + // memory is not reallocated + height = hRemain; + lpDIBh->bmiHeader.biHeight = (DWORD)(-height); + lpDIBh->bmiHeader.biSizeImage = bytePerLine*height; + } + ptbits = lpBits; + for( int j=0; jSetMaskBitmap( (WXHBITMAP) hbitmap ); + bitmap.SetMask( mask ); + } + + // free allocated resources + ::SelectObject( memdc, 0 ); + ::DeleteDC( memdc ); + ::ReleaseDC(NULL, hdc); + free(lpDIBh); + free(lpBits); + + // check the wxBitmap object + if( bitmap.GetHBITMAP() ) + bitmap.SetOk( TRUE ); + else + bitmap.SetOk( FALSE ); +*/ + + return TRUE; +} + +wxImage wxBitmap::ConvertToImage() const +{ + wxImage image; + + wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); + + // create an wxImage object + int width = GetWidth(); + int height = GetHeight(); + image.Create( width, height ); + unsigned char *data = image.GetData(); + if( !data ) + { + wxFAIL_MSG( wxT("could not allocate data for image") ); + return wxNullImage; + } + + // calc the number of bytes per scanline and padding in the DIB + int bytePerLine = width*3; + int sizeDWORD = sizeof( DWORD ); + int lineBoundary = bytePerLine % sizeDWORD; + int padding = 0; + if( lineBoundary > 0 ) + { + padding = sizeDWORD - lineBoundary; + bytePerLine += padding; + } +// TODO: +/* + // create a DIB header + int headersize = sizeof(BITMAPINFOHEADER); + LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize ); + if( !lpDIBh ) + { + wxFAIL_MSG( wxT("could not allocate data for DIB header") ); + free( data ); + return; + } + // Fill in the DIB header + lpDIBh->bmiHeader.biSize = headersize; + lpDIBh->bmiHeader.biWidth = width; + lpDIBh->bmiHeader.biHeight = -height; + lpDIBh->bmiHeader.biSizeImage = bytePerLine * height; + lpDIBh->bmiHeader.biPlanes = 1; + lpDIBh->bmiHeader.biBitCount = 24; + lpDIBh->bmiHeader.biCompression = BI_RGB; + lpDIBh->bmiHeader.biClrUsed = 0; + // These seem not really needed for our purpose here. + lpDIBh->bmiHeader.biClrImportant = 0; + lpDIBh->bmiHeader.biXPelsPerMeter = 0; + lpDIBh->bmiHeader.biYPelsPerMeter = 0; + // memory for DIB data + unsigned char *lpBits; + lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage ); + if( !lpBits ) + { + wxFAIL_MSG( wxT("could not allocate data for DIB") ); + free( data ); + free( lpDIBh ); + return; + } + + // copy data from the device-dependent bitmap to the DIB + HDC hdc = ::GetDC(NULL); + HBITMAP hbitmap; + hbitmap = (HBITMAP) bitmap.GetHBITMAP(); + ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); + + // copy DIB data into the wxImage object + int i, j; + unsigned char *ptdata = data; + unsigned char *ptbits = lpBits; + for( i=0; iGetMaskBitmap() ) + { + hbitmap = (HBITMAP) bitmap.GetMask()->GetMaskBitmap(); + // memory DC created, color set, data copied, and memory DC deleted + HDC memdc = ::CreateCompatibleDC( hdc ); + ::SetTextColor( memdc, RGB( 0, 0, 0 ) ); + ::SetBkColor( memdc, RGB( 255, 255, 255 ) ); + ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS ); + ::DeleteDC( memdc ); + // background color set to RGB(16,16,16) in consistent with wxGTK + unsigned char r=16, g=16, b=16; + ptdata = data; + ptbits = lpBits; + for( i=0; i= 0) && (rRect.y >= 0) && + (rRect.x + rRect.width <= GetWidth()) && + (rRect.y + rRect.height <= GetHeight()), + wxNullBitmap, wxT("Invalid bitmap or bitmap region") ); + + wxBitmap vRet( rRect.width + ,rRect.height + ,GetDepth() + ); + wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") ); + + + // + // Copy bitmap data + // + 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] = { rRect.x, rRect.y, + rRect.x + rRect.width, rRect.y + rRect.height, + 0, 0, GetWidth(), GetHeight() + }; + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + // + // Copy mask if there is one + // + if (GetMask()) + { + BITMAPINFOHEADER2 vBmih; + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rRect.width; + vBmih.cy = rRect.height; + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP()); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) GetMask()->GetMaskBitmap()); + ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpMask); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + wxMask* pMask = new wxMask((WXHBITMAP)hBmpMask); + vRet.SetMask(pMask); + } + + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + return vRet; +} // end of wxBitmap::GetSubBitmap + // ---------------------------------------------------------------------------- // wxBitmap accessors // ---------------------------------------------------------------------------- @@ -453,7 +902,7 @@ void wxBitmap::SetQuality( EnsureHasData(); GetBitmapData()->m_nQuality = nQ; -} +} // end of wxBitmap::SetQuality #if WXWIN_COMPATIBILITY_2 void wxBitmap::SetOk( @@ -463,7 +912,7 @@ void wxBitmap::SetOk( EnsureHasData(); GetBitmapData()->m_bOk = bOk; -} +} // end of wxBitmap::SetOk #endif // WXWIN_COMPATIBILITY_2 void wxBitmap::SetPalette( @@ -473,7 +922,7 @@ void wxBitmap::SetPalette( EnsureHasData(); GetBitmapData()->m_vBitmapPalette = rPalette; -} +} // end of wxBitmap::SetPalette void wxBitmap::SetMask( wxMask* pMask @@ -482,10 +931,12 @@ void wxBitmap::SetMask( EnsureHasData(); 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 @@ -495,21 +946,22 @@ wxBitmap wxBitmap::GetBitmapForDC( ,this->GetHeight() ,rDc.GetDepth() ); + WXHBITMAP vOldBitmap; HPS hMemoryPS; HPS hPs; POINTL vPoint[4]; - SIZEL vSize = {0,0} + SIZEL vSize = {0,0}; - hMemoryPS = ::GpiCreatePS(habMain, (HDC)vMemDC.m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPI_ASSOC); - hPs = ::GpiCreatePS(habMain, (HDC)rDc.m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPI_ASSOC); + 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 - rDc.m_oldBitmap = (WXHBITMAP)::GpiSetBitMap(hPs, (HBITMAP)vTmpBitmap.GetHBITMAP()); - :GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY | BBO_IGNORE); + vOldBitmap = (WXHBITMAP)::GpiSetBitmap(hPs, (HBITMAP)vTmpBitmap.GetHBITMAP()); + ::GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY, BBO_IGNORE); return(vTmpBitmap); -} +} // end of wxBitmap::GetBitmapForDC // ---------------------------------------------------------------------------- // wxMask @@ -518,7 +970,7 @@ wxBitmap wxBitmap::GetBitmapForDC( wxMask::wxMask() { m_hMaskBitmap = 0; -} +} // end of wxMask::wxMask // Construct a mask from a bitmap and a colour indicating // the transparent area @@ -531,7 +983,7 @@ wxMask::wxMask( Create( rBitmap ,rColour ); -} +} // end of wxMask::wxMask // Construct a mask from a bitmap and a palette index indicating // the transparent area @@ -544,7 +996,7 @@ wxMask::wxMask( Create( rBitmap ,nPaletteIndex ); -} +} // end of wxMask::wxMask // Construct a mask from a mono bitmap (copies the bitmap). wxMask::wxMask( @@ -553,23 +1005,29 @@ wxMask::wxMask( { m_hMaskBitmap = 0; Create(rBitmap); -} +} // end of wxMask::wxMask wxMask::~wxMask() { if (m_hMaskBitmap) ::GpiDeleteBitmap((HBITMAP)m_hMaskBitmap); -} +} // end of wxMask::~wxMask // Create a mask from a mono bitmap (copies the bitmap). bool wxMask::Create( const wxBitmap& rBitmap ) { - BITMAPINFOHEADER2 vHeader; - DEVOPENSTRUCT vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + BITMAPINFOHEADER2 vBmih; SIZEL vSize = {0, 0}; - POINTL vPoint[4]; + 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 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), + 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + }; if (m_hMaskBitmap) { @@ -580,30 +1038,37 @@ bool wxMask::Create( { return(FALSE); } - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)rBitmap.GetWidth(); - vHeader.cy = (USHORT)rBitmap.GetHeight(); - vHeader.cPlanes = 1; - vHeader.cBitCount = 1; - - m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs - ,&vHeader - ,0L - ,NULL - ,NULL - ); - - HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP()); - HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap); - // TODO: Set the point array - :GpiBitBlt(destPs, srcPS, 4L, vPoint, ROP_SRCCOPY | BBO_IGNORE); - - ::GpiDestroyPS(srcPS); - ::GpiDestroyPS(destPS); + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rBitmap.GetWidth(); + vBmih.cy = rBitmap.GetHeight(); + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + m_hMaskBitmap = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCCOPY + ,BBO_IGNORE + ); + + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); return(TRUE); -} +} // end of wxMask::Create // Create a mask from a bitmap and a palette index indicating // the transparent area @@ -619,16 +1084,19 @@ bool wxMask::Create( } if (rBitmap.Ok() && rBitmap.GetPalette()->Ok()) { - unsigned char red, green, blue; + unsigned char cRed; + unsigned char cGreen; + unsigned char cBlue; + if (rBitmap.GetPalette()->GetRGB( nPaletteIndex - ,&rRed - ,&rGreen - ,&rBlue + ,&cRed + ,&cGreen + ,&cBlue )) { - wxColour vTransparentColour( rRed - ,rGreen - ,rBlue + wxColour vTransparentColour( cRed + ,cGreen + ,cBlue ); return (Create( rBitmap @@ -637,7 +1105,7 @@ bool wxMask::Create( } } return(FALSE); -} +} // end of wxMask::Create // Create a mask from a bitmap and a colour indicating // the transparent area @@ -646,10 +1114,21 @@ bool wxMask::Create( , const wxColour& rColour ) { - BITMAPINFOHEADER2 vHeader; - DEVOPENSTRUCT vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + bool bOk = TRUE; + COLORREF vMaskColour = OS2RGB( rColour.Red() + ,rColour.Green() + ,rColour.Blue() + ); + BITMAPINFOHEADER2 vBmih; SIZEL vSize = {0, 0}; - POINTL vPoint[4]; + DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + 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, rBitmap.GetWidth(), rBitmap.GetHeight(), + 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() + }; if (m_hMaskBitmap) { @@ -661,58 +1140,68 @@ bool wxMask::Create( return(FALSE); } - // scan the bitmap for the transparent colour and set + // + // Scan the bitmap for the transparent colour and set // the corresponding pixels in the mask to BLACK and // the rest to WHITE - COLORREF vMaskColour = OS2RGB(rColour.Red(), rColour.Green(), rColour.Blue()); - - vHeader.cbFix = sizeof(vHeader); - vHeader.cx = (USHORT)rBitmap.GetWidth(); - vHeader.cy = (USHORT)rBitmap.GetHeight(); - vHeader.cPlanes = 1; - vHeader.cBitCount = 1; - - m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs - ,&vHeader - ,0L - ,NULL - ,NULL - ); - ); - HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP()); - HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC); - ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap); - - // this is not very efficient, but I can't think + // + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = rBitmap.GetWidth(); + vBmih.cy = rBitmap.GetHeight(); + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + m_hMaskBitmap = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP()); + ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap); + + // + // This is not very efficient, but I can't think // of a better way of doing it + // for (int w = 0; w < rBitmap.GetWidth(); w++) { for (int h = 0; h < rBitmap.GetHeight(); h++) { - POINTL vPoint; - - vPoint.x = w; - vPoint.y = h; - - COLORREF col = ::GpiQueryPel(srcPS, w, h); + POINTL vPt = {w, h}; + COLORREF vCol = (COLORREF)::GpiQueryPel(hPSSrc, &vPt); + if (vCol == (COLORREF)CLR_NOINDEX) + { + // + // Doesn't make sense to continue + // + bOk = FALSE; + break; + } - if (col == vMaskColour) + if (vCol == vMaskColour) { - ::GpiSetColor(destPS, CLR_WHITE); - ::GpiSetPel(destPS, &vPoint); + ::GpiSetColor(hPSDst, OS2RGB(0, 0, 0)); + ::GpiSetPel(hPSDst, &vPt); } else { - ::GpiSetColor(destPS, CLR_BLACK); - ::GpiSetPel(destPS, &vPoint); + ::GpiSetColor(hPSDst, OS2RGB(255, 255, 255)); + ::GpiSetPel(hPSDst, &vPt); } } } - ::GpiDestroyPS(srcPS); - ::GpiDestroyPS(destPS); + ::GpiSetBitmap(hPSSrc, NULL); + ::GpiSetBitmap(hPSDst, NULL); + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); return(TRUE); -} +} // end of wxMask::Create // ---------------------------------------------------------------------------- // wxBitmapHandler @@ -742,17 +1231,19 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::Load( wxGDIImage* pImage , const wxString& rName +, HPS hPs , long lFlags , int nWidth , int nHeight ) { - wxBitmap* bitmap = wxDynamicCast( pImage - ,wxBitmap - ); + wxBitmap* pBitmap = wxDynamicCast( pImage + ,wxBitmap + ); return(pBitmap ? LoadFile( pBitmap ,rName + ,hPs ,lFlags ,nWidth ,nHeight @@ -790,12 +1281,13 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) , const wxString& WXUNUSED(rName) +, HPS WXUNUSED(hPs) , long WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) ) { - return(FALSE(; + return(FALSE); } bool wxBitmapHandler::SaveFile( @@ -808,3 +1300,73 @@ bool wxBitmapHandler::SaveFile( return(FALSE); } +// ---------------------------------------------------------------------------- +// Utility functions +// ---------------------------------------------------------------------------- +HBITMAP wxInvertMask( + HBITMAP hBmpMask +, int nWidth +, int nHeight +) +{ + HBITMAP hBmpInvMask = 0; + + wxCHECK_MSG( hBmpMask, 0, _T("invalid bitmap in wxInvertMask") ); + + // + // Get width/height from the bitmap if not given + // + if (!nWidth || !nHeight) + { + BITMAPINFOHEADER2 vBmhdr; + + ::GpiQueryBitmapInfoHeader( hBmpMask + ,&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 ,0, nWidth, nHeight, + 0, 0, nWidth, nHeight + }; + + memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2)); + vBmih.cbFix = sizeof(BITMAPINFOHEADER2); + vBmih.cx = nWidth; + vBmih.cy = nHeight; + vBmih.cPlanes = 1; + vBmih.cBitCount = 1; + + hBmpInvMask = ::GpiCreateBitmap( hPSDst + ,&vBmih + ,0L + ,NULL + ,NULL + ); + + ::GpiSetBitmap(hPSSrc, (HBITMAP) hBmpMask); + ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpInvMask); + + ::GpiBitBlt( hPSDst + ,hPSSrc + ,4L + ,vPoint + ,ROP_SRCINVERT + ,BBO_IGNORE + ); + + ::GpiDestroyPS(hPSSrc); + ::GpiDestroyPS(hPSDst); + ::DevCloseDC(hDCSrc); + ::DevCloseDC(hDCDst); + + return hBmpInvMask; +} // end of WxWinGdi_InvertMask