X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acf8e3d29e897ade2087e3d9048e5c448823d391..d0b50ad93942338301a318eda78f7d3999a93fab:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index d0038118cb..8cc1e1b180 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -50,6 +50,8 @@ #include "wx/image.h" #include "wx/xpmdecod.h" +#include "wx/rawbmp.h" + // missing from mingw32 header #ifndef CLR_INVALID #define CLR_INVALID ((COLORREF)-1) @@ -122,13 +124,43 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +// decide whether we should create a DIB or a DDB for the given parameters +static bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc) +{ + // here is the logic: + // + // (a) if hdc is specified, the caller explicitly wants DDB + // (b) otherwise, create a DIB if depth >= 24 (we don't support 16bpp or + // less DIBs anyhow) + // (c) finally, create DIBs under Win9x even if the depth hasn't been + // explicitly specified but the current display depth is 24 or more + // and the image is "big", i.e. > 16Mb which is the theoretical limit + // for DDBs under Win9x + // + // consequences (all of which seem to make sense): + // + // (i) by default, DDBs are created (depth == -1 usually) + // (ii) DIBs can be created by explicitly specifying the depth + // (iii) using a DC always forces creating a DDB + return !hdc && + (d >= 24 || + (d == -1 && + wxDIB::GetLineSize(w, wxDisplayDepth())*h > 16*1024*1024)); +} + // ---------------------------------------------------------------------------- // wxBitmapRefData // ---------------------------------------------------------------------------- wxBitmapRefData::wxBitmapRefData() { +#ifdef __WXDEBUG__ m_selectedInto = NULL; +#endif m_bitmapMask = NULL; m_hBitmap = (WXHBITMAP) NULL; m_hasAlpha = FALSE; @@ -159,7 +191,6 @@ void wxBitmapRefData::Free() void wxBitmap::Init() { // m_refData = NULL; done in the base class ctor - } wxGDIImageRefData *wxBitmap::CreateData() const @@ -275,6 +306,38 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon) #endif // Win16/Win32 } +bool wxBitmap::CopyFromDIB(const wxDIB& dib) +{ + wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") ); + + HBITMAP hbitmap = dib.CreateDDB(); + if ( !hbitmap ) + return FALSE; + + UnRef(); + + wxBitmapRefData *refData = new wxBitmapRefData; + m_refData = refData; + + refData->m_width = dib.GetWidth(); + refData->m_height = dib.GetHeight(); + refData->m_depth = dib.GetDepth(); + + refData->m_hBitmap = (WXHBITMAP)hbitmap; + +#if wxUSE_PALETTE + wxPalette *palette = dib.CreatePalette(); + if ( palette ) + { + refData->m_bitmapPalette = *palette; + } + + delete palette; +#endif // wxUSE_PALETTE + + return TRUE; +} + wxBitmap::~wxBitmap() { } @@ -385,26 +448,53 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) LoadFile(filename, (int)type); } -bool wxBitmap::Create(int w, int h, int d) +bool wxBitmap::Create(int width, int height, int depth) +{ + return DoCreate(width, height, depth, 0); +} + +bool wxBitmap::Create(int width, int height, const wxDC& dc) +{ + wxCHECK_MSG( dc.Ok(), FALSE, _T("invalid HDC in wxBitmap::Create()") ); + + return DoCreate(width, height, -1, dc.GetHDC()); +} + +bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc) { UnRef(); m_refData = new wxBitmapRefData; -#if wxUSE_DIB_FOR_BITMAP - if ( w && h && d >= 16 ) + GetBitmapData()->m_width = w; + GetBitmapData()->m_height = h; + + HBITMAP hbmp; + + if ( wxShouldCreateDIB(w, h, d, hdc) ) { - if ( !CreateDIB(w, h, d) ) + if ( d == -1 ) + { + // create DIBs without alpha channel by default + d = 24; + } + + wxDIB dib(w, h, d); + if ( !dib.IsOk() ) return FALSE; + + // don't delete the DIB section in dib object dtor + hbmp = dib.Detach(); + + GetBitmapData()->m_depth = d; } - else -#endif // wxUSE_DIB_FOR_BITMAP + else // create a DDB { - GetBitmapData()->m_width = w; - GetBitmapData()->m_height = h; + if ( d == -1 ) + d = wxDisplayDepth(); + GetBitmapData()->m_depth = d; - HBITMAP hbmp; #ifndef __WXMICROWIN__ if ( d > 0 ) { @@ -426,13 +516,13 @@ bool wxBitmap::Create(int w, int h, int d) GetBitmapData()->m_depth = wxDisplayDepth(); } + } - SetHBITMAP((WXHBITMAP)hbmp); + SetHBITMAP((WXHBITMAP)hbmp); #if WXWIN_COMPATIBILITY_2 - GetBitmapData()->m_ok = hbmp != 0; + GetBitmapData()->m_ok = hbmp != 0; #endif // WXWIN_COMPATIBILITY_2 - } return Ok(); } @@ -447,7 +537,7 @@ bool wxBitmap::Create(int w, int h, int d) // make sense to use #ifdefs inside the function bodies #ifdef __WXMICROWIN__ -bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) +bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc) { // Set this to 1 to experiment with mask code, // which currently doesn't work @@ -635,7 +725,20 @@ wxImage wxBitmap::ConvertToImage() const // wxImage to/from conversions // ---------------------------------------------------------------------------- -bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) +bool wxBitmap::CreateFromImage(const wxImage& image, int depth) +{ + return CreateFromImage(image, depth, 0); +} + +bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc) +{ + wxCHECK_MSG( dc.Ok(), FALSE, + _T("invalid HDC in wxBitmap::CreateFromImage()") ); + + return CreateFromImage(image, -1, dc.GetHDC()); +} + +bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc ) { wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ); @@ -654,7 +757,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) wxBitmapRefData *refData = new wxBitmapRefData; refData->m_width = w; refData->m_height = h; - refData->m_depth = dib.GetDepth(); refData->m_hasAlpha = image.HasAlpha(); m_refData = refData; @@ -663,86 +765,19 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // next either store DIB as is or create a DDB from it HBITMAP hbitmap; - // TODO: if we're ready to use DIB as is, we can just do this: - // if ( ... ) - // hbitmap = dib.Detach(); - // else + // are we going to use DIB? + if ( wxShouldCreateDIB(w, h, depth, hdc) ) { - // create and set the device-dependent bitmap - // - // VZ: why don't we just use SetDIBits() instead? because of the - // palette or is there some other reason? - hbitmap = ::CreateCompatibleBitmap(ScreenHDC(), w, h); - if ( !hbitmap ) - { - wxLogLastError(_T("CreateCompatibleBitmap()")); - - return FALSE; - } - - MemoryHDC hdcMem; - SelectInHDC select(hdcMem, hbitmap); - if ( !select ) - { - wxLogLastError(_T("SelectObjct(hBitmap)")); - } - -#if wxUSE_PALETTE - const wxPalette& palette = image.GetPalette(); - - HPALETTE hOldPalette; - if ( palette.Ok() ) - { - SetPalette(palette); - - hOldPalette = ::SelectPalette - ( - hdcMem, - GetHpaletteOf(palette), - FALSE // ignored for hdcMem - ); - - if ( !hOldPalette ) - { - wxLogLastError(_T("SelectPalette()")); - } + // don't delete the DIB section in dib object dtor + hbitmap = dib.Detach(); - if ( ::RealizePalette(hdcMem) == GDI_ERROR ) - { - wxLogLastError(_T("RealizePalette()")); - } - } - else // no valid palette - { - hOldPalette = 0; - } -#endif // wxUSE_PALETTE - - DIBSECTION ds; - if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) ) - { - wxLogLastError(_T("GetObject(hDIB)")); - } - - if ( ::StretchDIBits(hdcMem, - 0, 0, w, h, - 0, 0, w, h, - dib.GetData(), - (BITMAPINFO *)&ds.dsBmih, - DIB_RGB_COLORS, - SRCCOPY) == GDI_ERROR ) - { - wxLogLastError(_T("StretchDIBits()")); - - return FALSE; - } + refData->m_depth = dib.GetDepth(); + } + else // we need to convert DIB to DDB + { + hbitmap = dib.CreateDDB((HDC)hdc); -#if wxUSE_PALETTE - if ( hOldPalette ) - { - ::SelectPalette(hdcMem, hOldPalette, FALSE); - } -#endif // wxUSE_PALETTE + refData->m_depth = depth == -1 ? wxDisplayDepth() : depth; } // validate this object @@ -1043,11 +1078,15 @@ wxMask *wxBitmap::GetMask() const return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL; } +#ifdef __WXDEBUG__ + wxDC *wxBitmap::GetSelectedInto() const { return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL; } +#endif + #if WXWIN_COMPATIBILITY_2_4 int wxBitmap::GetQuality() const @@ -1066,12 +1105,16 @@ bool wxBitmap::HasAlpha() const // wxBitmap setters // ---------------------------------------------------------------------------- +#ifdef __WXDEBUG__ + void wxBitmap::SetSelectedInto(wxDC *dc) { if ( GetBitmapData() ) GetBitmapData()->m_selectedInto = dc; } +#endif + #if wxUSE_PALETTE void wxBitmap::SetPalette(const wxPalette& palette) @@ -1110,67 +1153,43 @@ void wxBitmap::SetQuality(int WXUNUSED(quality)) #endif // WXWIN_COMPATIBILITY_2_4 // ---------------------------------------------------------------------------- -// TODO: to be replaced by something better +// raw bitmap access support // ---------------------------------------------------------------------------- -// Creates a bitmap that matches the device context, from -// an arbitray bitmap. At present, the original bitmap must have an -// associated palette. TODO: use a default palette if no palette exists. -// Contributed by Frederic Villeneuve -wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const +bool wxBitmap::GetRawData(wxRawBitmapData *data) { -#ifdef __WXMICROWIN__ - return *this; -#else - wxMemoryDC memDC; - wxBitmap tmpBitmap(GetWidth(), GetHeight(), dc.GetDepth()); - HPALETTE hPal = (HPALETTE) NULL; - LPBITMAPINFO lpDib; - void *lpBits = (void*) NULL; + wxCHECK_MSG( data, FALSE, _T("NULL pointer in wxBitmap::GetRawData") ); -#if wxUSE_PALETTE - if( GetPalette() && GetPalette()->Ok() ) + if ( !Ok() ) { - tmpBitmap.SetPalette(*GetPalette()); - memDC.SelectObject(tmpBitmap); - memDC.SetPalette(*GetPalette()); - hPal = (HPALETTE)GetPalette()->GetHPALETTE(); - } - else - { - hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE); - wxPalette palette; - palette.SetHPALETTE( (WXHPALETTE)hPal ); - tmpBitmap.SetPalette( palette ); - memDC.SelectObject(tmpBitmap); - memDC.SetPalette( palette ); + // no bitmap, no data (raw or otherwise) + return FALSE; } -#else // !wxUSE_PALETTE - hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE); -#endif // wxUSE_PALETTE/!wxUSE_PALETTE - // set the height negative because in a DIB the order of the lines is - // reversed - if ( !wxCreateDIB(GetWidth(), -GetHeight(), GetDepth(), hPal, &lpDib) ) + // we only support raw access to the DIBs, so check if we have one + DIBSECTION ds; + if ( !::GetObject(GetHbitmap(), sizeof(ds), &ds) ) { - return wxNullBitmap; + return FALSE; } - lpBits = malloc(lpDib->bmiHeader.biSizeImage); - - ::GetBitmapBits(GetHbitmap(), lpDib->bmiHeader.biSizeImage, lpBits); + // ok, store the relevant info in wxRawBitmapData + const LONG h = ds.dsBm.bmHeight; - ::SetDIBitsToDevice(GetHdcOf(memDC), 0, 0, - GetWidth(), GetHeight(), - 0, 0, 0, GetHeight(), - lpBits, lpDib, DIB_RGB_COLORS); - - free(lpBits); + data->m_width = ds.dsBm.bmWidth; + data->m_height = h; + data->m_bypp = ds.dsBm.bmBitsPixel / 8; - wxFreeDIB(lpDib); + // remember that DIBs are stored in top to bottom order! + const LONG bytesPerRow = ds.dsBm.bmWidthBytes; + data->m_stride = -bytesPerRow; + data->m_pixels = (unsigned char *)ds.dsBm.bmBits; + if ( h > 1 ) + { + data->m_pixels += (h - 1)*bytesPerRow; + } - return tmpBitmap; -#endif + return TRUE; } // ---------------------------------------------------------------------------- @@ -1454,10 +1473,81 @@ void wxFreeDIB(LPBITMAPINFO lpDIBHeader) #endif // ---------------------------------------------------------------------------- -// other helper functions +// global helper functions implemented here // ---------------------------------------------------------------------------- -extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h) +// helper of wxBitmapToHICON/HCURSOR +static +HICON wxBitmapToIconOrCursor(const wxBitmap& bmp, + bool iconWanted, + int hotSpotX, + int hotSpotY) +{ + if ( !bmp.Ok() ) + { + // we can't create an icon/cursor form nothing + return 0; + } + + wxMask *mask = bmp.GetMask(); + if ( !mask ) + { + // we must have a mask for an icon, so even if it's probably incorrect, + // do create it (grey is the "standard" transparent colour) + mask = new wxMask(bmp, *wxLIGHT_GREY); + } + + ICONINFO iconInfo; + iconInfo.fIcon = iconWanted; // do we want an icon or a cursor? + if ( !iconWanted ) + { + iconInfo.xHotspot = hotSpotX; + iconInfo.yHotspot = hotSpotY; + } + + iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap()); + iconInfo.hbmColor = GetHbitmapOf(bmp); + + // black out the transparent area to preserve background colour, because + // Windows blits the original bitmap using SRCINVERT (XOR) after applying + // the mask to the dest rect. + { + MemoryHDC dcSrc, dcDst; + SelectInHDC selectMask(dcSrc, (HBITMAP)mask->GetMaskBitmap()), + selectBitmap(dcDst, iconInfo.hbmColor); + + if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(), + dcSrc, 0, 0, SRCAND) ) + { + wxLogLastError(_T("BitBlt")); + } + } + + HICON hicon = ::CreateIconIndirect(&iconInfo); + + if ( !bmp.GetMask() ) + { + // we created the mask, now delete it + delete mask; + } + + // delete the inverted mask bitmap we created as well + ::DeleteObject(iconInfo.hbmMask); + + return hicon; +} + +HICON wxBitmapToHICON(const wxBitmap& bmp) +{ + return wxBitmapToIconOrCursor(bmp, TRUE, 0, 0); +} + +HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY) +{ + return (HCURSOR)wxBitmapToIconOrCursor(bmp, FALSE, hotSpotX, hotSpotY); +} + +HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h) { #ifndef __WXMICROWIN__ wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );